From d8bc599164636bdb7d6d96bfc4a71fa81b6feeee Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Mon, 20 Mar 2023 17:48:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=A9=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=AF=BC=E5=85=A5BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/components/Metadata/Base/index.vue   | 6 +++---
 src/views/device/components/Metadata/Import/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue
index 7fc40407..11218dab 100644
--- a/src/views/device/components/Metadata/Base/index.vue
+++ b/src/views/device/components/Metadata/Base/index.vue
@@ -116,14 +116,14 @@ const pagination = {
   size: 'small',
 } as TablePaginationConfig
 const columns = computed(() => MetadataMapping.get(type)!.concat(actions))
-const items = computed(() => JSON.parse((target === 'product' ? productStore.current?.metadata : instanceStore.current.metadata) || '{}') as MetadataItem[])
+const items = computed(() => JSON.parse((target === 'product' ? productStore.current?.metadata : instanceStore.current.metadata) || '{}'))
 const searchValue = ref<string>()
 const handleSearch = (searchValue: string) => {
   if (searchValue) {
-    const arr = items.value.filter(item => item.name!.indexOf(searchValue) > -1).sort((a, b) => b?.sortsIndex - a?.sortsIndex)
+    const arr = items.value[type].filter((item: MetadataItem) => item.name!.indexOf(searchValue) > -1).sort((a: MetadataItem, b: MetadataItem) => b?.sortsIndex - a?.sortsIndex)
     data.value = arr
   } else {
-    data.value = items.value
+    data.value = items.value[type]
   }
 }
 
diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 71e1ba02..29991627 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -40,7 +40,7 @@
           </template>
         </j-input>
       </j-form-item>
-      <j-form-item v-bind="validateInfos.import" v-if="formModel.metadataType === 'script'">
+      <j-form-item v-bind="validateInfos.import" v-if="(type === 'device' || formModel.type === 'import') && formModel.metadataType === 'script'">
         <template #label>
           <j-space>
             物模型