From 6bed716c0a283c373b62a70de991604c84da7450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Fri, 11 Apr 2025 01:07:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20pageContent=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue | 14 ++++++--------
 src/components/CURD/PageSearch.vue  |  6 +++---
 src/components/CURD/types.ts        | 10 +++++++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 7c52a8b6..36bc5d27 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -315,14 +315,12 @@
     </el-table>
     <!-- 分页 -->
     <template v-if="showPagination">
-      <el-scrollbar>
-        <div class="mt-[12px]">
-          <el-pagination
-            v-bind="pagination"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
+      <el-scrollbar :class="['mt-3', { 'flex-x-end': contentConfig?.pagePosition === 'right' }]">
+        <el-pagination
+          v-bind="pagination"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 6e742b18..e1573e7e 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card v-show="visible" v-bind="cardAttrs">
+  <el-card v-show="visible" v-bind="cardAttrs" class="mb-2.5!">
     <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
@@ -98,8 +98,8 @@ const cardAttrs = computed<IObject>(() => {
     ? { "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 };
+    ? { shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
+    : { shadow: "never", ...auth };
 });
 // 是否使用自适应网格布局
 const isGrid = computed(() =>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 1f98af43..01ab1243 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -6,6 +6,8 @@ import type {
   PaginationProps,
   TableProps,
   ColProps,
+  ButtonType,
+  CardProps,
 } from "element-plus";
 import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
@@ -69,7 +71,7 @@ export interface ISearchConfig {
   // 默认展示的表单项数量(默认：3)
   showNumber?: number;
   // 卡片属性
-  cardAttrs?: IObject;
+  cardAttrs?: Partial<CardProps>;
   // 自适应网格布局(使用时表单不要添加 style: { width: "200px" })
   grid?: boolean;
 }
@@ -79,6 +81,8 @@ export interface IContentConfig<T = any> {
   pageName: string;
   // table组件属性
   table?: Omit<TableProps<any>, "data">;
+  // 分页组件位置(默认：left)
+  pagePosition?: "left" | "right";
   // pagination组件属性
   pagination?:
     | boolean
@@ -132,7 +136,7 @@ export interface IContentConfig<T = any> {
         icon?: string;
         name: string;
         text: string;
-        type?: "primary" | "success" | "warning" | "danger" | "info";
+        type?: ButtonType;
       }
   >;
   // 表格工具栏右侧图标
@@ -198,7 +202,7 @@ export interface IContentConfig<T = any> {
           icon?: string;
           name: string;
           text: string;
-          type?: "primary" | "success" | "warning" | "danger" | "info";
+          type?: ButtonType;
           render?: (row: IObject) => boolean;
         }
     >;