From ac609c12827452fe6e396eb029140e8d8c5120c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Thu, 10 Apr 2025 23:20:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20pageSearch=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8D=A1=E7=89=87=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=BA=A7=E8=81=94?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=95=B0=E6=8D=AE=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue   | 67 ++++++++++++++--------------
 src/components/CURD/types.ts         | 18 +++++---
 src/views/demo/curd/config/search.ts | 22 +++++----
 uno.config.ts                        |  6 +++
 4 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 19553d2d..6e742b18 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,34 +1,28 @@
 <template>
-  <el-card
-    v-show="visible"
-    v-hasPerm="[`${searchConfig.pageName}:query`]"
-    shadow="never"
-    class="mb-2.5"
-  >
-    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+  <el-card v-show="visible" v-bind="cardAttrs">
+    <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
           v-show="isExpand ? true : index < showNumber"
-          :label="item.label"
+          :label="item?.label"
           :prop="item.prop"
         >
           <!-- Label -->
-          <template v-if="item.tips" #label>
+          <template v-if="item?.tips" #label>
             <span class="flex-y-center">
               {{ item.label }}
               <el-tooltip v-bind="getTooltipProps(item.tips)">
                 <QuestionFilled class="w-4 h-4 mx-1" />
               </el-tooltip>
-              {{ searchConfig.colon === false ? "" : ":" }}
+              {{ searchConfig.colon ? ":" : "" }}
             </span>
           </template>
-          <template v-else #label>
-            {{ item.label }} {{ searchConfig.colon === false ? "" : ":" }}
-          </template>
+          <template v-else #label>{{ item.label }} {{ searchConfig.colon ? ":" : "" }}</template>
 
           <component
             :is="componentMap[item?.type ? item?.type : 'input']"
             v-model.trim="queryParams[item.prop]"
+            style="width: 100%"
             v-bind="item.attrs"
             :config="item.attrs"
             v-on="item.events || {}"
@@ -45,16 +39,12 @@
         <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="refresh" @click="handleReset">重置</el-button>
         <!-- 展开/收起 -->
-        <el-link
-          v-if="isExpandable && formItems.length > showNumber"
-          class="ml-3"
-          type="primary"
-          :underline="false"
-          @click="isExpand = !isExpand"
-        >
-          {{ isExpand ? "收起" : "展开" }}
-          <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
-        </el-link>
+        <template v-if="isExpandable && formItems.length > showNumber">
+          <el-link class="ml-3" type="primary" :underline="false" @click="isExpand = !isExpand">
+            {{ isExpand ? "收起" : "展开" }}
+            <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
+          </el-link>
+        </template>
       </el-form-item>
     </el-form>
   </el-card>
@@ -93,14 +83,29 @@ const queryFormRef = ref<FormInstance>();
 // 是否显示
 const visible = ref(true);
 // 响应式的formItems
-const formItems = reactive(props.searchConfig.formItems);
+const formItems = reactive(props.searchConfig?.formItems ?? []);
 // 是否可展开/收缩
-const isExpandable = ref(props.searchConfig.isExpandable ?? true);
+const isExpandable = ref(props.searchConfig?.isExpandable ?? true);
 // 是否已展开
 const isExpand = ref(false);
 // 表单项展示数量，若可展开，超出展示数量的表单项隐藏
 const showNumber = computed(() =>
-  isExpandable.value ? (props.searchConfig.showNumber ?? 3) : formItems.length
+  isExpandable.value ? (props.searchConfig?.showNumber ?? 3) : formItems.length
+);
+// 卡片组件自定义属性（累名、阴影、权限等）
+const cardAttrs = computed<IObject>(() => {
+  let auth = props.searchConfig?.pageName
+    ? { "v-hasPerm": [`${props.searchConfig.pageName}:query`] }
+    : {};
+  return props.searchConfig?.cardAttrs && props.searchConfig.cardAttrs instanceof Object
+    ? { class: "mb-2.5", shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
+    : { class: "mb-2.5", shadow: "never", ...auth };
+});
+// 是否使用自适应网格布局
+const isGrid = computed(() =>
+  props.searchConfig?.grid
+    ? "grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 4xl:grid-cols-6 gap-5"
+    : "flex flex-wrap gap-x-8 gap-y-4"
 );
 // 搜索表单数据
 const queryParams = reactive<IObject>({});
@@ -110,10 +115,10 @@ const getTooltipProps = (tips: any) => {
 };
 
 onMounted(() => {
-  formItems.map((item) => {
+  formItems.forEach((item) => {
     item.initFn && item.initFn(item);
     if (item.type === "input-tag" || item.type === "custom-tag") {
-      queryParams[item.prop] = item.initialValue ?? [];
+      queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {
       queryParams[item.prop] = item.initialValue ?? null;
     } else {
@@ -142,12 +147,6 @@ defineExpose({
 :deep(.el-input-number .el-input__inner) {
   text-align: left;
 }
-.el-form {
-  display: flex;
-  flex-wrap: wrap;
-  row-gap: 1rem;
-  column-gap: 2rem;
-}
 .el-form-item {
   margin-right: 0;
   margin-bottom: 0;
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 75eb82f3..1f98af43 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -40,15 +40,15 @@ export type ComponentType =
 
 export interface ISearchConfig {
   // 页面名称(参与组成权限标识,如sys:user:xxx)
-  pageName: string;
-  // 标签冒号
+  pageName?: string;
+  // 标签冒号(默认：false)
   colon?: boolean;
-  // 表单项
-  formItems: Array<{
+  // 表单项(默认：[])
+  formItems?: Array<{
     // 组件类型(如input,select等)
     type?: ComponentType;
     // 标签文本
-    label: string;
+    label?: string;
     // 标签提示
     tips?: string | IObject;
     // 键名
@@ -64,10 +64,14 @@ export interface ISearchConfig {
     // 初始化数据函数扩展
     initFn?: (formItem: IObject) => void;
   }>;
-  // 是否开启展开和收缩
+  // 是否开启展开和收缩(默认：true)
   isExpandable?: boolean;
-  // 默认展示的表单项数量
+  // 默认展示的表单项数量(默认：3)
   showNumber?: number;
+  // 卡片属性
+  cardAttrs?: IObject;
+  // 自适应网格布局(使用时表单不要添加 style: { width: "200px" })
+  grid?: boolean;
 }
 
 export interface IContentConfig<T = any> {
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index 9c863a73..6e78a415 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,6 +1,11 @@
 import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
 
+const selectOptions = reactive([
+  { label: "启用", value: 1 },
+  { label: "禁用", value: 0 },
+]);
+
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
   colon: false,
@@ -16,9 +21,11 @@ const searchConfig: ISearchConfig = {
         style: { width: "200px" },
       },
       events: {
-        // 监听输入框输入事件
-        blur: (e) => console.log("失去焦点: ", e),
-        focus: (e) => console.log("获得焦点: ", e),
+        change: (e) => {
+          console.log("输入框的值: ", e);
+          // 级联操作示例，需要使用reactive提前定义数组
+          // selectOptions.push({ label: e, value: e });
+        },
       },
     },
     {
@@ -50,12 +57,11 @@ const searchConfig: ISearchConfig = {
         clearable: true,
         style: { width: "200px" },
       },
-      options: [
-        { label: "启用", value: 1 },
-        { label: "禁用", value: 0 },
-      ],
+      options: selectOptions,
       events: {
-        change: (e) => console.log("发生变化: ", e),
+        change: function (e) {
+          console.log("选中的值: ", e);
+        },
       },
     },
     {
diff --git a/uno.config.ts b/uno.config.ts
index e08e746f..d308d598 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -45,6 +45,12 @@ export default defineConfig({
       primary: "var(--el-color-primary)",
       primary_dark: "var(--el-color-primary-light-5)",
     },
+    breakpoints: Object.fromEntries(
+      [640, 768, 1024, 1280, 1536, 1920, 2048].map((size, index) => [
+        ["sm", "md", "lg", "xl", "2xl", "3xl", "4xl"][index],
+        `${size}px`,
+      ])
+    ),
   },
   presets: [
     presetUno(),