From 140465a61e9aa69377722916858805ef6a39bd6d Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Fri, 24 Mar 2023 09:51:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E9=98=BF=E9=87=8C=E4=BA=91=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=97=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/Metadata/Import/index.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 2f61c476..ee81c65e 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -15,7 +15,7 @@
         </j-select>
       </j-form-item>
       <j-form-item label="选择产品" v-bind="validateInfos.copy" v-if="formModel.type === 'copy'">
-        <j-select :options="productList" v-model:value="formModel.copy" option-filter-prop="label"></j-select>
+        <j-select :options="productList" v-model:value="formModel.copy" option-filter-prop="label" filterable></j-select>
       </j-form-item>
       <j-form-item label="物模型类型" v-bind="validateInfos.metadata" v-if="type === 'device' || formModel.type === 'import'">
         <j-select v-model:value="formModel.metadata">
@@ -209,19 +209,20 @@ const handleImport = async () => {
       const res = await convertMetadata('from', 'alink', data.import).catch(err => err)
       if (res.status === 200) {
         const metadata = operateLimits(res.result)
+        let result;
         if (props?.type === 'device') {
-          await saveMetadata(id as string, metadata).catch(err => err)
-          // instanceStore.setCurrent(JSON.parse(metadata || '{}'))
+          result = await saveMetadata(id as string, metadata).catch(err => err)
         } else {
-          await modify(id as string, { metadata: metadata }).catch(err => err)
-          // productStore.setCurrent(JSON.parse(metadata || '{}'))
+          result = await modify(id as string, { metadata: metadata }).catch(err => err)
+        }
+        if (result.success) {
+          message.success('导入成功')
         }
         loading.value = false
-        // MetadataAction.insert(JSON.parse(metadata || '{}'));
-        message.success('导入成功')
       } else {
         loading.value = false
-        message.error('发生错误!')
+        // message.error('物模型数据不正确!')
+        return
       }
       if (props?.type === 'device') {
         instanceStore.refresh(id as string)