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 @@
-
-
-
-
+
+
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 @@
-
+
(() => {
? { "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;
// 自适应网格布局(使用时表单不要添加 style: { width: "200px" })
grid?: boolean;
}
@@ -79,6 +81,8 @@ export interface IContentConfig {
pageName: string;
// table组件属性
table?: Omit, "data">;
+ // 分页组件位置(默认:left)
+ pagePosition?: "left" | "right";
// pagination组件属性
pagination?:
| boolean
@@ -132,7 +136,7 @@ export interface IContentConfig {
icon?: string;
name: string;
text: string;
- type?: "primary" | "success" | "warning" | "danger" | "info";
+ type?: ButtonType;
}
>;
// 表格工具栏右侧图标
@@ -198,7 +202,7 @@ export interface IContentConfig {
icon?: string;
name: string;
text: string;
- type?: "primary" | "success" | "warning" | "danger" | "info";
+ type?: ButtonType;
render?: (row: IObject) => boolean;
}
>;