Merge branch 'ft' into 'main_dev'

fix(src/packages/): 优化加载组态右侧配置是否公开按钮样式

See merge request yunteng/thingskit-view!103

 /**
 /**
  * 重写select下拉框联动
  * 重写select下拉框联动
  */
  */
-import {toRaw, toRefs} from 'vue'
-import {CreateComponentType} from '@/packages/index.d'
+import {toRefs} from 'vue'
+import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
 import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
 import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
-import {customRequest} from "@/api/external/customRequest";
-import {useFilterFn} from "@/hooks/external/useFilterFn";
 
 
 // 获取类型
 // 获取类型
 type ChartEditStoreType = typeof useChartEditStore
 type ChartEditStoreType = typeof useChartEditStore
@@ -27,26 +25,24 @@ export const useChartInteract = (
     fnOnEvent.forEach(async (item) => {
     fnOnEvent.forEach(async (item) => {
         const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
         const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
         if (index === -1) return
         if (index === -1) return
-        const {Params, Header} = toRefs(chartEditStore.componentList[index].request.requestParams)
-        Object.keys(item.interactFn).forEach(key => {
+          //支持分组
+          const target = chartEditStore.getComponentList?.reduce((prev: Array<CreateComponentType | CreateComponentGroupType>, acc) => {
+            acc?.isGroup ? (prev = [...(acc?.groupList as CreateComponentGroupType[])]) : prev?.push(acc)
+            return prev
+          }, [])
+          target?.forEach((targetItem)=>{
+            if(targetItem.id!==chartConfig.id){
+            const {Params, Header} = toRefs(targetItem.request.requestParams)
+            Object.keys(item.interactFn).forEach(key => {
             if (Params.value[key]) {
             if (Params.value[key]) {
                 Params.value[key] = param[item.interactFn[key]]
                 Params.value[key] = param[item.interactFn[key]]
             }
             }
             if (Header.value[key]) {
             if (Header.value[key]) {
                 Header.value[key] = param[item.interactFn[key]]
                 Header.value[key] = param[item.interactFn[key]]
             }
             }
-        })
-        const res = await customRequest(toRaw(chartEditStore.componentList[index].request))
-        if (res) {
-            try {
-                const filter = chartEditStore.componentList[index].filter
-                const {value} = useFilterFn(filter, res)
-                if (!value) return
-                chartEditStore.componentList[index].option.dataset = value
-            } finally { 
-                console.log
+            })
             }
             }
-        }
+        })
     })
     })
 }
 }
 
 

@@ -6,9 +6,11 @@
                   :options="configurationOptions"/>
                   :options="configurationOptions"/>
       </setting-item>
       </setting-item>
     </setting-item-box>
     </setting-item-box>
-    <setting-item-box name="是否公开" :alone="true">
-      <setting-item name="">
-        <n-switch @change="handleChange" v-model:value="optionData.isShare" size="small"/>
+    <setting-item-box name="是否公开">
+      <setting-item>
+        <div style="display:flex">
+          <n-switch @change="handleChange" v-model:value="optionData.isShare" size="small"/>
+        </div>
       </setting-item>
       </setting-item>
     </setting-item-box>
     </setting-item-box>
     <setting-item-box name="样式">
     <setting-item-box name="样式">