From d21b5e9e2b42d287bffb3538520a88bca141e207 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Mon, 20 May 2024 10:14:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(CURD):=20:sparkles:=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=90=9C=E7=B4=A2=E8=A1=A8=E5=8D=95=E6=98=BE=E9=9A=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PageContent/index.vue | 24 +++++++++++++++---------
 src/components/PageSearch/index.vue  | 19 +++++++++++++++----
 src/hooks/usePage.ts                 |  5 +++++
 src/views/demo/curd/index.vue        |  2 ++
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/components/PageContent/index.vue b/src/components/PageContent/index.vue
index 7ec2e6ab..96172935 100644
--- a/src/components/PageContent/index.vue
+++ b/src/components/PageContent/index.vue
@@ -76,6 +76,10 @@
               </template>
             </el-popover>
           </template>
+          <!-- 搜索 -->
+          <template v-else-if="item === 'search'">
+            <el-button icon="search" circle @click="handleToolbar(item)" />
+          </template>
         </template>
       </div>
     </div>
@@ -149,11 +153,7 @@
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
                   @change="
                     pageData.length > 0 &&
-                      handleSwitchChange(
-                        col.prop,
-                        scope.row[col.prop],
-                        scope.row
-                      )
+                      handleModify(col.prop, scope.row[col.prop], scope.row)
                   "
                 />
               </template>
@@ -316,7 +316,7 @@ export interface IContentConfig<T = any> {
       }
   >;
   // 表格工具栏右侧图标
-  defaultToolbar?: ("refresh" | "filter")[];
+  defaultToolbar?: ("refresh" | "filter" | "search")[];
   // table组件列属性(额外的属性templet,operat,slotName)
   cols: Array<{
     type?: "default" | "selection" | "index" | "expand";
@@ -365,12 +365,11 @@ const props = defineProps<{
 const emit = defineEmits<{
   addClick: [];
   exportClick: [];
+  searchClick: [];
   toolbarClick: [name: string];
   editClick: [row: IObject];
   operatClick: [data: IOperatData];
 }>();
-// 暴露的属性和方法
-defineExpose({ fetchPageData, exportPageData });
 
 // 主键
 const pk = props.contentConfig.pk ?? "id";
@@ -380,6 +379,7 @@ const toolbar = props.contentConfig.toolbar ?? ["add", "delete"];
 const defaultToolbar = props.contentConfig.defaultToolbar ?? [
   "refresh",
   "filter",
+  "search",
 ];
 // 表格列
 const cols = ref(
@@ -468,6 +468,9 @@ function handleToolbar(name: string) {
     case "refresh":
       handleRefresh();
       break;
+    case "search":
+      emit("searchClick");
+      break;
     case "add":
       emit("addClick");
       break;
@@ -522,7 +525,7 @@ function exportPageData(queryParams: IObject = {}) {
   }
 }
 // 属性修改
-function handleSwitchChange(
+function handleModify(
   field: string,
   value: boolean | string | number,
   row: Record<string, any>
@@ -537,6 +540,9 @@ function handleSwitchChange(
     ElMessage.error("未配置modifyAction");
   }
 }
+
+// 暴露的属性和方法
+defineExpose({ fetchPageData, exportPageData });
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/components/PageSearch/index.vue b/src/components/PageSearch/index.vue
index 21a5e346..33545529 100644
--- a/src/components/PageSearch/index.vue
+++ b/src/components/PageSearch/index.vue
@@ -1,5 +1,9 @@
 <template>
-  <div class="search-container" v-hasPerm="[`${searchConfig.pageName}:query`]">
+  <div
+    class="search-container"
+    v-show="visible"
+    v-hasPerm="[`${searchConfig.pageName}:query`]"
+  >
     <el-form ref="queryFormRef" :model="queryParams" :inline="true">
       <template
         v-for="(item, index) in searchConfig.formItems"
@@ -102,9 +106,9 @@ const emit = defineEmits<{
   queryClick: [queryParams: IObject];
   resetClick: [queryParams: IObject];
 }>();
-// 暴露的属性和方法
-defineExpose({ getQueryParams });
 
+// 是否显示
+const visible = ref(true);
 // 是否可展开/收缩
 const isExpandable = ref(props.searchConfig.isExpandable ?? true);
 // 是否已展开
@@ -137,6 +141,13 @@ function handleQuery() {
 function getQueryParams() {
   return queryParams;
 }
+// 显示/隐藏 SearchForm
+function toggleVisible() {
+  visible.value = !visible.value;
+}
+
+// 暴露的属性和方法
+defineExpose({ getQueryParams, toggleVisible });
 </script>
 
 <style lang="scss" scoped>
@@ -146,6 +157,6 @@ function getQueryParams() {
   background-color: var(--el-bg-color-overlay);
   border: 1px solid var(--el-border-color-light);
   border-radius: 4px;
-  box-shadow: var(--el-box-shadow-light);
+  box-shadow: none;
 }
 </style>
diff --git a/src/hooks/usePage.ts b/src/hooks/usePage.ts
index a20fc4c6..802623b0 100644
--- a/src/hooks/usePage.ts
+++ b/src/hooks/usePage.ts
@@ -40,6 +40,10 @@ function usePage() {
     const queryParams = searchRef.value?.getQueryParams();
     contentRef.value?.exportPageData(queryParams);
   }
+  // 搜索显隐
+  function handelSearchClick() {
+    searchRef.value?.toggleVisible();
+  }
 
   return {
     searchRef,
@@ -52,6 +56,7 @@ function usePage() {
     handleEditClick,
     handleSubmitClick,
     handleExportClick,
+    handelSearchClick,
   };
 }
 
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 4130aa0d..7f8ca6cf 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -24,6 +24,7 @@
       @add-click="handleAddClick"
       @edit-click="handleEditClick"
       @export-click="handleExportClick"
+      @search-click="handelSearchClick"
       @toolbar-click="handleToolbarClick"
       @operat-click="handleOperatClick"
     >
@@ -70,6 +71,7 @@ const {
   // handleEditClick,
   handleSubmitClick,
   handleExportClick,
+  handelSearchClick,
 } = usePage();
 // 编辑
 async function handleEditClick(row: IObject) {

From d5793c3ee220a8cbd0206f975efb246d2a5880c9 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Mon, 20 May 2024 10:27:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(usePage):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8D=95=E8=AF=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/usePage.ts          | 4 ++--
 src/views/demo/curd/index.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/hooks/usePage.ts b/src/hooks/usePage.ts
index 802623b0..7c3ab859 100644
--- a/src/hooks/usePage.ts
+++ b/src/hooks/usePage.ts
@@ -41,7 +41,7 @@ function usePage() {
     contentRef.value?.exportPageData(queryParams);
   }
   // 搜索显隐
-  function handelSearchClick() {
+  function handleSearchClick() {
     searchRef.value?.toggleVisible();
   }
 
@@ -56,7 +56,7 @@ function usePage() {
     handleEditClick,
     handleSubmitClick,
     handleExportClick,
-    handelSearchClick,
+    handleSearchClick,
   };
 }
 
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 7f8ca6cf..e5cea7d7 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -24,7 +24,7 @@
       @add-click="handleAddClick"
       @edit-click="handleEditClick"
       @export-click="handleExportClick"
-      @search-click="handelSearchClick"
+      @search-click="handleSearchClick"
       @toolbar-click="handleToolbarClick"
       @operat-click="handleOperatClick"
     >
@@ -71,7 +71,7 @@ const {
   // handleEditClick,
   handleSubmitClick,
   handleExportClick,
-  handelSearchClick,
+  handleSearchClick,
 } = usePage();
 // 编辑
 async function handleEditClick(row: IObject) {