Merge branch 'cherry-pick-e704e9bf' into 'main'

Merge branch 'feat-import-model-of-matter' into 'main_dev'

See merge request yunteng/thingskit-front!602

@@ -34,7 +34,7 @@
               </Authority>
               <Button type="primary" @click="handleOpenTsl"> 物模型TSL </Button>
               <Upload v-if="isShowBtn" :show-upload-list="false" :customRequest="handleImportModel">
-                <Button type="primary"> 导入物模型 </Button>
+                <Button type="primary" :loading="importLoading"> 导入物模型 </Button>
               </Upload>
             </div>
             <div class="flex gap-2">
@@ -247,21 +247,34 @@
     return { flag, data };
   };
 
+  const importLoading = ref(false);
   const handleImportModel = async (data: { file: File }) => {
     const fileReader = new FileReader();
 
     fileReader.onload = async () => {
       const { flag, data } = paseJSON(fileReader.result as string);
-      if (!flag) return;
-      const result = await importModelOfMatter({
-        tkDeviceProfileId: props.record.id,
-        data: data!,
-        functionType: 'all',
-      });
+      if (!flag) {
+        createMessage.warning('JSON解析失败,请导入正确的JSON~');
+        return;
+      }
+      try {
+        importLoading.value = true;
+        const result = await importModelOfMatter({
+          tkDeviceProfileId: props.record.id,
+          data: data!,
+          functionType: 'all',
+        });
 
-      result ? createMessage.success('导入成功~') : createMessage.error('导入失败~');
+        result
+          ? createMessage.success('导入成功~')
+          : createMessage.error('JSON解析失败,请导入正确的JSON~');
 
-      result && reload();
+        result && reload();
+      } catch (error) {
+        throw error;
+      } finally {
+        importLoading.value = false;
+      }
     };
 
     fileReader.readAsText(data.file, 'utf-8');