From 0d26cdbd93200cd3118fb6056d22b24674abd818 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Sat, 15 Jul 2023 17:37:44 +0800
Subject: [PATCH] fix: bug#16325

---
 .../components/Metadata/Import/index.vue      |  2 +-
 src/views/edge/Resource/index.vue             | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 05eb5b63..c313df55 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -30,7 +30,7 @@
           <j-select-option value="script">脚本</j-select-option>
         </j-select>
       </j-form-item>
-      <j-form-item label="文件上传" v-bind="validateInfos.upload" v-if="formModel.metadataType === 'file'">
+      <j-form-item v-if="formModel.type === 'import' && formModel.metadataType === 'file'" label="文件上传" v-bind="validateInfos.upload">
         <j-input v-model:value="formModel.upload">
           <template #addonAfter>
             <j-upload v-model:file-list="fileList" :before-upload="beforeUpload" accept=".json" :show-upload-list="false"
diff --git a/src/views/edge/Resource/index.vue b/src/views/edge/Resource/index.vue
index 7857b61e..5953f4b6 100644
--- a/src/views/edge/Resource/index.vue
+++ b/src/views/edge/Resource/index.vue
@@ -214,14 +214,17 @@ const columns = [
                 new Promise((resolve) => {
                     query({
                         paging: false,
-                        sotrs: [{ name: 'createTime', order: 'desc' }],
+                        sorts: [{ name: 'createTime', order: 'desc' }],
                     }).then((resp: any) => {
-                        resolve(
-                            resp.result.data.map((item: any) => ({
-                                label: item.category,
-                                value: item.category
-                            }))
-                        )
+                      const arrMap = new Map()
+                      resp.result.data.forEach((item: any) => {
+                        const labelItem = options.find(a => a.value === item.category)
+                        arrMap.set(item.category, {
+                          label: labelItem?.label || item.category,
+                          value: item.category,
+                        })
+                      })
+                      resolve([...arrMap.values()]);
                     });
                 }),
         },
@@ -244,12 +247,14 @@ const columns = [
                             },
                         ],
                     }).then((resp: any) => {
-                        resolve(
-                            resp.result.map((item: any) => ({
-                                label: item.sourceName,
-                                value: item.sourceId,
-                            })),
-                        );
+                        const arrMap = new Map()
+                        resp.result.data.forEach((item: any) => {
+                          arrMap.set(item.sourceId, {
+                            label: item.sourceName,
+                            value: item.sourceId,
+                          })
+                        })
+                        resolve([...arrMap.values()]);
                     });
                 }),
         },