Merge branch 'local_dev_latest' into 'main_dev'

fix(src/packages/components/Charts): 修复柱状和折线图，鼠标移入提示框里数据重复显示

See merge request yunteng/thingskit-view!222

@@ -45,11 +45,12 @@ export const lineSeriesItem = {
 
 
 export const option = {
 export const option = {
   tooltip: {
   tooltip: {
-    show: true,
     trigger: 'axis',
     trigger: 'axis',
     axisPointer: {
     axisPointer: {
-      show: true,
-      type: 'shadow'
+      type: 'cross',
+      crossStyle: {
+        color: '#999'
+      }
     }
     }
   },
   },
   legend: {
   legend: {

@@ -62,17 +62,30 @@ const option = computed(() => {
 // dataset 无法变更条数的补丁
 // dataset 无法变更条数的补丁
 watch(
 watch(
   () => props.chartConfig.option.dataset,
   () => props.chartConfig.option.dataset,
-  (newData: { dimensions: any }, oldData) => {
+  (newData: any, oldData) => {
     try {
     try {
       if (!isObject(newData) || !('dimensions' in newData)) return
       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))
+      if (Array.isArray((newData as any)?.dimensions)) {
+        const seriesArr: typeof barSeriesItem[] = []
+        // 对oldData进行判断，防止传入错误数据之后对旧维度判断产生干扰
+        // 此处计算的是dimensions的Y轴维度，若是dimensions.length为0或1，则默认为1，排除X轴维度干扰
+        const oldDimensions =
+          Array.isArray(oldData?.dimensions) && oldData.dimensions.length >= 1 ? oldData.dimensions.length : 1
+        const newDimensions = (newData as any).dimensions.length >= 1 ? (newData as any).dimensions.length : 1
+        const dimensionsGap = newDimensions - oldDimensions
+        if (dimensionsGap < 0) {
+          props.chartConfig.option.series.splice(newDimensions - 1)
+        } else if (dimensionsGap > 0) {
+          if (!oldData || !oldData?.dimensions || !Array.isArray(oldData?.dimensions) || !oldData?.dimensions.length) {
+            props.chartConfig.option.series = []
+          }
+          for (let i = 0; i < dimensionsGap; i++) {
+            seriesArr.push(cloneDeep(barSeriesItem))
+          }
+          props.chartConfig.option.series.push(...seriesArr)
         }
         }
-        useEchartsMapLegend(props.chartConfig, seriesArr)
+        useEchartsMapLegend(props.chartConfig, props.chartConfig.option.series)
         replaceMergeArr.value = ['series']
         replaceMergeArr.value = ['series']
-        props.chartConfig.option.series = seriesArr
         nextTick(() => {
         nextTick(() => {
           replaceMergeArr.value = []
           replaceMergeArr.value = []
         })
         })

 <template>
 <template>
-  <collapse-item name="数据源(option配置里的内容)" :expanded="true">
+  <collapse-item name="数据源(option配置里的内容,注意去除末尾分号)" :expanded="true">
     <monaco-editor v-model:modelValue="optionData.dataset" width="400px" height="480px" language="json" />
     <monaco-editor v-model:modelValue="optionData.dataset" width="400px" height="480px" language="json" />
   </collapse-item>
   </collapse-item>
 </template>
 </template>