From 178617d8c2e0603fc94c9cb8e23d414128692d01 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Thu, 13 Jun 2024 12:58:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20=E8=A7=84=E6=95=B4CURD?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue => CURD/PageContent.vue}        | 168 ++---------
 .../{PageModal/Form.vue => CURD/PageForm.vue} |  18 +-
 .../index.vue => CURD/PageModal.vue}          |  83 +-----
 .../index.vue => CURD/PageSearch.vue}         |  41 +--
 src/components/CURD/types.ts                  | 262 ++++++++++++++++++
 src/{hooks => components/CURD}/usePage.ts     |  19 +-
 src/components/PageModal/types.ts             |  64 -----
 src/typings/auto-imports.d.ts                 |   4 -
 src/typings/components.d.ts                   |  23 +-
 src/views/demo/curd/config/add.ts             |   2 +-
 src/views/demo/curd/config/content.ts         |   2 +-
 src/views/demo/curd/config/content2.ts        |   2 +-
 src/views/demo/curd/config/edit.ts            |   2 +-
 src/views/demo/curd/config/search.ts          |   2 +-
 src/views/demo/curd/index.vue                 |   4 +-
 15 files changed, 327 insertions(+), 369 deletions(-)
 rename src/components/{PageContent/index.vue => CURD/PageContent.vue} (89%)
 rename src/components/{PageModal/Form.vue => CURD/PageForm.vue} (94%)
 rename src/components/{PageModal/index.vue => CURD/PageModal.vue} (86%)
 rename src/components/{PageSearch/index.vue => CURD/PageSearch.vue} (89%)
 create mode 100644 src/components/CURD/types.ts
 rename src/{hooks => components/CURD}/usePage.ts (75%)
 delete mode 100644 src/components/PageModal/types.ts

diff --git a/src/components/PageContent/index.vue b/src/components/CURD/PageContent.vue
similarity index 89%
rename from src/components/PageContent/index.vue
rename to src/components/CURD/PageContent.vue
index 00ad9f88..243e13d9 100644
--- a/src/components/PageContent/index.vue
+++ b/src/components/CURD/PageContent.vue
@@ -472,160 +472,22 @@
 </template>
 
 <script setup lang="ts">
-import ExcelJS from "exceljs";
-import { ref, reactive } from "vue";
-import { useDateFormat, useThrottleFn } from "@vueuse/core";
-import { hasAuth } from "@/plugins/permission";
 import SvgIcon from "@/components/SvgIcon/index.vue";
+import { hasAuth } from "@/plugins/permission";
+import { useDateFormat, useThrottleFn } from "@vueuse/core";
 import {
-  type TableProps,
-  type PaginationProps,
+  genFileId,
   type FormInstance,
   type FormRules,
   type UploadInstance,
-  type UploadUserFile,
   type UploadRawFile,
-  genFileId,
+  type UploadUserFile,
 } from "element-plus";
+import ExcelJS from "exceljs";
+import { reactive, ref } from "vue";
+import type { IContentConfig, IObject, IOperatData } from "./types";
 
-// 对象类型
-export type IObject = Record<string, any>;
 // 定义接收的属性
-export interface IOperatData {
-  name: string;
-  row: any;
-  column: any;
-  $index: number;
-}
-export interface IContentConfig<T = any> {
-  // 页面名称(参与组成权限标识,如sys:user:xxx)
-  pageName: string;
-  // table组件属性
-  table?: Omit<TableProps<any>, "data">;
-  // pagination组件属性
-  pagination?:
-    | boolean
-    | Partial<
-        Omit<
-          PaginationProps,
-          "v-model:page-size" | "v-model:current-page" | "total" | "currentPage"
-        >
-      >;
-  // 列表的网络请求函数(需返回promise)
-  indexAction: (queryParams: T) => Promise<any>;
-  // 默认的分页相关的请求参数
-  request?: {
-    pageName: string;
-    limitName: string;
-  };
-  // 数据格式解析的回调函数
-  parseData?: (res: any) => {
-    total: number;
-    list: IObject[];
-    [key: string]: any;
-  };
-  // 修改属性的网络请求函数(需返回promise)
-  modifyAction?: (data: {
-    [key: string]: any;
-    field: string;
-    value: boolean | string | number;
-  }) => Promise<any>;
-  // 删除的网络请求函数(需返回promise)
-  deleteAction?: (ids: string) => Promise<any>;
-  // 后端导出的网络请求函数(需返回promise)
-  exportAction?: (queryParams: T) => Promise<any>;
-  // 前端全量导出的网络请求函数(需返回promise)
-  exportsAction?: (queryParams: T) => Promise<IObject[]>;
-  // 前端导入模板
-  importsTemplate?: string | (() => Promise<any>);
-  // 前端导入的网络请求函数(需返回promise)
-  importsAction?: (data: IObject[]) => Promise<any>;
-  // 主键名(默认为id)
-  pk?: string;
-  // 表格工具栏(默认支持add,delete,export,也可自定义)
-  toolbar?: Array<
-    | "add"
-    | "delete"
-    | "export"
-    | {
-        auth: string;
-        icon?: string;
-        name: string;
-        text: string;
-      }
-  >;
-  // 表格工具栏右侧图标
-  defaultToolbar?: Array<
-    | "refresh"
-    | "filter"
-    | "imports"
-    | "exports"
-    | "search"
-    | {
-        name: string;
-        icon: string;
-        title?: string;
-        auth?: string;
-      }
-  >;
-  // table组件列属性(额外的属性templet,operat,slotName)
-  cols: Array<{
-    type?: "default" | "selection" | "index" | "expand";
-    label?: string;
-    prop?: string;
-    width?: string | number;
-    align?: "left" | "center" | "right";
-    columnKey?: string;
-    reserveSelection?: boolean;
-    // 列是否显示
-    show?: boolean;
-    // 模板
-    templet?:
-      | "image"
-      | "list"
-      | "url"
-      | "switch"
-      | "input"
-      | "price"
-      | "percent"
-      | "icon"
-      | "date"
-      | "tool"
-      | "custom";
-    // image模板相关参数
-    imageWidth?: number;
-    imageHeight?: number;
-    // list模板相关参数
-    selectList?: Record<string, any>;
-    // switch模板相关参数
-    activeValue?: boolean | string | number;
-    inactiveValue?: boolean | string | number;
-    activeText?: string;
-    inactiveText?: string;
-    // input模板相关参数
-    inputType?: string;
-    // price模板相关参数
-    priceFormat?: string;
-    // date模板相关参数
-    dateFormat?: string;
-    // tool模板相关参数
-    operat?: Array<
-      | "edit"
-      | "delete"
-      | {
-          auth: string;
-          icon?: string;
-          name: string;
-          text: string;
-        }
-    >;
-    // filter值拼接符
-    filterJoin?: string;
-    [key: string]: any;
-    // 初始化数据函数
-    initFn?: (item: IObject) => void;
-  }>;
-}
 const props = defineProps<{
   contentConfig: IContentConfig;
 }>();
@@ -676,8 +538,6 @@ const cols = ref(
 );
 // 加载状态
 const loading = ref(false);
-// 删除ID集合 用于批量删除
-const removeIds = ref<(number | string)[]>([]);
 // 列表数据
 const pageData = ref<IObject[]>([]);
 // 显示分页
@@ -704,14 +564,18 @@ const request = props.contentConfig.request ?? {
 
 // 行选中
 const selectionData = ref<IObject[]>([]);
+// 删除ID集合 用于批量删除
+const removeIds = ref<(number | string)[]>([]);
 function handleSelectionChange(selection: any[]) {
   selectionData.value = selection;
   removeIds.value = selection.map((item) => item[pk]);
 }
+
 // 刷新
 function handleRefresh() {
   fetchPageData(lastFormData);
 }
+
 // 删除
 function handleDelete(id?: number | string) {
   const ids = [id || removeIds.value].join(",");
@@ -735,6 +599,7 @@ function handleDelete(id?: number | string) {
     }
   });
 }
+
 // 导出表单
 const fields: string[] = [];
 cols.value.forEach((item) => {
@@ -825,6 +690,7 @@ function handleExports() {
       .catch((error) => console.log(error));
   }
 }
+
 // 导入表单
 const uploadRef = ref<UploadInstance>();
 const importsModalVisible = ref(false);
@@ -943,6 +809,7 @@ function handleImports() {
     }
   };
 }
+
 // 操作栏
 function handleToolbar(name: string) {
   switch (name) {
@@ -972,6 +839,7 @@ function handleToolbar(name: string) {
       break;
   }
 }
+
 // 操作列
 function handleOperat(data: IOperatData) {
   switch (data.name) {
@@ -986,6 +854,7 @@ function handleOperat(data: IOperatData) {
       break;
   }
 }
+
 // 属性修改
 function handleModify(
   field: string,
@@ -1002,6 +871,7 @@ function handleModify(
     ElMessage.error("未配置modifyAction");
   }
 }
+
 // 分页切换
 function handleSizeChange(value: number) {
   pagination.pageSize = value;
@@ -1011,6 +881,7 @@ function handleCurrentChange(value: number) {
   pagination.currentPage = value;
   fetchPageData(lastFormData);
 }
+
 // 远程数据筛选
 let filterParams: IObject = {};
 function handleFilterChange(newFilters: any) {
@@ -1033,6 +904,7 @@ function handleFilterChange(newFilters: any) {
 function getFilterParams() {
   return filterParams;
 }
+
 // 获取分页数据
 let lastFormData = {};
 function fetchPageData(formData: IObject = {}, isRestart = false) {
@@ -1069,6 +941,7 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     });
 }
 fetchPageData();
+
 // 导出Excel
 function exportPageData(formData: IObject = {}) {
   if (props.contentConfig.exportAction) {
@@ -1083,6 +956,7 @@ function exportPageData(formData: IObject = {}) {
     ElMessage.error("未配置exportAction");
   }
 }
+
 // 浏览器保存文件
 function saveXlsx(fileData: BlobPart, fileName: string) {
   const fileType =
diff --git a/src/components/PageModal/Form.vue b/src/components/CURD/PageForm.vue
similarity index 94%
rename from src/components/PageModal/Form.vue
rename to src/components/CURD/PageForm.vue
index a36d0655..9f8243c0 100644
--- a/src/components/PageModal/Form.vue
+++ b/src/components/CURD/PageForm.vue
@@ -85,22 +85,12 @@
 <script setup lang="ts">
 import type { FormInstance, FormRules } from "element-plus";
 import { reactive, ref, watch, computed, watchEffect } from "vue";
-import { IForm, IFormItems, IObject } from "./types";
+import { IPageForm, IObject } from "./types";
 
 // 定义接收的属性
-const props = withDefaults(
-  defineProps<{
-    // 主键名(主要用于编辑数据,默认为id)
-    pk?: string;
-    // form组件属性
-    form?: IForm;
-    // 表单项
-    formItems: IFormItems;
-  }>(),
-  {
-    pk: "id",
-  }
-);
+const props = withDefaults(defineProps<IPageForm>(), {
+  pk: "id",
+});
 
 const formRef = ref<FormInstance>();
 const formItems = reactive(props.formItems);
diff --git a/src/components/PageModal/index.vue b/src/components/CURD/PageModal.vue
similarity index 86%
rename from src/components/PageModal/index.vue
rename to src/components/CURD/PageModal.vue
index 428313b8..2069c3b6 100644
--- a/src/components/PageModal/index.vue
+++ b/src/components/CURD/PageModal.vue
@@ -244,83 +244,12 @@
 </template>
 
 <script setup lang="ts">
-import type {
-  FormInstance,
-  FormRules,
-  FormItemRule,
-  FormProps,
-  DialogProps,
-  DrawerProps,
-} from "element-plus";
 import { useThrottleFn } from "@vueuse/core";
-import { reactive, ref, watch, watchEffect, nextTick } from "vue";
+import type { FormInstance, FormRules } from "element-plus";
+import { nextTick, reactive, ref, watch, watchEffect } from "vue";
+import type { IModalConfig, IObject } from "./types";
 
-// 对象类型
-export type IObject = Record<string, any>;
 // 定义接收的属性
-export interface IModalConfig<T = any> {
-  // 页面名称
-  pageName?: string;
-  // 主键名(主要用于编辑数据,默认为id)
-  pk?: string;
-  // 组件类型
-  component?: "dialog" | "drawer";
-  // dialog组件属性
-  dialog?: Partial<Omit<DialogProps, "modelValue">>;
-  // drawer组件属性
-  drawer?: Partial<Omit<DrawerProps, "modelValue">>;
-  // form组件属性
-  form?: Partial<Omit<FormProps, "model" | "rules">>;
-  // 表单项
-  formItems: Array<{
-    // 组件类型(如input,select,radio,custom等，默认input)
-    type?:
-      | "input"
-      | "select"
-      | "radio"
-      | "checkbox"
-      | "tree-select"
-      | "date-picker"
-      | "input-number"
-      | "text"
-      | "custom";
-    // 组件属性
-    attrs?: IObject;
-    // 组件可选项(适用于select,radio,checkbox组件)
-    options?: Array<{
-      label: string;
-      value: any;
-      disabled?: boolean;
-      [key: string]: any;
-    }>;
-    // 插槽名(适用于组件类型为custom)
-    slotName?: string;
-    // 标签文本
-    label: string;
-    // 标签提示
-    tips?: string;
-    // 键名
-    prop: string;
-    // 验证规则
-    rules?: FormItemRule[];
-    // 初始值
-    initialValue?: any;
-    // 是否隐藏
-    hidden?: boolean;
-    // 监听函数
-    watch?: (newValue: any, oldValue: any, data: T, items: IObject[]) => void;
-    // 计算属性函数
-    computed?: (data: T) => any;
-    // 监听收集函数
-    watchEffect?: (data: T) => void;
-    // 初始化数据函数扩展
-    initFn?: (item: IObject) => void;
-  }>;
-  // 提交之前处理
-  beforeSubmit?: (data: T) => void;
-  // 提交的网络请求函数(需返回promise)
-  formAction: (data: T) => Promise<any>;
-}
 const props = defineProps<{
   modalConfig: IModalConfig;
 }>();
@@ -336,6 +265,7 @@ const formItems = reactive(props.modalConfig.formItems);
 const formData = reactive<IObject>({});
 const formRules: FormRules = {};
 const prepareFuncs = [];
+
 // 初始化
 for (const item of formItems) {
   item.initFn && item.initFn(item);
@@ -396,6 +326,7 @@ const handleSubmit = useThrottleFn(() => {
     }
   });
 }, 3000);
+
 // 关闭弹窗
 function handleCloseModal() {
   modalVisible.value = false;
@@ -404,6 +335,7 @@ function handleCloseModal() {
     formRef.value?.clearValidate();
   });
 }
+
 // 显示modal
 function setModalVisible(data: IObject = {}) {
   modalVisible.value = true;
@@ -412,10 +344,12 @@ function setModalVisible(data: IObject = {}) {
     Object.values(data).length > 0 && setFormData(data);
   });
 }
+
 // 获取表单数据
 function getFormData(key?: string) {
   return key === undefined ? formData : formData[key] ?? undefined;
 }
+
 // 设置表单值
 function setFormData(data: IObject) {
   for (const key in formData) {
@@ -427,6 +361,7 @@ function setFormData(data: IObject) {
     formData[pk] = data[pk];
   }
 }
+
 // 设置表单项值
 function setFormItemData(key: string, value: any) {
   formData[key] = value;
diff --git a/src/components/PageSearch/index.vue b/src/components/CURD/PageSearch.vue
similarity index 89%
rename from src/components/PageSearch/index.vue
rename to src/components/CURD/PageSearch.vue
index fd11d6b7..05751494 100644
--- a/src/components/PageSearch/index.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -116,42 +116,12 @@
 <script setup lang="ts">
 import type { FormInstance } from "element-plus";
 import { reactive, ref } from "vue";
+import type { IObject, ISearchConfig } from "./types";
 
-// 对象类型
-type IObject = Record<string, any>;
 // 定义接收的属性
-export interface ISearchConfig {
-  // 页面名称(参与组成权限标识,如sys:user:xxx)
-  pageName: string;
-  // 表单项
-  formItems: Array<{
-    // 组件类型(如input,select等)
-    type?: "input" | "select" | "tree-select" | "date-picker" | "input-tag";
-    // 标签文本
-    label: string;
-    // 标签提示
-    tips?: string;
-    // 键名
-    prop: string;
-    // 组件属性(input-tag组件支持join,btnText,size属性)
-    attrs?: IObject;
-    // 初始值
-    initialValue?: any;
-    // 可选项(适用于select组件)
-    options?: { label: string; value: any }[];
-    // 初始化数据函数扩展
-    initFn?: (formItem: IObject) => void;
-  }>;
-  // 是否开启展开和收缩
-  isExpandable?: boolean;
-  // 默认展示的表单项数量
-  showNumber?: number;
-}
-
-interface IProps {
+const props = defineProps<{
   searchConfig: ISearchConfig;
-}
-const props = defineProps<IProps>();
+}>();
 // 自定义事件
 const emit = defineEmits<{
   queryClick: [queryParams: IObject];
@@ -218,23 +188,28 @@ for (const item of formItems) {
     queryParams[item.prop] = item.initialValue ?? "";
   }
 }
+
 // 重置操作
 function handleReset() {
   queryFormRef.value?.resetFields();
   emit("resetClick", queryParams);
 }
+
 // 查询操作
 function handleQuery() {
   emit("queryClick", queryParams);
 }
+
 // 获取分页数据
 function getQueryParams() {
   return queryParams;
 }
+
 // 显示/隐藏 SearchForm
 function toggleVisible() {
   visible.value = !visible.value;
 }
+
 // 关闭标签
 function handleCloseTag(prop: string, tag: string) {
   inputTagMap[prop].data.splice(inputTagMap[prop].data.indexOf(tag), 1);
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
new file mode 100644
index 00000000..4c20afa7
--- /dev/null
+++ b/src/components/CURD/types.ts
@@ -0,0 +1,262 @@
+import type {
+  DialogProps,
+  DrawerProps,
+  FormItemRule,
+  FormProps,
+  PaginationProps,
+  TableProps,
+} from "element-plus";
+import PageContent from "./PageContent.vue";
+import PageForm from "./PageForm.vue";
+import PageModal from "./PageModal.vue";
+import PageSearch from "./PageSearch.vue";
+
+export type PageSearchInstance = InstanceType<typeof PageSearch>;
+export type PageContentInstance = InstanceType<typeof PageContent>;
+export type PageModalInstance = InstanceType<typeof PageModal>;
+export type PageFormInstance = InstanceType<typeof PageForm>;
+
+export type IObject = Record<string, any>;
+
+export interface IOperatData {
+  name: string;
+  row: any;
+  column: any;
+  $index: number;
+}
+
+export interface ISearchConfig {
+  // 页面名称(参与组成权限标识,如sys:user:xxx)
+  pageName: string;
+  // 表单项
+  formItems: Array<{
+    // 组件类型(如input,select等)
+    type?: "input" | "select" | "tree-select" | "date-picker" | "input-tag";
+    // 标签文本
+    label: string;
+    // 标签提示
+    tips?: string;
+    // 键名
+    prop: string;
+    // 组件属性(input-tag组件支持join,btnText,size属性)
+    attrs?: IObject;
+    // 初始值
+    initialValue?: any;
+    // 可选项(适用于select组件)
+    options?: { label: string; value: any }[];
+    // 初始化数据函数扩展
+    initFn?: (formItem: IObject) => void;
+  }>;
+  // 是否开启展开和收缩
+  isExpandable?: boolean;
+  // 默认展示的表单项数量
+  showNumber?: number;
+}
+
+export interface IContentConfig<T = any> {
+  // 页面名称(参与组成权限标识,如sys:user:xxx)
+  pageName: string;
+  // table组件属性
+  table?: Omit<TableProps<any>, "data">;
+  // pagination组件属性
+  pagination?:
+    | boolean
+    | Partial<
+        Omit<
+          PaginationProps,
+          "v-model:page-size" | "v-model:current-page" | "total" | "currentPage"
+        >
+      >;
+  // 列表的网络请求函数(需返回promise)
+  indexAction: (queryParams: T) => Promise<any>;
+  // 默认的分页相关的请求参数
+  request?: {
+    pageName: string;
+    limitName: string;
+  };
+  // 数据格式解析的回调函数
+  parseData?: (res: any) => {
+    total: number;
+    list: IObject[];
+    [key: string]: any;
+  };
+  // 修改属性的网络请求函数(需返回promise)
+  modifyAction?: (data: {
+    [key: string]: any;
+    field: string;
+    value: boolean | string | number;
+  }) => Promise<any>;
+  // 删除的网络请求函数(需返回promise)
+  deleteAction?: (ids: string) => Promise<any>;
+  // 后端导出的网络请求函数(需返回promise)
+  exportAction?: (queryParams: T) => Promise<any>;
+  // 前端全量导出的网络请求函数(需返回promise)
+  exportsAction?: (queryParams: T) => Promise<IObject[]>;
+  // 前端导入模板
+  importsTemplate?: string | (() => Promise<any>);
+  // 前端导入的网络请求函数(需返回promise)
+  importsAction?: (data: IObject[]) => Promise<any>;
+  // 主键名(默认为id)
+  pk?: string;
+  // 表格工具栏(默认支持add,delete,export,也可自定义)
+  toolbar?: Array<
+    | "add"
+    | "delete"
+    | "export"
+    | {
+        auth: string;
+        icon?: string;
+        name: string;
+        text: string;
+      }
+  >;
+  // 表格工具栏右侧图标
+  defaultToolbar?: Array<
+    | "refresh"
+    | "filter"
+    | "imports"
+    | "exports"
+    | "search"
+    | {
+        name: string;
+        icon: string;
+        title?: string;
+        auth?: string;
+      }
+  >;
+  // table组件列属性(额外的属性templet,operat,slotName)
+  cols: Array<{
+    type?: "default" | "selection" | "index" | "expand";
+    label?: string;
+    prop?: string;
+    width?: string | number;
+    align?: "left" | "center" | "right";
+    columnKey?: string;
+    reserveSelection?: boolean;
+    // 列是否显示
+    show?: boolean;
+    // 模板
+    templet?:
+      | "image"
+      | "list"
+      | "url"
+      | "switch"
+      | "input"
+      | "price"
+      | "percent"
+      | "icon"
+      | "date"
+      | "tool"
+      | "custom";
+    // image模板相关参数
+    imageWidth?: number;
+    imageHeight?: number;
+    // list模板相关参数
+    selectList?: Record<string, any>;
+    // switch模板相关参数
+    activeValue?: boolean | string | number;
+    inactiveValue?: boolean | string | number;
+    activeText?: string;
+    inactiveText?: string;
+    // input模板相关参数
+    inputType?: string;
+    // price模板相关参数
+    priceFormat?: string;
+    // date模板相关参数
+    dateFormat?: string;
+    // tool模板相关参数
+    operat?: Array<
+      | "edit"
+      | "delete"
+      | {
+          auth: string;
+          icon?: string;
+          name: string;
+          text: string;
+        }
+    >;
+    // filter值拼接符
+    filterJoin?: string;
+    [key: string]: any;
+    // 初始化数据函数
+    initFn?: (item: IObject) => void;
+  }>;
+}
+
+export interface IModalConfig<T = any> {
+  // 页面名称
+  pageName?: string;
+  // 主键名(主要用于编辑数据,默认为id)
+  pk?: string;
+  // 组件类型
+  component?: "dialog" | "drawer";
+  // dialog组件属性
+  dialog?: Partial<Omit<DialogProps, "modelValue">>;
+  // drawer组件属性
+  drawer?: Partial<Omit<DrawerProps, "modelValue">>;
+  // form组件属性
+  form?: IForm;
+  // 表单项
+  formItems: IFormItems<T>;
+  // 提交之前处理
+  beforeSubmit?: (data: T) => void;
+  // 提交的网络请求函数(需返回promise)
+  formAction: (data: T) => Promise<any>;
+}
+
+export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
+
+// 表单项
+export type IFormItems<T = any> = Array<{
+  // 组件类型(如input,select,radio,custom等，默认input)
+  type?:
+    | "input"
+    | "select"
+    | "radio"
+    | "checkbox"
+    | "tree-select"
+    | "date-picker"
+    | "input-number"
+    | "text"
+    | "custom";
+  // 组件属性
+  attrs?: IObject;
+  // 组件可选项(适用于select,radio,checkbox组件)
+  options?: Array<{
+    label: string;
+    value: any;
+    disabled?: boolean;
+    [key: string]: any;
+  }>;
+  // 插槽名(适用于组件类型为custom)
+  slotName?: string;
+  // 标签文本
+  label: string;
+  // 标签提示
+  tips?: string;
+  // 键名
+  prop: string;
+  // 验证规则
+  rules?: FormItemRule[];
+  // 初始值
+  initialValue?: any;
+  // 是否隐藏
+  hidden?: boolean;
+  // 监听函数
+  watch?: (newValue: any, oldValue: any, data: T, items: IObject[]) => void;
+  // 计算属性函数
+  computed?: (data: T) => any;
+  // 监听收集函数
+  watchEffect?: (data: T) => void;
+  // 初始化数据函数扩展
+  initFn?: (item: IObject) => void;
+}>;
+
+export interface IPageForm {
+  // 主键名(主要用于编辑数据,默认为id)
+  pk?: string;
+  // form组件属性
+  form?: IForm;
+  // 表单项
+  formItems: IFormItems;
+}
diff --git a/src/hooks/usePage.ts b/src/components/CURD/usePage.ts
similarity index 75%
rename from src/hooks/usePage.ts
rename to src/components/CURD/usePage.ts
index 3cc73ceb..4d410ced 100644
--- a/src/hooks/usePage.ts
+++ b/src/components/CURD/usePage.ts
@@ -1,15 +1,16 @@
 import { ref } from "vue";
-import type PageSearch from "@/components/PageSearch/index.vue";
-import type PageContent from "@/components/PageContent/index.vue";
-import type PageModal from "@/components/PageModal/index.vue";
-import type { IOperatData, IObject } from "@/components/PageContent/index.vue";
-export type { IOperatData, IObject };
+import type {
+  IObject,
+  PageContentInstance,
+  PageModalInstance,
+  PageSearchInstance,
+} from "./types";
 
 function usePage() {
-  const searchRef = ref<InstanceType<typeof PageSearch>>();
-  const contentRef = ref<InstanceType<typeof PageContent>>();
-  const addModalRef = ref<InstanceType<typeof PageModal>>();
-  const editModalRef = ref<InstanceType<typeof PageModal>>();
+  const searchRef = ref<PageSearchInstance>();
+  const contentRef = ref<PageContentInstance>();
+  const addModalRef = ref<PageModalInstance>();
+  const editModalRef = ref<PageModalInstance>();
 
   // 搜索
   function handleQueryClick(queryParams: IObject) {
diff --git a/src/components/PageModal/types.ts b/src/components/PageModal/types.ts
deleted file mode 100644
index 4846b0af..00000000
--- a/src/components/PageModal/types.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type {
-  DialogProps,
-  DrawerProps,
-  FormProps,
-  FormItemRule,
-} from "element-plus";
-
-// dialog组件属性
-export type IDialog = Partial<Omit<DialogProps, "modelValue">>;
-
-// drawer组件属性
-export type IDrawer = Partial<Omit<DrawerProps, "modelValue">>;
-
-// form组件属性
-export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
-
-// 对象类型
-export type IObject = Record<string, any>;
-
-// 表单项
-export type IFormItems<T = any> = Array<{
-  // 组件类型(如input,select,radio,custom等，默认input)
-  type?:
-    | "input"
-    | "select"
-    | "radio"
-    | "checkbox"
-    | "tree-select"
-    | "date-picker"
-    | "input-number"
-    | "text"
-    | "custom";
-  // 组件属性
-  attrs?: IObject;
-  // 组件可选项(适用于select,radio,checkbox组件)
-  options?: Array<{
-    label: string;
-    value: any;
-    disabled?: boolean;
-    [key: string]: any;
-  }>;
-  // 插槽名(适用于组件类型为custom)
-  slotName?: string;
-  // 标签文本
-  label: string;
-  // 标签提示
-  tips?: string;
-  // 键名
-  prop: string;
-  // 验证规则
-  rules?: FormItemRule[];
-  // 初始值
-  initialValue?: any;
-  // 是否隐藏
-  hidden?: boolean;
-  // 监听函数
-  watch?: (newValue: any, oldValue: any, data: T, items: IObject[]) => void;
-  // 计算属性函数
-  computed?: (data: T) => any;
-  // 监听收集函数
-  watchEffect?: (data: T) => void;
-  // 初始化数据函数扩展
-  initFn?: (item: IObject) => void;
-}>;
diff --git a/src/typings/auto-imports.d.ts b/src/typings/auto-imports.d.ts
index 21e11afd..5f6d3a9b 100644
--- a/src/typings/auto-imports.d.ts
+++ b/src/typings/auto-imports.d.ts
@@ -325,14 +325,12 @@ declare module "vue" {
   interface GlobalComponents {}
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<(typeof import("vue"))["EffectScope"]>;
-    readonly ElForm: UnwrapRef<(typeof import("element-plus/es"))["ElForm"]>;
     readonly ElMessage: UnwrapRef<
       (typeof import("element-plus/es"))["ElMessage"]
     >;
     readonly ElMessageBox: UnwrapRef<
       (typeof import("element-plus/es"))["ElMessageBox"]
     >;
-    readonly ElTree: UnwrapRef<(typeof import("element-plus/es"))["ElTree"]>;
     readonly acceptHMRUpdate: UnwrapRef<
       (typeof import("pinia"))["acceptHMRUpdate"]
     >;
@@ -1055,14 +1053,12 @@ declare module "@vue/runtime-core" {
   interface GlobalComponents {}
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<(typeof import("vue"))["EffectScope"]>;
-    readonly ElForm: UnwrapRef<(typeof import("element-plus/es"))["ElForm"]>;
     readonly ElMessage: UnwrapRef<
       (typeof import("element-plus/es"))["ElMessage"]
     >;
     readonly ElMessageBox: UnwrapRef<
       (typeof import("element-plus/es"))["ElMessageBox"]
     >;
-    readonly ElTree: UnwrapRef<(typeof import("element-plus/es"))["ElTree"]>;
     readonly acceptHMRUpdate: UnwrapRef<
       (typeof import("pinia"))["acceptHMRUpdate"]
     >;
diff --git a/src/typings/components.d.ts b/src/typings/components.d.ts
index 807cc9d9..80a3a983 100644
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@@ -11,6 +11,7 @@ declare module "vue" {
     AppMain: (typeof import("./../layout/components/AppMain/index.vue"))["default"];
     BarChart: (typeof import("./../views/dashboard/components/BarChart.vue"))["default"];
     Breadcrumb: (typeof import("./../components/Breadcrumb/index.vue"))["default"];
+    CURD: (typeof import("./../components/CURD/index.vue"))["default"];
     DeptTree: (typeof import("./../views/system/user/components/dept-tree.vue"))["default"];
     Dictionary: (typeof import("./../components/Dictionary/index.vue"))["default"];
     DictItem: (typeof import("./../views/system/dict/components/dict-item.vue"))["default"];
@@ -53,16 +54,13 @@ declare module "vue" {
     ElSwitch: (typeof import("element-plus/es"))["ElSwitch"];
     ElTable: (typeof import("element-plus/es"))["ElTable"];
     ElTableColumn: (typeof import("element-plus/es"))["ElTableColumn"];
-    ElTabPane: (typeof import("element-plus/es"))["ElTabPane"];
-    ElTabs: (typeof import("element-plus/es"))["ElTabs"];
     ElTag: (typeof import("element-plus/es"))["ElTag"];
     ElText: (typeof import("element-plus/es"))["ElText"];
     ElTooltip: (typeof import("element-plus/es"))["ElTooltip"];
-    ElTree: (typeof import("element-plus/es"))["ElTree"];
     ElTreeSelect: (typeof import("element-plus/es"))["ElTreeSelect"];
     ElUpload: (typeof import("element-plus/es"))["ElUpload"];
     ElWatermark: (typeof import("element-plus/es"))["ElWatermark"];
-    Form: (typeof import("./../components/PageModal/Form.vue"))["default"];
+    Form: (typeof import("./../components/CURD/Form.vue"))["default"];
     FunnelChart: (typeof import("./../views/dashboard/components/FunnelChart.vue"))["default"];
     GithubCorner: (typeof import("./../components/GithubCorner/index.vue"))["default"];
     Hamburger: (typeof import("./../components/Hamburger/index.vue"))["default"];
@@ -70,26 +68,17 @@ declare module "vue" {
     IEpArrowDown: (typeof import("~icons/ep/arrow-down"))["default"];
     IEpArrowUp: (typeof import("~icons/ep/arrow-up"))["default"];
     IEpClose: (typeof import("~icons/ep/close"))["default"];
-    IEpDelete: (typeof import("~icons/ep/delete"))["default"];
     IEpDownload: (typeof import("~icons/ep/download"))["default"];
-    IEpEdit: (typeof import("~icons/ep/edit"))["default"];
-    IEpPlus: (typeof import("~icons/ep/plus"))["default"];
-    IEpPosition: (typeof import("~icons/ep/position"))["default"];
-    IEpQuestionFilled: (typeof import("~icons/ep/question-filled"))["default"];
-    IEpRefresh: (typeof import("~icons/ep/refresh"))["default"];
-    IEpRefreshLeft: (typeof import("~icons/ep/refresh-left"))["default"];
-    IEpSearch: (typeof import("~icons/ep/search"))["default"];
-    IEpTop: (typeof import("~icons/ep/top"))["default"];
-    IEpUploadFilled: (typeof import("~icons/ep/upload-filled"))["default"];
     LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"];
     LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     MultiUpload: (typeof import("./../components/Upload/MultiUpload.vue"))["default"];
     NavBar: (typeof import("./../layout/components/NavBar/index.vue"))["default"];
     NavbarLeft: (typeof import("./../layout/components/NavBar/components/NavbarLeft.vue"))["default"];
     NavbarRight: (typeof import("./../layout/components/NavBar/components/NavbarRight.vue"))["default"];
-    PageContent: (typeof import("./../components/PageContent/index.vue"))["default"];
-    PageModal: (typeof import("./../components/PageModal/index.vue"))["default"];
-    PageSearch: (typeof import("./../components/PageSearch/index.vue"))["default"];
+    PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
+    PageForm: (typeof import("./../components/CURD/PageForm.vue"))["default"];
+    PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];
+    PageSearch: (typeof import("./../components/CURD/PageSearch.vue"))["default"];
     Pagination: (typeof import("./../components/Pagination/index.vue"))["default"];
     PieChart: (typeof import("./../views/dashboard/components/PieChart.vue"))["default"];
     RadarChart: (typeof import("./../views/dashboard/components/RadarChart.vue"))["default"];
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index 5a3ea5a2..ea1438bd 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -2,7 +2,7 @@ import DeptAPI from "@/api/dept";
 import RoleAPI from "@/api/role";
 import UserAPI from "@/api/user";
 import type { UserForm } from "@/api/user/model";
-import type { IModalConfig } from "@/components/PageModal/index.vue";
+import type { IModalConfig } from "@/components/CURD/types";
 
 const modalConfig: IModalConfig<UserForm> = {
   pageName: "sys:user",
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index d259a1ee..5548f680 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -1,7 +1,7 @@
 import UserAPI from "@/api/user";
 import RoleAPI from "@/api/role";
 import type { UserQuery } from "@/api/user/model";
-import type { IContentConfig } from "@/components/PageContent/index.vue";
+import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig<UserQuery> = {
   pageName: "sys:user",
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index e2e53480..449aee5b 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -1,4 +1,4 @@
-import type { IContentConfig } from "@/components/PageContent/index.vue";
+import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig = {
   pageName: "sys:user",
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index a9bd2062..20550f47 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -2,7 +2,7 @@ import DeptAPI from "@/api/dept";
 import RoleAPI from "@/api/role";
 import UserAPI from "@/api/user";
 import type { UserForm } from "@/api/user/model";
-import type { IModalConfig } from "@/components/PageModal/index.vue";
+import type { IModalConfig } from "@/components/CURD/types";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { useAppStore } from "@/store";
 
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index f69d168a..0105b9af 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,5 +1,5 @@
 import DeptAPI from "@/api/dept";
-import type { ISearchConfig } from "@/components/PageSearch/index.vue";
+import type { ISearchConfig } from "@/components/CURD/types";
 
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index dd1f2f81..f1c385b9 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -62,8 +62,8 @@
 
 <script setup lang="ts">
 import UserAPI from "@/api/user";
-import type { IObject, IOperatData } from "@/hooks/usePage";
-import usePage from "@/hooks/usePage";
+import type { IObject, IOperatData } from "@/components/CURD/types";
+import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
 import contentConfig from "./config/content";
 // import contentConfig from "./config/content2";