Merge branch 'ft' into 'main_dev'

fix(src/hooks/): 修复自定义下拉选择器和图表或其他组件一起分组，api接口联动失效问题

See merge request yunteng/thingskit-view!102

@@ -2,7 +2,7 @@
  * 重写select下拉框联动
  * 重写select下拉框联动
  */
  */
 import {toRefs} from 'vue'
 import {toRefs} from 'vue'
-import {CreateComponentType} from '@/packages/index.d'
+import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
 import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
 import {useChartEditStore} from '@/store/modules/chartEditStore/chartEditStore'
 
 
 // 获取类型
 // 获取类型
@@ -20,19 +20,27 @@ export const useChartInteract = (
     const fnOnEvent = interactEvents.filter(item => {
     const fnOnEvent = interactEvents.filter(item => {
         return item.interactOn === interactEventOn
         return item.interactOn === interactEventOn
     })
     })
-
     if (fnOnEvent.length === 0) return
     if (fnOnEvent.length === 0) return
-    fnOnEvent.forEach(async (item) => {
+    fnOnEvent.forEach((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]]
             }
             }
+            })
+            }
         })
         })
     })
     })
 }
 }

@@ -34,6 +34,7 @@ import { useFullScreen } from '../../utls/fullScreen'
 import cloneDeep from 'lodash/cloneDeep'
 import cloneDeep from 'lodash/cloneDeep'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
+import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
 
 
 const props = defineProps({
 const props = defineProps({
   themeSetting: {
   themeSetting: {
@@ -225,9 +226,15 @@ const updateVChart =async (newData:SocketReceiveMessageType) => {
 }
 }
 
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {
-  const index = chartEditStore.fetchTargetIndex(props.chartConfig.id)
-  if (index === -1) return
-  chartEditStore.componentList[index].option.dataset = newData
+  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 === props.chartConfig.id){
+          targetItem.option.dataset = newData
+      }
+  })
   updateVChart(newData)
   updateVChart(newData)
 })
 })
 
 

@@ -34,6 +34,7 @@ import dataJson from './data.json'
 import { useFullScreen } from '../../utls/fullScreen'
 import { useFullScreen } from '../../utls/fullScreen'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
+import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
 
 
 const props = defineProps({
 const props = defineProps({
   themeSetting: {
   themeSetting: {
@@ -224,9 +225,15 @@ const updateVChart =async (newData:SocketReceiveMessageType) => {
 }
 }
 
 
 const {vChartRef} = useChartDataFetch(props.chartConfig, useChartEditStore, (newData) => {
 const {vChartRef} = useChartDataFetch(props.chartConfig, useChartEditStore, (newData) => {
-   const index = chartEditStore.fetchTargetIndex(props.chartConfig.id)
-  if (index === -1) return
-  chartEditStore.componentList[index].option.dataset = newData
+  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 === props.chartConfig.id){
+          targetItem.option.dataset = newData
+      }
+  })
   updateVChart(newData)
   updateVChart(newData)
 })
 })
 
 

@@ -34,6 +34,7 @@ import isObject from 'lodash/isObject'
 import cloneDeep from 'lodash/cloneDeep'
 import cloneDeep from 'lodash/cloneDeep'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
+import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
 
 
 const props = defineProps({
 const props = defineProps({
   themeSetting: {
   themeSetting: {
@@ -254,9 +255,15 @@ const updateVChart =async (newData:SocketReceiveMessageType) => {
 }
 }
 
 
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {
-  const index = chartEditStore.fetchTargetIndex(props.chartConfig.id)
-  if (index === -1) return
-  chartEditStore.componentList[index].option.dataset = newData
+  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 === props.chartConfig.id){
+          targetItem.option.dataset = newData
+      }
+  })
   updateVChart(newData)
   updateVChart(newData)
 })
 })