Merge branch 'perf/main_dev' of http://git.yunteng.com/yunteng/thingskit-scada into fix/zfl

@@ -9,6 +9,7 @@ import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { SocketSubscriberEnum } from '@/enums/datasource'
 import { SocketSubscriberEnum } from '@/enums/datasource'
 import type { SubscriptionData } from '@/core/websocket/type/message'
 import type { SubscriptionData } from '@/core/websocket/type/message'
 import { formatToDateTime } from '@/utils/dateUtil'
 import { formatToDateTime } from '@/utils/dateUtil'
+import type { CommandSource } from '@/core/websocket/processor'
 
 
 const props = defineProps<{
 const props = defineProps<{
   config: CreateComponentType
   config: CreateComponentType
@@ -25,18 +26,25 @@ function initChartInstance() {
   chartInstance.value.setOption(defaultOption)
   chartInstance.value.setOption(defaultOption)
 }
 }
 
 
-const handleHistoryData = (message: SubscriptionData, attr: string) => {
-  const data = message[attr]
+const handleHistoryData = (commandSource: CommandSource, message: SubscriptionData) => {
+  const { data } = commandSource
+  const { attrInfo, deviceInfo, attr } = data as NodeDataDataSourceJsonType
+  const { deviceName } = deviceInfo || {}
+
+  const historyData = message[attr]
   const xAxisData: string[] = []
   const xAxisData: string[] = []
   const seriesData: number[] = []
   const seriesData: number[] = []
 
 
-  for (const item of data) {
+  for (const item of historyData) {
     const [ts, value] = item
     const [ts, value] = item
     xAxisData.push(formatToDateTime(ts))
     xAxisData.push(formatToDateTime(ts))
     seriesData.push(value)
     seriesData.push(value)
   }
   }
 
 
   unref(chartInstance)?.setOption({
   unref(chartInstance)?.setOption({
+    title: {
+      text: `${deviceName || ''}-${attrInfo.name || ''}`,
+    },
     xAxis: { data: xAxisData },
     xAxis: { data: xAxisData },
     series: { data: seriesData },
     series: { data: seriesData },
   } as EChartsOption)
   } as EChartsOption)
@@ -45,11 +53,11 @@ const handleHistoryData = (message: SubscriptionData, attr: string) => {
 const { onMessage } = useOnMessage({
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
     const { data } = commandSource
-    const { chartOption, attr } = data as NodeDataDataSourceJsonType
+    const { chartOption } = data as NodeDataDataSourceJsonType
     const { queryType } = chartOption || {}
     const { queryType } = chartOption || {}
 
 
     if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
     if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
-      handleHistoryData(message.data, attr)
+      handleHistoryData(commandSource, message.data)
   },
   },
 })
 })
 
 

@@ -4,7 +4,8 @@ import { isLightboxMode } from '@/utils/env'
 export const getDefaultOption = (): EChartsOption => {
 export const getDefaultOption = (): EChartsOption => {
   return {
   return {
     tooltip: {
     tooltip: {
-      trigger: 'axis',
+      trigger: 'item',
+      confine: true,
     },
     },
     grid: {
     grid: {
       left: '3%',
       left: '3%',

@@ -64,7 +64,7 @@ const handlerTimeSeriesData = (commandSource: CommandSource, message: Subscripti
 
 
   unref(chartInstance)?.setOption({
   unref(chartInstance)?.setOption({
     title: {
     title: {
-      text: `${deviceName}-${attrInfo.name}`,
+      text: `${deviceName || ''}-${attrInfo.name || ''}`,
     },
     },
     dataset: {
     dataset: {
       dimensions: ['ts', attr],
       dimensions: ['ts', attr],