Merge branch 'fix/object-model-import' into 'main_dev'

fix: 修复物模型导入空对象时报错

See merge request yunteng/thingskit-front!713

@@ -247,6 +247,8 @@
     return { flag, data };
     return { flag, data };
   };
   };
 
 
+  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
+
   const importLoading = ref(false);
   const importLoading = ref(false);
   const handleImportModel = async (data: { file: File }) => {
   const handleImportModel = async (data: { file: File }) => {
     const fileReader = new FileReader();
     const fileReader = new FileReader();
@@ -259,6 +261,14 @@
       }
       }
       try {
       try {
         importLoading.value = true;
         importLoading.value = true;
+
+        Object.keys(data || {}).forEach((key) => {
+          const value = (data || {})[key];
+          if (value && isEmptyObject(value)) {
+            (data || {})[key] = [];
+          }
+        });
+
         const result = await importModelOfMatter({
         const result = await importModelOfMatter({
           tkDeviceProfileId: props.record.id,
           tkDeviceProfileId: props.record.id,
           data: data!,
           data: data!,

@@ -25,6 +25,7 @@
   import { Button } from 'ant-design-vue';
   import { Button } from 'ant-design-vue';
   import { getModelTsl } from '/@/api/device/modelOfMatter';
   import { getModelTsl } from '/@/api/device/modelOfMatter';
   import { FunctionType } from './cpns/config';
   import { FunctionType } from './cpns/config';
+  import { isObject } from '/@/utils/is';
 
 
   defineEmits(['register']);
   defineEmits(['register']);
 
 
@@ -78,11 +79,17 @@
     ]);
     ]);
   };
   };
 
 
+  const isEmptyObject = (value: any) => isObject(value) && !Object.keys(value).length;
+
   const handleExportAll = async () => {
   const handleExportAll = async () => {
     loading.value = true;
     loading.value = true;
     try {
     try {
       const [events, properties, services] = await getAllModel();
       const [events, properties, services] = await getAllModel();
-      const value = { properties, services, events };
+      const value = {
+        properties: isEmptyObject(properties) ? [] : properties,
+        services: isEmptyObject(services) ? [] : services,
+        events: isEmptyObject(events) ? [] : events,
+      };
       exportJSONFile(value);
       exportJSONFile(value);
     } catch (error) {
     } catch (error) {
       throw error;
       throw error;