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

perf: 优化设备物模型无有效数据时过滤无效数据

See merge request yunteng/thingskit-front!925

@@ -15,7 +15,7 @@
   import { getDeviceAttrs } from '/@/api/device/deviceManager';
   import { getDeviceAttrs } from '/@/api/device/deviceManager';
   import { DeviceModelOfMatterAttrs, DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceModelOfMatterAttrs, DeviceRecord } from '/@/api/device/model/deviceModel';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
-  import { isArray, isObject } from '/@/utils/is';
+  import { isArray, isNull, isObject } from '/@/utils/is';
   import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
   import { useGlobSetting } from '/@/hooks/setting';
   import { useGlobSetting } from '/@/hooks/setting';
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
@@ -161,14 +161,14 @@
 
 
         handleFilterChange();
         handleFilterChange();
 
 
-        unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
+        unref(mode) === EnumTableCardMode.TABLE && setTableModeData();
       } catch (error) {}
       } catch (error) {}
     },
     },
     resetFunc: async () => {
     resetFunc: async () => {
       try {
       try {
         socketInfo.filterAttrKeys = [];
         socketInfo.filterAttrKeys = [];
         handleFilterChange();
         handleFilterChange();
-        unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
+        unref(mode) === EnumTableCardMode.TABLE && setTableModeData();
       } catch (error) {}
       } catch (error) {}
     },
     },
   });
   });
@@ -200,7 +200,7 @@
   const switchMode = async (value: EnumTableCardMode) => {
   const switchMode = async (value: EnumTableCardMode) => {
     mode.value = value;
     mode.value = value;
     await nextTick();
     await nextTick();
-    unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
+    unref(mode) === EnumTableCardMode.TABLE && setTableModeData();
     socketInfo.filterAttrKeys = [];
     socketInfo.filterAttrKeys = [];
   };
   };
 
 
@@ -280,7 +280,7 @@
 
 
           await nextTick();
           await nextTick();
 
 
-          unref(mode) === EnumTableCardMode.TABLE && setTableData(socketInfo.dataSource);
+          unref(mode) === EnumTableCardMode.TABLE && setTableModeData();
         }
         }
       } catch (error) {}
       } catch (error) {}
     },
     },
@@ -292,6 +292,10 @@
     },
     },
   });
   });
 
 
+  function setTableModeData() {
+    setTableData(socketInfo.dataSource.filter((item) => !isNull(item.value)));
+  }
+
   const handleShowDetail = (record: DataSource) => {
   const handleShowDetail = (record: DataSource) => {
     const { key } = record;
     const { key } = record;
     socketInfo.attr = key;
     socketInfo.attr = key;
@@ -308,9 +312,11 @@
 
 
   const formatValue = (item: DataSource) => {
   const formatValue = (item: DataSource) => {
     return item.type === DataTypeEnum.IS_BOOL
     return item.type === DataTypeEnum.IS_BOOL
-      ? !!Number(item.value)
-        ? item.boolOpen
-        : item.boolClose
+      ? !isNull(item.value)
+        ? !!Number(item.value)
+          ? item.boolOpen
+          : item.boolClose
+        : '--'
       : item.value || '--';
       : item.value || '--';
   };
   };
 
 
@@ -406,7 +412,11 @@
       </List>
       </List>
     </section>
     </section>
 
 
-    <BasicTable v-if="mode === EnumTableCardMode.TABLE" @register="registerTable">
+    <BasicTable
+      v-if="mode === EnumTableCardMode.TABLE"
+      @register="registerTable"
+      class="device-things-model-table-mode"
+    >
       <template #toolbar>
       <template #toolbar>
         <div
         <div
           v-show="mode === EnumTableCardMode.TABLE"
           v-show="mode === EnumTableCardMode.TABLE"
@@ -447,6 +457,10 @@
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
   }
   }
+
+  .device-things-model-table-mode:deep(.ant-table-placeholder) {
+    height: auto;
+  }
 </style>
 </style>
 
 
 <style>
 <style>