Merge branch 'local_dev_latest' into 'main_dev'

perf(src/packages/external/Charts): 优化图表类型的柱状，折线，legend图例映射成物模型name

See merge request yunteng/thingskit-view!202

+/**
+ * 此hook的作用是针对echarts图表类型，legend图例，映射成物模型中文
+ */
+
+export const useEchartsMapLegend = (chartConfig: Recordable, seriesArr: Recordable[]) => {
+  const { request } = chartConfig
+  const {
+    requestParams: {
+      Params: { attrName }
+    }
+  } = request || {}
+  seriesArr?.forEach((item: Recordable, index: number) => {
+    item.name = attrName?.[index]
+  })
+}

@@ -27,6 +27,7 @@ import { isPreview } from '@/utils'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import isObject from 'lodash/isObject'
 import cloneDeep from 'lodash/cloneDeep'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -64,6 +65,7 @@ watch(
         for (let i = 0; i < newData.dimensions.length - 1; i++) {
           seriesArr.push(cloneDeep(seriesItem))
         }
+        useEchartsMapLegend(props.chartConfig, seriesArr)
         replaceMergeArr.value = ['series']
         props.chartConfig.option.series = seriesArr
         nextTick(() => {

@@ -29,6 +29,8 @@ import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } fr
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import isObject from 'lodash/isObject'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
+import cloneDeep from 'lodash/cloneDeep'
 
 const props = defineProps({
   themeSetting: {
@@ -57,19 +59,26 @@ const option = computed(() => {
   return mergeTheme(props.chartConfig.option, props.themeSetting, includes)
 })
 
+// dataset 无法变更条数的补丁
 watch(
   () => props.chartConfig.option.dataset,
-  (newData, oldData) => {
-    if (newData.dimensions.length !== oldData.dimensions.length) {
-      const seriesArr = []
-      for (let i = 0; i < newData.dimensions.length - 1; i++) {
-        seriesArr.push(barSeriesItem, lineSeriesItem)
+  (newData: { dimensions: any }, oldData) => {
+    try {
+      if (!isObject(newData) || !('dimensions' in newData)) return
+      if (Array.isArray(newData?.dimensions)) {
+        const seriesArr = []
+        for (let i = 0; i < newData.dimensions.length - 1; i++) {
+          seriesArr.push(cloneDeep(barSeriesItem),cloneDeep(lineSeriesItem))
+        }
+        useEchartsMapLegend(props.chartConfig, seriesArr)
+        replaceMergeArr.value = ['series']
+        props.chartConfig.option.series = seriesArr
+        nextTick(() => {
+          replaceMergeArr.value = []
+        })
       }
-      replaceMergeArr.value = ['series']
-      props.chartConfig.option.series = seriesArr
-      nextTick(() => {
-        replaceMergeArr.value = []
-      })
+    } catch (error) {
+      console.log(error)
     }
   },
   {

@@ -17,6 +17,7 @@ import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
 import { isPreview, colorGradientCustomMerge} from '@/utils'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -79,6 +80,9 @@ watch(
   () => props.chartConfig.option.dataset,
   () => {
     option.value = props.chartConfig.option
+    useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
+  },{
+    deep: false
   }
 )
 

@@ -17,6 +17,7 @@ import { chartColorsSearch, defaultTheme } from '@/settings/chartThemes/index'
 import { DatasetComponent, GridComponent, TooltipComponent, LegendComponent } from 'echarts/components'
 import { useChartDataFetch } from '@/hooks'
 import { isPreview, colorGradientCustomMerge } from '@/utils'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -73,6 +74,7 @@ watch(
   () => props.chartConfig.option.dataset,
   () => {
     option.value = props.chartConfig.option
+    useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
   },
   {
     deep: false

@@ -35,6 +35,7 @@ import cloneDeep from 'lodash/cloneDeep'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { CreateComponentGroupType, CreateComponentType } from '@/packages/index.d'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -112,6 +113,7 @@ watch(
         }
         replaceMergeArr.value = ['series']
         nextTick(() => {
+          useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
           replaceMergeArr.value = []
         })
       }

@@ -35,6 +35,7 @@ import { useFullScreen } from '../../utls/fullScreen'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -112,6 +113,7 @@ watch(
         }
         replaceMergeArr.value = ['series']
         nextTick(() => {
+          useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
           replaceMergeArr.value = []
         })
       }

@@ -41,6 +41,7 @@ import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { useChartInteract } from '@/hooks/external/useChartSelectDeviceInteract.hook'
 import { getPacketIntervalByRange } from './helper'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -122,6 +123,7 @@ watch(
         }
         replaceMergeArr.value = ['series']
         nextTick(() => {
+          useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
           replaceMergeArr.value = []
         })
       }

@@ -35,6 +35,7 @@ import cloneDeep from 'lodash/cloneDeep'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import {CreateComponentGroupType, CreateComponentType} from '@/packages/index.d'
+import { useEchartsMapLegend } from '@/hooks/external/useEchartLegendMapChinese.hook'
 
 const props = defineProps({
   themeSetting: {
@@ -214,6 +215,7 @@ watch(
         }
         replaceMergeArr.value = ['series']
         nextTick(() => {
+          useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
           replaceMergeArr.value = []
         })
       }