From 42d18f687bb30fc37cced7a0438358bd6c8c279d Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Mon, 30 Jan 2023 18:38:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Metadata/Import/index.vue      | 23 ++++++++++++++-----
 .../device/components/Metadata/index.vue      |  1 -
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index a5285c75..5fcf73d7 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -34,13 +34,14 @@
       <a-form-item label="文件上传" v-bind="validateInfos.upload" v-if="formModel.metadataType === 'file'">
         <a-input v-model:value="formModel.upload">
           <template #addonAfter>
-            <label for="uploadFile"><upload-outlined/></label>
+            <a-upload v-model:file-list="fileList" :before-upload="beforeUpload" accept=".json"
+              :show-upload-list="false" :action="FILE_UPLOAD" @change="fileChange"
+              :headers="{ 'X-Access-Token': token }">
+              <upload-outlined class="upload-button"/>
+              <!-- <button id="uploadFile" style="display: none;"></button> -->
+            </a-upload>
           </template>
         </a-input>
-        <a-upload v-model:file-list="fileList" name="files" :before-upload="beforeUpload" accept=".json"
-          :show-upload-list="false" :action="FILE_UPLOAD" @change="fileChange" :headers="{ 'X-Access-Token': token }">
-          <button id="uploadFile" style="display: none;"></button>
-        </a-upload>
       </a-form-item>
       <a-form-item label="物模型" v-bind="validateInfos.import" v-if="formModel.metadataType === 'script'">
         <!-- TODO代码编辑器 -->
@@ -61,7 +62,7 @@ import { Store } from 'jetlinks-store';
 import { SystemConst } from '@/utils/consts';
 import { useInstanceStore } from '@/store/instance'
 import { useProductStore } from '@/store/product';
-import { UploadOutlined } from '@ant-design/icons-vue';
+import { UploadOutlined, ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { FILE_UPLOAD } from '@/api/comm';
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
@@ -175,6 +176,10 @@ const beforeUpload: UploadProps['beforeUpload'] = file => {
 const fileChange = (info: UploadChangeParam) => {
   if (info.file.status === 'done') {
     console.log(info)
+    const { response } = info.file
+    if (response.status === 200) {
+      formModel.upload = response.result
+    }
   }
 }
 
@@ -285,4 +290,10 @@ const handleImport = async () => {
     padding: 10px;
   }
 }
+.upload-button {
+  width: 37px;
+  height: 30px; 
+  line-height: 30px;
+  margin: 0 -11px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/index.vue b/src/views/device/components/Metadata/index.vue
index 3493c164..9250a832 100644
--- a/src/views/device/components/Metadata/index.vue
+++ b/src/views/device/components/Metadata/index.vue
@@ -44,7 +44,6 @@
         <BaseMetadata target={props.type} type="tags" :permission="permission" />
       </a-tab-pane>
     </a-tabs>
-    {{ visible }}
     <Import v-model:visible="visible" :type="type" @close="visible = false" />
     <Cat v-model:visible="cat" @close="cat = false" :type="type" />
   </div>