Merge branch 'fix/line-real-time' into 'main_dev'

fix： 修改h实时数据折线图名称标识符改成名称

See merge request yunteng/thingskit-view!200

@@ -8,7 +8,7 @@ export const includes = ['legend', 'xAxis', 'yAxis', 'grid']
 export const seriesItem = {
 export const seriesItem = {
   type: 'line',
   type: 'line',
   label: {
   label: {
-    show: true,
+    show: false,
     position: 'top',
     position: 'top',
     color: '#fff',
     color: '#fff',
     fontSize: 12
     fontSize: 12

@@ -205,23 +205,28 @@ watch(
 //fix 修复v-chart图表绑定联动组件视图不更新问题
 //fix 修复v-chart图表绑定联动组件视图不更新问题
 const updateVChart = (newData: SocketReceiveMessageType) => {
 const updateVChart = (newData: SocketReceiveMessageType) => {
   if (!newData) return
   if (!newData) return
-  const { option } = props.chartConfig
+  const { option,request } = props.chartConfig
+  const {requestParams:{Params:{attrName}}} = request || {}
   const { dataset: overrideDataset } = option
   const { dataset: overrideDataset } = option
   const { dimensions } = overrideDataset
   const { dimensions } = overrideDataset
   if (!Array.isArray(dimensions)) return
   if (!Array.isArray(dimensions)) return
   const { data } = newData
   const { data } = newData
-  const { keys, record } = useAssembleDataHooks(data,dimensions)
+  const {  record } = useAssembleDataHooks(data,dimensions,(attrName as any))
   if (unref(realTimeList).length >= chartMaxDataPoint.value) {
   if (unref(realTimeList).length >= chartMaxDataPoint.value) {
     unref(realTimeList).splice(0, 1)
     unref(realTimeList).splice(0, 1)
   }
   }
   realTimeList.value.push(record)
   realTimeList.value.push(record)
-  const dataset = {
-    dimensions: ['ts', ...keys],
+  const dataset = { 
+    dimensions: ['ts', ...attrName],
     source: toRaw(unref(realTimeList))
     source: toRaw(unref(realTimeList))
   }
   }
+  option.series.forEach((item:any,index:number)=>{
+    item.name = attrName?.[index]
+  })
   vChartRef.value?.setOption({
   vChartRef.value?.setOption({
-    ...option.value,
-    dataset
+    ...option,
+    dataset,
+    legend:{data:attrName || []}
   })
   })
 }
 }
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {
 const { vChartRef } = useChartDataFetch(props.chartConfig, useChartEditStore, newData => {

@@ -3,9 +3,10 @@
  * @param data {'wendu':[[xxxxxx,xxxx]]}
  * @param data {'wendu':[[xxxxxx,xxxx]]}
  * @returns keys:[xx,xx,xx] record:{'x':'xx'}
  * @returns keys:[xx,xx,xx] record:{'x':'xx'}
  */
  */
+import { isNullOrUnDef } from '@/utils/external/is'
 import dayjs from 'dayjs'
 import dayjs from 'dayjs'
 
 
-export const useAssembleDataHooks = (data: Record<string, string | [number, string]>, dimensions: string[]) => {
+export const useAssembleDataHooks = (data: Record<string, string | [number, string]>, dimensions: string[],attrName?:string[]) => {
   const formatValueToNumber = (value: string | number, defaultValue = 0) =>
   const formatValueToNumber = (value: string | number, defaultValue = 0) =>
     isNaN(value as number) ? defaultValue : Number(value)
     isNaN(value as number) ? defaultValue : Number(value)
   const tempObj: Recordable = {}
   const tempObj: Recordable = {}
@@ -17,11 +18,12 @@ export const useAssembleDataHooks = (data: Record<string, string | [number, stri
       })
       })
     })
     })
   const keys = Object.keys(tempObj)
   const keys = Object.keys(tempObj)
-  const record = keys.reduce((prev, next) => {
+  const record = keys.reduce((prev, next,index) => {
     const [latest] = data[next] || []
     const [latest] = data[next] || []
+    if (isNullOrUnDef(latest)) return prev
     const [ts, value] = latest as unknown as string[]
     const [ts, value] = latest as unknown as string[]
     //把值转为number类型 wendu:"23" 转为 wendu:23
     //把值转为number类型 wendu:"23" 转为 wendu:23
-    return { ...prev, ts: dayjs(ts).format('YYYY-MM-DD HH:mm:ss'), [next]: formatValueToNumber(value) }
+    return { ...prev, ts: dayjs(ts).format('YYYY-MM-DD HH:mm:ss'),[ attrName![index]]: formatValueToNumber(value) }
   }, {})
   }, {})
 
 
   return {
   return {

@@ -327,7 +327,8 @@ export const useSocketStore = defineStore({
         try {
         try {
           fn?.(value)
           fn?.(value)
         } catch (error) {
         } catch (error) {
-          throw `componentIds: ${componentIds} call update function happend error!`
+          console.error(`componentIds: ${componentIds} call update function happend error!`)
+          throw error
         }
         }
         this.updateComponentById(targetComponentId as string, value)
         this.updateComponentById(targetComponentId as string, value)
       })
       })

@@ -19,7 +19,8 @@ export enum BuiltInVariable {
   DEVICE_PROFILE_ID = 'deviceProfileId',
   DEVICE_PROFILE_ID = 'deviceProfileId',
   DATE_FIXED = 'fixed_date',
   DATE_FIXED = 'fixed_date',
   DATE_RANGE = 'date_range',
   DATE_RANGE = 'date_range',
-  SELECT_TIME_AGGREGATION = 'selectTimeAggregation'
+  SELECT_TIME_AGGREGATION = 'selectTimeAggregation',
+  ATTR_NAME='attrName'
 }
 }
 
 
 export enum ComponentType {
 export enum ComponentType {
@@ -134,7 +135,6 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
 
 
   const getValue = computed(() => {
   const getValue = computed(() => {
     const value = { ...unref(params) }
     const value = { ...unref(params) }
-
     if (Reflect.has(value, BuiltInVariable.DATE_FIXED)) {
     if (Reflect.has(value, BuiltInVariable.DATE_FIXED)) {
       const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_FIXED)
       const fieldMapping = unref(getParams).find(item => item.key === BuiltInVariable.DATE_FIXED)
       Reflect.set(value, fieldMapping?.value || '', value[BuiltInVariable.DATE_FIXED])
       Reflect.set(value, fieldMapping?.value || '', value[BuiltInVariable.DATE_FIXED])
@@ -229,8 +229,12 @@ export const useDynamicPublicForm = (paramsItemList: Ref<ParamsItemType[]>) => {
       labelField: 'name',
       labelField: 'name',
       valueField: 'identifier',
       valueField: 'identifier',
       multiple: true,
       multiple: true,
-      onUpdateValue(value) {
+      onUpdateValue(value:any) {
         params[BuiltInVariable.KEYS] = value
         params[BuiltInVariable.KEYS] = value
+        //保存物模型name
+        const attrNameList = unref(optionsSet[BuiltInVariable.KEYS])
+        
+        params[BuiltInVariable.ATTR_NAME] = value.map((item:any) => attrNameList.find((temp:any)=>temp.identifier==item).name)
       }
       }
     }
     }
   })
   })