Merge branch 'fix/data-board-socket' into 'main_dev'

fix: 修复数据看板socket连接问题

See merge request yunteng/thingskit-front!726

@@ -4,12 +4,12 @@
   import { ComponentPropsConfigType } from '../../../index.type';
   import { ComponentPropsConfigType } from '../../../index.type';
   import { option } from './config';
   import { option } from './config';
   import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
   import { UpdateTime } from '/@/views/visual/commonComponents/UpdateTime';
-  // import { useIntervalFn } from '@vueuse/core';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { DeviceName } from '/@/views/visual/commonComponents/DeviceName';
   import { useComponentScale } from '/@/views/visual/packages/hook/useComponentScale';
   import { useComponentScale } from '/@/views/visual/packages/hook/useComponentScale';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
   import { useReceiveMessage } from '../../../hook/useReceiveMessage';
   import { useReceiveValue } from '../../../hook/useReceiveValue';
   import { useReceiveValue } from '../../../hook/useReceiveValue';
   import { MultipleDataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import { MultipleDataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
+  import { useMultipleDataFetch } from '../../../hook/socket/useSocket';
 
 
   const props = defineProps<{
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
     config: ComponentPropsConfigType<typeof option>;

@@ -23,6 +23,7 @@ import {
   TsSubCmdsItemType,
   TsSubCmdsItemType,
 } from './useSocket.type';
 } from './useSocket.type';
 import { ComponentPropsConfigType } from '../../index.type';
 import { ComponentPropsConfigType } from '../../index.type';
+import { isNullOrUnDef } from '/@/utils/is';
 
 
 interface DeviceGroupMapType {
 interface DeviceGroupMapType {
   subscriptionId: number;
   subscriptionId: number;
@@ -70,11 +71,14 @@ class Subscriber {
   clearSubscriber = () => {
   clearSubscriber = () => {
     this.deviceGroupMap.clear();
     this.deviceGroupMap.clear();
     this.subscriptionMap.clear();
     this.subscriptionMap.clear();
-    this.componentUpdateFnMap.clear();
-    this.componentGroupUpdateFnMap.clear();
     this.customSubscribeMap.clear();
     this.customSubscribeMap.clear();
   };
   };
 
 
+  clearUpdateFn() {
+    this.componentUpdateFnMap.clear();
+    this.componentGroupUpdateFnMap.clear();
+  }
+
   addSubscriber = (info: Record<'deviceId' | 'slaveDeviceId' | 'attribute' | 'uuid', string>) => {
   addSubscriber = (info: Record<'deviceId' | 'slaveDeviceId' | 'attribute' | 'uuid', string>) => {
     const { deviceId, attribute, uuid } = info;
     const { deviceId, attribute, uuid } = info;
     if (!this.deviceGroupMap.has(deviceId)) {
     if (!this.deviceGroupMap.has(deviceId)) {
@@ -188,7 +192,7 @@ class Subscriber {
       return;
       return;
     }
     }
 
 
-    if (message.subscriptionId) {
+    if (!isNullOrUnDef(message.subscriptionId)) {
       this.triggerTsSubCmdsMessage(message);
       this.triggerTsSubCmdsMessage(message);
     }
     }
   }
   }
@@ -204,29 +208,30 @@ class Subscriber {
     const updateGroups = this.componentGroupUpdateFnMap.get(deviceId);
     const updateGroups = this.componentGroupUpdateFnMap.get(deviceId);
 
 
     if (updateGroups) {
     if (updateGroups) {
-      (updateGroups || []).forEach((item) => {
+      for (const item of updateGroups || []) {
         const { attributes, fn } = item;
         const { attributes, fn } = item;
         try {
         try {
-          if (!fn) return;
+          if (!fn) continue;
           fn?.(this.getGroupScopeMessage(message, attributes, deviceId), deviceId, attributes);
           fn?.(this.getGroupScopeMessage(message, attributes, deviceId), deviceId, attributes);
         } catch (error) {
         } catch (error) {
           console.error(`deviceId: ${deviceId}`);
           console.error(`deviceId: ${deviceId}`);
           throw error;
           throw error;
         }
         }
-      });
+      }
+      return;
     }
     }
 
 
-    subscriptionGroup.forEach((item) => {
+    for (const item of subscriptionGroup) {
       const { attribute, uuid } = item;
       const { attribute, uuid } = item;
       const updateFn = this.componentUpdateFnMap.get(uuid);
       const updateFn = this.componentUpdateFnMap.get(uuid);
       try {
       try {
-        if (!updateFn) return;
+        if (!updateFn) continue;
         updateFn?.(this.getScopeMessage(message, [attribute]), attribute);
         updateFn?.(this.getScopeMessage(message, [attribute]), attribute);
       } catch (error) {
       } catch (error) {
         console.error(`uuid: ${uuid}`);
         console.error(`uuid: ${uuid}`);
         throw error;
         throw error;
       }
       }
-    });
+    }
   }
   }
 
 
   triggerAlarmDataMesssage(message: ReceiveAlarmDataCmdsMessageType) {
   triggerAlarmDataMesssage(message: ReceiveAlarmDataCmdsMessageType) {
@@ -299,6 +304,8 @@ export const useSocket = (dataSourceRef: Ref<WidgetDataType[]>) => {
 
 
   onUnmounted(() => {
   onUnmounted(() => {
     close();
     close();
+    subscriber.clearSubscriber();
+    subscriber.clearUpdateFn();
   });
   });
 
 
   return {
   return {