From 99637f09381d395f42b9e7b9686d43fa45c64da8 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 6 Jul 2023 14:56:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Instance/Detail/MetadataMap/index.vue     | 23 +++++++------
 .../Product/Detail/MetadataMap/index.vue      | 32 ++++++++-----------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/views/device/Instance/Detail/MetadataMap/index.vue b/src/views/device/Instance/Detail/MetadataMap/index.vue
index 6efae3f1..23fa40c3 100644
--- a/src/views/device/Instance/Detail/MetadataMap/index.vue
+++ b/src/views/device/Instance/Detail/MetadataMap/index.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="metadata-map">
         <div class="left">
-            <j-input-search
-                style="width: 350px; margin-bottom: 24px"
-                placeholder="搜索平台属性名称"
-                allowClear
-                @search="search"
-            />
+            <j-space style="margin-bottom: 24px">
+                <j-select @change="onSearchChange" show-search allow-clear placeholder="请选择属性名称" style="width: 250px;">
+                    <j-select-option :label="item.name" v-for="item in dataSourceCache" :value="item?.id" :key="item?.id">{{item?.name}}</j-select-option>
+                </j-select>
+                <j-button type="primary" @click="onSearch"><AIcon type="SearchOutlined" /></j-button>
+            </j-space>
             <div class="box">
                 <j-scrollbar height="100%">
                     <j-table
@@ -150,6 +150,7 @@ const filterValue = ref<boolean | undefined>(undefined);
 const originalData = ref([]);
 
 const _value = ref<any>(undefined);
+const searchValue = ref<any>(undefined);
 
 const columns = [
     {
@@ -216,10 +217,14 @@ const customRow = (record: any) => {
     };
 };
 
-const search = (value: string) => {
-    if (value) {
+const onSearchChange = (_: any, options: any) => {
+    searchValue.value = options?.label
+}
+
+const onSearch = () => {
+    if (searchValue.value) {
         const _item: any = dataSourceCache.value.find((item: any) => {
-            return value === item?.name;
+            return searchValue.value === item?.name;
         });
        if(_item) {
             _value.value = _item?.name;
diff --git a/src/views/device/Product/Detail/MetadataMap/index.vue b/src/views/device/Product/Detail/MetadataMap/index.vue
index 762aef27..aa944c1e 100644
--- a/src/views/device/Product/Detail/MetadataMap/index.vue
+++ b/src/views/device/Product/Detail/MetadataMap/index.vue
@@ -1,12 +1,12 @@
 <template>
     <div class="metadata-map">
         <div class="left">
-            <j-input-search
-                style="width: 350px; margin-bottom: 24px"
-                placeholder="搜索平台属性名称"
-                allowClear
-                @search="search"
-            />
+          <j-space style="margin-bottom: 24px">
+                <j-select @change="onSearchChange" show-search allow-clear placeholder="请选择属性名称" style="width: 250px;">
+                    <j-select-option :label="item.name" v-for="item in dataSourceCache" :value="item?.id" :key="item?.id">{{item?.name}}</j-select-option>
+                </j-select>
+                <j-button type="primary" @click="onSearch"><AIcon type="SearchOutlined" /></j-button>
+            </j-space>
             <div class="box">
                 <j-scrollbar height="100%">
                     <j-table
@@ -150,6 +150,7 @@ const pluginOptions = ref<any[]>([]);
 
 const filterValue = ref<boolean | undefined>(undefined);
 const originalData = ref([]);
+const searchValue = ref<any>(undefined);
 
 // const tableFilter = (value: string, record: any) => {
 //   return true
@@ -210,27 +211,20 @@ const getMetadataMapData = () => {
     });
 };
 
-// const search = (value: string) => {
-//   if (value) {
-//     dataSource.value = dataSourceCache.value.filter((item: any) => {
-//       return !!item.name?.includes(value)
-//     })
-//   } else {
-//     dataSource.value = dataSourceCache.value
-//   }
-// }
-
 const customRow = (record: any) => {
     return {
         id: record.id,
         class: _value.value === record?.name ? 'metadata-search-row' : '',
     };
 };
+const onSearchChange = (_: any, options: any) => {
+    searchValue.value = options?.label
+}
 
-const search = (value: string) => {
-    if (value) {
+const onSearch = () => {
+    if (searchValue.value) {
         const _item: any = dataSourceCache.value.find((item: any) => {
-            return value === item?.name;
+            return searchValue.value === item?.name;
         });
         if(_item) {
           _value.value = _item?.name;