Merge branch 'fix/device-things-model' into 'main_dev'

fix: 修复设备物模型筛选后的物模型无法接收socket数据

See merge request yunteng/thingskit-front!845

@@ -39,6 +39,7 @@
     type?: string;
     type?: string;
     boolClose?: string;
     boolClose?: string;
     boolOpen?: string;
     boolOpen?: string;
+    name?: string;
     detail: DeviceModelOfMatterAttrs;
     detail: DeviceModelOfMatterAttrs;
   }
   }
 
 
@@ -61,23 +62,27 @@
     showQuickJumper: true,
     showQuickJumper: true,
     hideOnSinglePage: false,
     hideOnSinglePage: false,
     showTotal: (total: number) => `共${total}条数据`,
     showTotal: (total: number) => `共${total}条数据`,
-    onChange: handleChange,
-    onShowSizeChange: handleChange,
+    onChange: handleFilterChange,
+    onShowSizeChange: handleFilterChange,
   });
   });
 
 
   const socketInfo = reactive({
   const socketInfo = reactive({
     cmdId: 0,
     cmdId: 0,
     origin: `${socketUrl}${token}`,
     origin: `${socketUrl}${token}`,
     attr: undefined as string | undefined,
     attr: undefined as string | undefined,
-    originData: [] as DataSource[],
     dataSource: [] as DataSource[],
     dataSource: [] as DataSource[],
     message: {} as ReceiveMessage['data'],
     message: {} as ReceiveMessage['data'],
     attrKeys: [] as DeviceModelOfMatterAttrs[],
     attrKeys: [] as DeviceModelOfMatterAttrs[],
+    filterAttrKeys: [] as DeviceModelOfMatterAttrs[],
   });
   });
 
 
   const getPaginationAttrkey = computed<DeviceModelOfMatterAttrs[]>(() => {
   const getPaginationAttrkey = computed<DeviceModelOfMatterAttrs[]>(() => {
     const { current = 1, pageSize = 10 } = pagination;
     const { current = 1, pageSize = 10 } = pagination;
-    return socketInfo.attrKeys.slice(current * pageSize - pageSize, current * pageSize);
+    return (
+      socketInfo.filterAttrKeys && socketInfo.filterAttrKeys.length
+        ? socketInfo.filterAttrKeys
+        : socketInfo.attrKeys
+    ).slice(current * pageSize - pageSize, current * pageSize);
   });
   });
 
 
   function createUnsubscribeMessage(cmdId: number) {
   function createUnsubscribeMessage(cmdId: number) {
@@ -107,6 +112,22 @@
     };
     };
   });
   });
 
 
+  const getFilterSendValue = computed(() => {
+    return {
+      tsSubCmds: [
+        {
+          entityType: 'DEVICE',
+          entityId: props.deviceDetail!.tbDeviceId,
+          scope: 'LATEST_TELEMETRY',
+          cmdId: socketInfo.cmdId,
+          keys: unref(getPaginationAttrkey)
+            .map((item) => item.identifier)
+            .join(','),
+        },
+      ],
+    };
+  });
+
   const [registerForm, { getFieldsValue }] = useForm({
   const [registerForm, { getFieldsValue }] = useForm({
     schemas: [
     schemas: [
       {
       {
@@ -125,20 +146,29 @@
     submitFunc: async () => {
     submitFunc: async () => {
       try {
       try {
         const { value } = getFieldsValue() || {};
         const { value } = getFieldsValue() || {};
-        if (!value) setTableData(socketInfo.originData);
-        const data = unref(socketInfo.originData).filter(
-          (item) => item.key?.includes(value) || item.value?.includes(value)
-        );
+
+        pagination.current = 1;
+
+        socketInfo.filterAttrKeys = value
+          ? unref(socketInfo.attrKeys).filter(
+              (item) =>
+                item.identifier?.toUpperCase().includes(value.toUpperCase()) ||
+                item.name?.toUpperCase().includes(value.toUpperCase())
+            )
+          : socketInfo.attrKeys;
+
         await nextTick();
         await nextTick();
-        socketInfo.dataSource = data;
 
 
-        setTableData(data);
+        handleFilterChange();
+
+        unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
       } catch (error) {}
       } catch (error) {}
     },
     },
     resetFunc: async () => {
     resetFunc: async () => {
       try {
       try {
-        socketInfo.dataSource = socketInfo.originData;
-        setTableData(socketInfo.originData);
+        socketInfo.filterAttrKeys = [];
+        handleFilterChange();
+        unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
       } catch (error) {}
       } catch (error) {}
     },
     },
   });
   });
@@ -148,15 +178,19 @@
     showTableSetting: true,
     showTableSetting: true,
     pagination: pagination as any,
     pagination: pagination as any,
     bordered: true,
     bordered: true,
+    resizeHeightOffset: 16,
     showIndexColumn: false,
     showIndexColumn: false,
   });
   });
 
 
-  function handleChange(page: number, pageSize: number) {
+  function handleFilterChange(
+    page: number = pagination.current || 1,
+    pageSize: number = pagination.pageSize || 10
+  ) {
     pagination.current = page;
     pagination.current = page;
     pagination.pageSize = pageSize;
     pagination.pageSize = pageSize;
     send(JSON.stringify(createUnsubscribeMessage(socketInfo.cmdId)));
     send(JSON.stringify(createUnsubscribeMessage(socketInfo.cmdId)));
     socketInfo.cmdId = socketInfo.cmdId + 1;
     socketInfo.cmdId = socketInfo.cmdId + 1;
-    send(JSON.stringify(unref(getSendValue)));
+    send(JSON.stringify(unref(getFilterSendValue)));
   }
   }
 
 
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
@@ -166,8 +200,8 @@
   const switchMode = async (value: EnumTableCardMode) => {
   const switchMode = async (value: EnumTableCardMode) => {
     mode.value = value;
     mode.value = value;
     await nextTick();
     await nextTick();
-    setTableData(socketInfo.originData);
-    socketInfo.dataSource = socketInfo.originData;
+    unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
+    socketInfo.filterAttrKeys = [];
   };
   };
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
@@ -190,10 +224,15 @@
   };
   };
 
 
   const setDataSource = () => {
   const setDataSource = () => {
-    socketInfo.originData = socketInfo.dataSource = socketInfo.attrKeys.map((item) => {
+    socketInfo.dataSource = (
+      socketInfo.filterAttrKeys && socketInfo.filterAttrKeys.length
+        ? socketInfo.filterAttrKeys
+        : socketInfo.attrKeys
+    ).map((item) => {
       const { identifier: key, name, detail, accessMode } = item;
       const { identifier: key, name, detail, accessMode } = item;
       const { unit, boolClose, boolOpen, type } = getUnit(detail);
       const { unit, boolClose, boolOpen, type } = getUnit(detail);
-      const dataInfo = socketInfo.attrKeys.find((item) => item.identifier === key);
+      const dataInfo = socketInfo.filterAttrKeys.find((item) => item.identifier === key);
+
       let time: number | undefined;
       let time: number | undefined;
       let value: any | undefined;
       let value: any | undefined;
       const message = socketInfo.message[key];
       const message = socketInfo.message[key];
@@ -240,7 +279,8 @@
           setDataSource();
           setDataSource();
 
 
           await nextTick();
           await nextTick();
-          setTableData(socketInfo.dataSource);
+
+          unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
         }
         }
       } catch (error) {}
       } catch (error) {}
     },
     },