Merge branch 'ft' into 'main_dev'

fix(src/packages): 修复请求属性的时候，属性名称没显示，预览显示正常

See merge request yunteng/thingskit-view!129

@@ -16,13 +16,13 @@
 </template>
 </template>
 
 
 <script setup lang="ts">
 <script setup lang="ts">
-import { PropType, computed, watch, ref, onMounted, unref, toRaw, toRefs } from 'vue'
+import { PropType, computed, watch, ref, onMounted, unref, toRaw, toRefs,nextTick } from 'vue'
 import VChart from 'vue-echarts'
 import VChart from 'vue-echarts'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { useCanvasInitOptions } from '@/hooks/useCanvasInitOptions.hook'
 import { use } from 'echarts/core'
 import { use } from 'echarts/core'
 import { CanvasRenderer } from 'echarts/renderers'
 import { CanvasRenderer } from 'echarts/renderers'
 import { LineChart } from 'echarts/charts'
 import { LineChart } from 'echarts/charts'
-import config, { includes } from './config'
+import config, { includes,seriesItem } from './config'
 import { mergeTheme } from '@/packages/public/chart'
 import { mergeTheme } from '@/packages/public/chart'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
 import { useChartDataFetch } from '@/hooks'
 import { useChartDataFetch } from '@/hooks'
@@ -32,6 +32,8 @@ import dataJson from './data.json'
 import { useFullScreen } from '../../utls/fullScreen'
 import { useFullScreen } from '../../utls/fullScreen'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { SocketReceiveMessageType } from '@/store/external/modules/socketStore.d'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
 import { useAssembleDataHooks } from '@/hooks/external/useAssembleData.hook'
+import isObject from 'lodash/isObject'
+import cloneDeep from 'lodash/cloneDeep'
 
 
 const props = defineProps({
 const props = defineProps({
   themeSetting: {
   themeSetting: {
@@ -161,6 +163,45 @@ watch(
   }
   }
 )
 )
 
 
+// dataset 无法变更条数的补丁
+watch(
+  () => props.chartConfig.option.dataset,
+  (newData: { dimensions: any }, oldData) => {
+    try {
+      if (!isObject(newData) || !('dimensions' in newData)) return
+      if (Array.isArray(newData?.dimensions)) {
+        const seriesArr = []
+        // 对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.dimensions.length >= 1 ? newData.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(seriesItem))
+          }
+          props.chartConfig.option.series.push(...seriesArr)
+        }
+        replaceMergeArr.value = ['series']
+        nextTick(() => {
+          replaceMergeArr.value = []
+        })
+      }
+    } catch (error) {
+      console.log(error)
+    }
+  },
+  {
+    deep: false
+  }
+)
+
 //fix 修复v-chart图表绑定联动组件视图不更新问题
 //fix 修复v-chart图表绑定联动组件视图不更新问题
 const updateVChart = (newData: SocketReceiveMessageType) => {
 const updateVChart = (newData: SocketReceiveMessageType) => {
   if (!newData) return
   if (!newData) return