From e7bfb4084e0a3dd59d8183b8ee8823789bcc10b4 Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Tue, 8 Apr 2025 15:18:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(search):=20=E8=B0=83=E6=95=B4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=84=E4=BB=B6j-advanced-search=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B9=E4=B8=BA=20j-search=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?,=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BAdr-iot?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=A4=B4=E9=83=A8=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?logo=E5=8F=B3=E4=BE=A7=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/components/Search/Search.vue              | 35 ++++++++++++----
 src/style.less                                |  2 +-
 src/views/Log/Access/index.vue                | 12 +++---
 src/views/Log/System/index.vue                |  6 +--
 src/views/device/Category/index.vue           | 42 +++++++++----------
 src/views/device/Instance/index.vue           | 12 +++---
 src/views/device/Product/index.vue            |  6 +--
 src/views/link/AccessConfig/index.vue         |  6 +--
 src/views/link/Certificate/index.vue          |  6 +--
 src/views/link/Protocol/index.vue             |  6 +--
 src/views/link/Type/index.vue                 |  6 +--
 src/views/notice/Config/index.vue             |  6 +--
 src/views/notice/Template/index.vue           |  6 +--
 .../rule-engine/Alarm/Configuration/index.vue |  6 +--
 .../Alarm/Log/TabComponent/index.vue          |  6 +--
 src/views/rule-engine/Scene/index.vue         |  6 +--
 src/views/system/Menu/index.vue               | 12 +++---
 src/views/system/Relationship/index.vue       |  6 +--
 src/views/system/Role/RoleRight/index.vue     |  6 +--
 20 files changed, 107 insertions(+), 88 deletions(-)

diff --git a/package.json b/package.json
index 8345f596..d029b8f5 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "jetlinks-vue",
+  "name": "dr-iot",
   "private": true,
   "version": "2.2.1",
   "scripts": {
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index 3e5cfd1d..77d566c0 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -1,16 +1,12 @@
 <template>
-  <j-advanced-search
+  <j-search
     :target='target'
-    :type='type'
-    :request='(data) => saveSearchHistory(data, target)'
-    :historyRequest='() => getSearchHistory(target)'
-    :deleteRequest='(_target: string, id: string) => deleteSearchHistory(target, id)'
-    :columns='columns'
+    :columns='processedColumns'
     :class='props.class'
     style='padding-top: 18px; padding-bottom: 18px;'
     @search='searchSubmit'
   />
-</template> 
+</template>
 
 <script setup lang='ts' name='ProSearch'>
 import { PropType } from 'vue'
@@ -29,7 +25,7 @@ const props = defineProps({
   },
   type: {
     type: String,
-    default: 'advanced'
+    default: 'terms'
   },
   target: {
     type: String,
@@ -44,10 +40,33 @@ const props = defineProps({
 
 const emit = defineEmits<Emit>()
 
+// 处理列配置，为每个带有search的列自动添加defaultValue（如果没有的话）
+const processedColumns = computed(() => {
+  return props.columns.map(column => {
+    // 如果列有search配置但没有defaultValue，则添加一个空的defaultValue
+    if (column.search && !column.search.hasOwnProperty('defaultValue')) {
+      return {
+        ...column,
+        search: {
+          ...column.search,
+          defaultValue: null
+        }
+      }
+    }
+    return column
+  })
+})
+
 /**
  * 提交
  */
 const searchSubmit = (data: any) => {
+  console.log("搜索--------",data)
+  data  = {
+    terms:[{
+      terms:data
+    }]
+  }
   emit('search', data)
 }
 
diff --git a/src/style.less b/src/style.less
index 45ea5ca7..edadcda3 100644
--- a/src/style.less
+++ b/src/style.less
@@ -25,7 +25,7 @@ body {
 
 .ant-pro-basicLayout {
     .ant-pro-top-nav-header-main {
-        gap: 16px;
+        //gap: 16px;
     }
 
     .ant-pro-top-nav-header {
diff --git a/src/views/Log/Access/index.vue b/src/views/Log/Access/index.vue
index 75adba2d..9b4ad390 100644
--- a/src/views/Log/Access/index.vue
+++ b/src/views/Log/Access/index.vue
@@ -144,9 +144,9 @@ const columns = [
         dataIndex: 'description',
         key: 'description',
         scopedSlots: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
         ellipsis: true,
     },
     {
@@ -186,9 +186,9 @@ const columns = [
         dataIndex: 'requestTime',
         key: 'requestTime',
         scopedSlots: true,
-        search: {
-            type: 'date',
-        },
+        // search: {
+        //     type: 'rangePicker',
+        // },
         width: 200,
     },
     {
diff --git a/src/views/Log/System/index.vue b/src/views/Log/System/index.vue
index 1ede4622..5d807f47 100644
--- a/src/views/Log/System/index.vue
+++ b/src/views/Log/System/index.vue
@@ -172,9 +172,9 @@ const columns = [
         title: '创建时间',
         dataIndex: 'createTime',
         key: 'createTime',
-        search: {
-            type: 'date',
-        },
+        // search: {
+        //     type: 'date',
+        // },
         scopedSlots: true,
         width: 200,
     },
diff --git a/src/views/device/Category/index.vue b/src/views/device/Category/index.vue
index d02f87d9..dde40cdd 100644
--- a/src/views/device/Category/index.vue
+++ b/src/views/device/Category/index.vue
@@ -102,27 +102,27 @@ const query = reactive({
                 type: 'string',
             },
         },
-        {
-            title: '排序',
-            dataIndex: 'sortIndex',
-            key: 'sortIndex',
-            search: {
-                type: 'number',
-                componentProps: {
-                    precision: 0,
-                    min: 1,
-                },
-            },
-            scopedSlots: true,
-        },
-        {
-            title: '说明',
-            key: 'description',
-            dataIndex: 'description',
-            search: {
-                type: 'string',
-            },
-        },
+        // {
+        //     title: '排序',
+        //     dataIndex: 'sortIndex',
+        //     key: 'sortIndex',
+        //     search: {
+        //         type: 'number',
+        //         componentProps: {
+        //             precision: 0,
+        //             min: 1,
+        //         },
+        //     },
+        //     scopedSlots: true,
+        // },
+        // {
+        //     title: '说明',
+        //     key: 'description',
+        //     dataIndex: 'description',
+        //     search: {
+        //         type: 'string',
+        //     },
+        // },
         {
             title: '操作',
             key: 'action',
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index f8289dc9..3745ded7 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -310,9 +310,9 @@ const columns = [
         key: 'createTime',
         scopedSlots: true,
         width: 200,
-        search: {
-            type: 'date',
-        },
+        // search: {
+        //     type: 'date',
+        // },
     },
     {
         title: '状态',
@@ -472,9 +472,9 @@ const columns = [
         dataIndex: 'describe',
         key: 'describe',
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index f146a63e..ec934fc9 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -555,9 +555,9 @@ const query = reactive({
             title: '说明',
             key: 'describe',
             dataIndex: 'describe',
-            search: {
-                type: 'string',
-            },
+            // search: {
+            //     type: 'string',
+            // },
         },
         {
             title: '产品分类',
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index fef27702..3f94bc51 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -260,9 +260,9 @@ const columns = [
         title: '说明',
         dataIndex: 'description',
         key: 'description',
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index 093cea52..8a264180 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -106,9 +106,9 @@ const columns = [
         dataIndex: 'description',
         key: 'description',
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 84d64b0c..a095b248 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -196,9 +196,9 @@ const columns = [
         title: '说明',
         dataIndex: 'description',
         key: 'description',
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
         ellipsis: true,
     },
     {
diff --git a/src/views/link/Type/index.vue b/src/views/link/Type/index.vue
index 25541453..9517ab3a 100644
--- a/src/views/link/Type/index.vue
+++ b/src/views/link/Type/index.vue
@@ -261,9 +261,9 @@ const columns = [
         dataIndex: 'description',
         key: 'description',
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue
index 2d93911f..f114f980 100644
--- a/src/views/notice/Config/index.vue
+++ b/src/views/notice/Config/index.vue
@@ -267,9 +267,9 @@ const columns = [
         key: 'description',
         scopedSlots: true,
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue
index 776eacaa..129c2627 100644
--- a/src/views/notice/Template/index.vue
+++ b/src/views/notice/Template/index.vue
@@ -259,9 +259,9 @@ const columns = [
         key: 'description',
         scopedSlots: true,
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index a99cf14d..7b3851ab 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -333,9 +333,9 @@ const columns = [
         title: '说明',
         dataIndex: 'description',
         key: 'description',
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
         ellipsis: true,
     },
     {
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
index 5b9ff42e..a3029a87 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/index.vue
@@ -264,9 +264,9 @@ const columns = [
         title: '最近告警时间',
         dataIndex: 'alarmTime',
         key: 'alarmTime',
-        search: {
-            type: 'date',
-        },
+        // search: {
+        //     type: 'rangePicker',
+        // },
         scopedSlots: true,
     },
     {
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index 0c96c67f..0c030f77 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -217,9 +217,9 @@ const columns = [
         dataIndex: 'description',
         title: '说明',
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
         scopedSlots: true,
     },
     {
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index 3f090588..12953e72 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -146,9 +146,9 @@ const columns = [
         dataIndex: 'sortIndex',
         key: 'sortIndex',
         ellipsis: true,
-        search: {
-            type: 'number',
-        },
+        // search: {
+        //     type: 'number',
+        // },
         width: 80,
     },
     {
@@ -163,9 +163,9 @@ const columns = [
         dataIndex: 'createTime',
         key: 'createTime',
         ellipsis: true,
-        search: {
-            type: 'date',
-        },
+        // search: {
+        //     type: 'date',
+        // },
         width: 180,
         scopedSlots: true,
     },
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index f7b9e2d5..a2003f3b 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -146,9 +146,9 @@ const columns = [
         key: 'description',
         ellipsis: true,
         fixed: 'left',
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',
diff --git a/src/views/system/Role/RoleRight/index.vue b/src/views/system/Role/RoleRight/index.vue
index 06224533..9b97e3de 100644
--- a/src/views/system/Role/RoleRight/index.vue
+++ b/src/views/system/Role/RoleRight/index.vue
@@ -89,9 +89,9 @@ const columns = [
         key: 'description',
         ellipsis: true,
         dataIndex: 'description',
-        search: {
-            type: 'string',
-        },
+        // search: {
+        //     type: 'string',
+        // },
     },
     {
         title: '操作',