yuand 1.0.1 → 1.0.3

package/README.md

@@ -1,22 +1,6 @@
-# yu-component
+# yuand
 
-[![NPM version](https://img.shields.io/npm/v/yu-component.svg?style=flat)](https://npmjs.org/package/yu-component)
-[![NPM downloads](http://img.shields.io/npm/dm/yu-component.svg?style=flat)](https://npmjs.org/package/yu-component)
 
-## Install
-
-```bash
-$ npm install
-```
-
-```bash
-$ npm run dev
-$ npm run build
-```
-
-## Options 
-
-TODO
 
 ## LICENSE
 

package/README.test.md

@@ -0,0 +1,112 @@
+# Table 组件测试说明
+
+## 安装测试依赖
+
+```bash
+npm install -D vitest @vitest/ui @vitejs/plugin-react jsdom
+npm install -D @testing-library/react @testing-library/user-event @testing-library/jest-dom
+npm install -D @types/testing-library__jest-dom
+```
+
+## 运行测试
+
+```bash
+# 运行所有测试
+npm test
+
+# 监听模式
+npm test -- --watch
+
+# 生成覆盖率报告
+npm test -- --coverage
+
+# 运行 UI 界面
+npm test -- --ui
+
+# 运行特定测试文件
+npm test src/components/Table/__tests__/index.test.tsx
+```
+
+## 测试覆盖范围
+
+### 1. 组件基础功能测试 (`index.test.tsx`)
+- ✅ 基础渲染
+- ✅ 加载状态
+- ✅ 自定义 classNames 和 styles
+- ✅ 自定义 dataKey 和 totalKey
+- ✅ 表单搜索功能
+- ✅ 表单提交和重置
+- ✅ handleValues 表单值处理
+- ✅ 分页器显示和切换
+- ✅ 每页大小变化
+- ✅ 列排序功能
+- ✅ Table 实例方法（run, reset, refresh, sortOrder）
+- ✅ 动态列配置（函数形式 columns）
+- ✅ Alert 和 Toolbar 渲染
+- ✅ 国际化支持
+- ✅ 静态方法（config, formatDate, removeEmpty）
+
+### 2. useTable Hook 测试 (`useTable.test.ts`)
+- ✅ 返回正确的实例结构
+- ✅ 默认和自定义初始状态
+- ✅ 状态更新
+- ✅ sortOrder 方法
+- ✅ resetStore 方法
+- ✅ 实例稳定性（多次渲染）
+- ✅ subscribe 回调
+- ✅ sorter 变化触发更新
+- ✅ Form 实例
+- ✅ 多实例独立性
+
+### 3. 集成测试 (`integration.test.tsx`)
+- ✅ 完整的搜索-分页-排序流程
+- ✅ 表单验证与条件搜索
+- ✅ 自定义 handleValues 转换
+- ✅ 动态列与数据联动
+- ✅ Alert 统计信息显示
+- ✅ 外部控制刷新与清空
+
+## 测试配置文件
+
+### vitest.config.ts
+配置了测试环境、覆盖率报告、路径别名等。
+
+### src/test/setup.ts
+测试环境初始化，包括：
+- jest-dom 断言扩展
+- 自动清理
+- window.matchMedia mock
+- IntersectionObserver mock
+- ResizeObserver mock
+
+## 覆盖率目标
+
+- **语句覆盖率**: > 80%
+- **分支覆盖率**: > 75%
+- **函数覆盖率**: > 80%
+- **行覆盖率**: > 80%
+
+## 常见问题
+
+### Q: 如何调试测试？
+A: 使用 `--ui` 参数打开 Vitest UI 界面进行可视化调试。
+
+### Q: 测试运行很慢怎么办？
+A: 可以使用 `--run` 参数禁用监听模式，或使用 `--isolate=false` 提升性能。
+
+### Q: 如何 mock API 请求？
+A: 在测试文件中使用 `vi.mock()` mock fetch 模块，参考测试文件中的示例。
+
+## package.json 脚本配置
+
+在 package.json 中添加以下脚本：
+
+```json
+{
+  "scripts": {
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest --coverage"
+  }
+}
+```

package/es/components/Table/index.d.ts

@@ -1,12 +1,18 @@
 import type { ProTableProps, ProTableConfigOptions } from "./types";
 import "./style.css";
 declare const ProTable: {
-    <T extends Record<string, any>>(props: ProTableProps<T>): import("react/jsx-runtime").JSX.Element;
+    <T extends Record<string, any>>(props: ProTableProps<T>): import("../../../node_modules/@types/react").JSX.Element;
     useTable: (options?: import("./types").UseTableProps) => import("./types").TableInstance<any>[];
     getQuery: ({ page, size, sorter, search, params, }: import("../../utils/table").GetQueryProps) => Record<string, unknown>;
     formatDate: (key: string, data: Record<string, any>, format?: string) => Record<string, any>;
     removeEmpty: (data: Record<string, any>) => Record<string, any>;
     pageSizeOptions: number[];
+    /**
+     * 自定义配置参数组合方式.
+     * getQuery函数配置默认提供 page,size，orderField，isAsc，...params,...search
+     * @param options
+     * @returns
+     */
     config(options: ProTableConfigOptions): void;
 };
 export default ProTable;

package/es/components/Table/index.js

@@ -3,8 +3,8 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["request", "classNames", "styles", "table", "locale", "dataKey", "totalKey", "manual", "nostyle", "columns", "form", "alert", "toolbar", "pageSizeOptions", "pagination", "scroll", "useData"],
-  _excluded2 = ["title", "extra", "right", "formItem", "layout", "items", "reset", "dataForm", "handleValues", "onResetBefore"];
+var _excluded = ["request", "classNames", "styles", "table", "locale", "dataKey", "totalKey", "nostyle", "columns", "form", "alert", "toolbar", "pagination", "scroll", "useData"],
+  _excluded2 = ["title", "extra", "right", "layout", "items", "reset", "dataForm", "handleValues", "onResetBefore"];
 import { rq } from "../../fetch";
 import { I18nContext, t } from "../TableConfig";
 import { useShallow } from "zustand/react/shallow";
@@ -16,41 +16,48 @@ import { getDataSource, getQuery, getTotal, formatDate, removeEmpty } from "../.
 import useX from "../../hooks/useX";
 import useTable from "./useTable";
 import "./style.css";
+
+// 统一默认配置管理
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var defaultClassNames = {
-  root: "main-container",
-  form: "search-form",
-  table: "main-table"
-};
-var defaultStyles = {
-  root: {},
-  form: {
-    display: "flex",
-    justifyContent: "space-between"
+var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
+var DEFAULT_CONFIG = {
+  classNames: {
+    root: "main-container",
+    form: "search-form",
+    table: "main-table"
+  },
+  styles: {
+    root: {},
+    form: {
+      display: "flex",
+      justifyContent: "space-between"
+    },
+    table: {},
+    toolbar: {
+      marginBottom: 15
+    }
   },
-  table: {},
-  toolbar: {
-    marginBottom: 15
+  pagination: {
+    showQuickJumper: true,
+    showSizeChanger: true,
+    hideOnSinglePage: false
   }
 };
-var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
 var ProTable = function ProTable(props) {
-  var _scroll$x, _classNames$root, _classNames$form, _classNames$table;
+  var _pagination$showTotal, _pagination$pageSizeO, _scroll$x, _classNames$root, _classNames$form, _classNames$table;
   var _props$request = props.request,
     request = _props$request === void 0 ? {} : _props$request,
     _props$classNames = props.classNames,
-    classNames = _props$classNames === void 0 ? defaultClassNames : _props$classNames,
+    classNames = _props$classNames === void 0 ? DEFAULT_CONFIG.classNames : _props$classNames,
     _props$styles = props.styles,
-    styles = _props$styles === void 0 ? defaultStyles : _props$styles,
+    styles = _props$styles === void 0 ? DEFAULT_CONFIG.styles : _props$styles,
     table = props.table,
     locale = props.locale,
     _props$dataKey = props.dataKey,
     dataKey = _props$dataKey === void 0 ? "data" : _props$dataKey,
     _props$totalKey = props.totalKey,
     totalKey = _props$totalKey === void 0 ? "total" : _props$totalKey,
-    _props$manual = props.manual,
-    manual = _props$manual === void 0 ? false : _props$manual,
     nostyle = props.nostyle,
     columns = props.columns,
     _props$form = props.form,
@@ -58,27 +65,29 @@ var ProTable = function ProTable(props) {
     alert = props.alert,
     _props$toolbar = props.toolbar,
     toolbar = _props$toolbar === void 0 ? null : _props$toolbar,
-    pageSizeOptions = props.pageSizeOptions,
-    pagination = props.pagination,
+    _props$pagination = props.pagination,
+    pagination = _props$pagination === void 0 ? DEFAULT_CONFIG.pagination : _props$pagination,
     scroll = props.scroll,
     useData = props.useData,
     prop = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(I18nContext),
     lang = _useContext.lang;
+  (_pagination$showTotal = pagination.showTotal) !== null && _pagination$showTotal !== void 0 ? _pagination$showTotal : pagination.showTotal = function (total) {
+    return "".concat(t("共", lang), " ").concat(total, " ").concat(t("条记录", lang));
+  };
+  (_pagination$pageSizeO = pagination.pageSizeOptions) !== null && _pagination$pageSizeO !== void 0 ? _pagination$pageSizeO : pagination.pageSizeOptions = ProTable.pageSizeOptions;
   var formTitle = form.title,
     formExtra = form.extra,
     formRight = form.right,
-    formItem = form.formItem,
     _form$layout = form.layout,
     layout = _form$layout === void 0 ? "inline" : _form$layout,
-    items = form.items,
+    formItems = form.items,
     formReset = form.reset,
     dataForm = form.dataForm,
     formHandleValues = form.handleValues,
     formOnResetBefore = form.onResetBefore,
     otherFormProps = _objectWithoutProperties(form, _excluded2);
   var forceKey = useRef(0);
-  var formItems = formItem || items;
   var queryClient = useQueryClient();
   var _table$useStore = table.useStore(useShallow(function (state) {
       return {
@@ -152,7 +161,7 @@ var ProTable = function ProTable(props) {
         data: data
       });
     }
-  }, [data]);
+  }, [data, useData]);
   var _useMemo = useMemo(function () {
       return {
         column: typeof columns === "function" ? columns(data) : columns,
@@ -175,8 +184,9 @@ var ProTable = function ProTable(props) {
     }
   };
   var onReset = function onReset() {
+    var _ref4, _pagination$pageSizeO2;
     setState({
-      size: (pageSizeOptions === null || pageSizeOptions === void 0 ? void 0 : pageSizeOptions[0]) || ProTable.pageSizeOptions[0],
+      size: (_ref4 = pagination === null || pagination === void 0 || (_pagination$pageSizeO2 = pagination.pageSizeOptions) === null || _pagination$pageSizeO2 === void 0 ? void 0 : _pagination$pageSizeO2[0]) !== null && _ref4 !== void 0 ? _ref4 : ProTable.pageSizeOptions[0],
       sorter: {}
     });
     if (formItems) {
@@ -187,23 +197,21 @@ var ProTable = function ProTable(props) {
       }
     }
   };
+  if (table) {
+    table.queryKey = queryKey;
+    table.clear = function () {
+      return queryClient.setQueryData(queryKey, {});
+    };
+    table.run = onSearch;
+    table.refresh = refetch;
+    table.reset = function () {
+      if (formItems) {
+        onReset();
+      }
+    };
+  }
   useEffect(function () {
-    if (table) {
-      table.run = onSearch;
-      table.queryKey = queryKey;
-      table.clear = function () {
-        return queryClient.setQueryData(queryKey, {});
-      };
-      table.refresh = refetch;
-      table.reset = function () {
-        if (formItems) {
-          onReset();
-        }
-      };
-    }
-  }, [table, queryKey]);
-  useEffect(function () {
-    if (manual) return;
+    if (request.manual) return;
     if (formItems) {
       table.form.submit();
     } else {
@@ -252,26 +260,19 @@ var ProTable = function ProTable(props) {
       onChange: function onChange(p, _, sorter) {
         return tableChange(p, sorter);
       },
-      pagination: {
+      pagination: _objectSpread({
         current: page,
         pageSize: size,
-        showQuickJumper: pagination ? pagination.showQuickJumper : true,
-        showSizeChanger: pagination ? pagination.showSizeChanger : true,
-        hideOnSinglePage: pagination ? pagination.hideOnSinglePage : false,
-        pageSizeOptions: pageSizeOptions || ProTable.pageSizeOptions,
-        total: total,
-        showTotal: function showTotal(total) {
-          return "".concat(t("共", lang), " ").concat(total, " ").concat(t("条记录", lang));
-        }
-      },
+        total: total
+      }, pagination),
       dataSource: dataSource
     }, prop));
   };
   return /*#__PURE__*/_jsxs("div", {
-    className: (_classNames$root = classNames === null || classNames === void 0 ? void 0 : classNames.root) !== null && _classNames$root !== void 0 ? _classNames$root : defaultClassNames.root,
+    className: (_classNames$root = classNames === null || classNames === void 0 ? void 0 : classNames.root) !== null && _classNames$root !== void 0 ? _classNames$root : DEFAULT_CONFIG.classNames.root,
     style: styles.root,
     children: [!!formItems && /*#__PURE__*/_jsxs("div", {
-      className: (_classNames$form = classNames === null || classNames === void 0 ? void 0 : classNames.form) !== null && _classNames$form !== void 0 ? _classNames$form : defaultClassNames.form,
+      className: (_classNames$form = classNames === null || classNames === void 0 ? void 0 : classNames.form) !== null && _classNames$form !== void 0 ? _classNames$form : DEFAULT_CONFIG.classNames.form,
       style: styles.form,
       children: [/*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
         form: table.form,
@@ -296,7 +297,7 @@ var ProTable = function ProTable(props) {
         })]
       })), formRight]
     }), /*#__PURE__*/_jsxs("div", {
-      className: (_classNames$table = classNames === null || classNames === void 0 ? void 0 : classNames.table) !== null && _classNames$table !== void 0 ? _classNames$table : defaultClassNames.table,
+      className: (_classNames$table = classNames === null || classNames === void 0 ? void 0 : classNames.table) !== null && _classNames$table !== void 0 ? _classNames$table : DEFAULT_CONFIG.classNames.table,
       style: styles.table,
       children: [toolbar && /*#__PURE__*/_jsx("div", {
         style: styles.toolbar,
@@ -313,7 +314,12 @@ ProTable.formatDate = formatDate;
 ProTable.removeEmpty = removeEmpty;
 ProTable.pageSizeOptions = DEFAULT_PAGE_SIZE_OPTIONS;
 
-//自定义配置参数组合方式.  默认提供 page,size，orderField，isAsc，...params,...search
+/**
+ * 自定义配置参数组合方式.
+ * getQuery函数配置默认提供 page,size，orderField，isAsc，...params,...search
+ * @param options
+ * @returns
+ */
 ProTable.config = function (options) {
   if (!options || !isObject(options)) return;
   if (options.getQuery) {

package/es/components/Table/style.css

@@ -1,3 +1,3 @@
 .search-form .ant-form-item {
-    margin-bottom: 20px!important;
+  margin-bottom: 20px !important;
 }

package/es/components/Table/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { FormInstance, TableColumnType, TableProps, FormProps } from "antd";
+import type { FormInstance, TableColumnType, TableProps, FormProps, PaginationProps } from "../../../node_modules/antd";
 import type { HttpMethod } from "../../fetch";
-import type { UseBoundStore, StoreApi } from "zustand";
+import type { UseBoundStore, StoreApi } from "../../../node_modules/zustand";
 import type { GetQueryProps } from "../../utils/table";
 type RecordType = Record<string, any>;
 interface SorterType {
@@ -33,13 +33,11 @@ export interface TableInstance<TData = any> {
 }
 interface FormOptions extends Omit<FormProps, "form" | "title" | "children"> {
     title?: React.ReactNode;
-    /** @deprecated 此属性已废弃，请使用新的formItem属性代替 */
     items?: React.ReactNode | React.ReactNode[];
-    formItem?: React.ReactNode | React.ReactNode[];
     extra?: React.ReactNode;
     right?: React.ReactNode;
-    handleValues?: (values: Record<string, any>) => any;
     reset?: boolean;
+    handleValues?: (values: Record<string, any>) => any;
     onResetBefore?: () => void | boolean;
     dataForm?: FormProps;
 }
@@ -59,34 +57,24 @@ export interface ProTableProps<Tdata = any> extends Omit<TableProps<Tdata>, "col
     request: {
         /** 请求地址方法 */
         url?: string;
+        /** 手动调用发送 table.run */
+        manual?: boolean;
         method?: HttpMethod;
-        /** 请求参数 */
+        /** 请求额外参数 */
         params?: Record<string, any>;
         onBefore?: () => any;
         onSuccess?: (data: any) => any;
     };
-    url: string;
     table: TableInstance<Tdata> | null;
     locale?: Record<string, any>;
     dataKey?: string;
     totalKey?: string;
-    manual?: boolean;
     nostyle?: boolean;
-    params?: RecordType;
     columns: ((data: Tdata) => TableColumnType<unknown>[]) | TableColumnType<unknown>[];
     form?: FormOptions;
     alert?: React.ReactNode | ((data: Tdata) => React.ReactNode);
     toolbar?: React.ReactNode;
-    pageSizeOptions?: number[];
-    onBefore?: () => void;
-    onSuccess?: (data: Tdata) => any;
-    pagination?: {
-        showQuickJumper?: boolean;
-        showSizeChanger?: boolean;
-        hideOnSinglePage?: boolean;
-    };
-    loadingDelay?: number;
-    method?: HttpMethod;
+    pagination?: PaginationProps;
     useData?: boolean;
 }
 export interface UseTableProps {

package/es/components/TableUseFetch/index.d.ts

@@ -1,12 +1,18 @@
 import type { ProTableProps, ProTableConfigOptions } from "./types";
 import "./style.css";
 declare const ProTable: {
-    <T extends Record<string, any>>(props: ProTableProps<T>): import("react/jsx-runtime").JSX.Element;
+    <T extends Record<string, any>>(props: ProTableProps<T>): import("../../../node_modules/@types/react").JSX.Element;
     useTable: (options?: import("./types").UseTableProps) => import("./types").TableRef[];
     getQuery(options: any): Record<string, unknown>;
     formatDate: (key: string, data: Record<string, any>, format?: string) => Record<string, any>;
     removeEmpty: (data: Record<string, any>) => Record<string, any>;
     pageSizeOptions: number[];
+    /**
+     * 自定义配置参数组合方式.
+     * getQuery函数配置默认提供 page,size，orderField，isAsc，...params,...search
+     * @param options
+     * @returns
+     */
     config(options: ProTableConfigOptions): void;
 };
 export default ProTable;

package/es/components/TableUseFetch/index.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["classNames", "styles", "table", "locale", "dataKey", "totalKey", "manual", "nostyle", "request", "columns", "form", "alert", "toolbar", "pageSizeOptions", "pagination", "loadingDelay", "scroll"],
-  _excluded2 = ["title", "extra", "right", "formItem", "items", "reset", "dataForm", "handleValues", "onResetBefore"];
+var _excluded = ["classNames", "styles", "table", "locale", "dataKey", "totalKey", "nostyle", "request", "columns", "form", "alert", "toolbar", "pagination", "scroll"],
+  _excluded2 = ["title", "extra", "right", "items", "reset", "dataForm", "handleValues", "onResetBefore"];
 import { useShallow } from "zustand/react/shallow";
 import { useEffect, useMemo } from "react";
 import { Table, Form, Button, Space } from "antd";
@@ -29,8 +29,9 @@ var defaultStyles = {
     marginBottom: 15
   }
 };
+var DEFAULT_PAGE_SIZE_OPTIONS = [10, 20, 50, 100];
 var ProTable = function ProTable(props) {
-  var _classNames$root, _classNames$form, _classNames$table;
+  var _pagination$showQuick, _pagination$showSizeC, _pagination$hideOnSin, _pagination$pageSizeO, _pagination$showTotal, _classNames$root, _classNames$form, _classNames$table;
   var _props$classNames = props.classNames,
     classNames = _props$classNames === void 0 ? defaultClassNames : _props$classNames,
     _props$styles = props.styles,
@@ -41,8 +42,6 @@ var ProTable = function ProTable(props) {
     dataKey = _props$dataKey === void 0 ? "data" : _props$dataKey,
     _props$totalKey = props.totalKey,
     totalKey = _props$totalKey === void 0 ? "total" : _props$totalKey,
-    _props$manual = props.manual,
-    manual = _props$manual === void 0 ? false : _props$manual,
     nostyle = props.nostyle,
     _props$request = props.request,
     request = _props$request === void 0 ? {} : _props$request,
@@ -52,24 +51,25 @@ var ProTable = function ProTable(props) {
     alert = props.alert,
     _props$toolbar = props.toolbar,
     toolbar = _props$toolbar === void 0 ? null : _props$toolbar,
-    _props$pageSizeOption = props.pageSizeOptions,
-    pageSizeOptions = _props$pageSizeOption === void 0 ? [10, 20, 50, 100] : _props$pageSizeOption,
     pagination = props.pagination,
-    _props$loadingDelay = props.loadingDelay,
-    loadingDelay = _props$loadingDelay === void 0 ? 300 : _props$loadingDelay,
     scroll = props.scroll,
     prop = _objectWithoutProperties(props, _excluded);
+  (_pagination$showQuick = pagination.showQuickJumper) !== null && _pagination$showQuick !== void 0 ? _pagination$showQuick : pagination.showQuickJumper = true;
+  (_pagination$showSizeC = pagination.showSizeChanger) !== null && _pagination$showSizeC !== void 0 ? _pagination$showSizeC : pagination.showSizeChanger = true;
+  (_pagination$hideOnSin = pagination.hideOnSinglePage) !== null && _pagination$hideOnSin !== void 0 ? _pagination$hideOnSin : pagination.hideOnSinglePage = false;
+  (_pagination$pageSizeO = pagination.pageSizeOptions) !== null && _pagination$pageSizeO !== void 0 ? _pagination$pageSizeO : pagination.pageSizeOptions = ProTable.pageSizeOptions;
+  (_pagination$showTotal = pagination.showTotal) !== null && _pagination$showTotal !== void 0 ? _pagination$showTotal : pagination.showTotal = function (total) {
+    return "\u5171 ".concat(total, " \u6761\u8BB0\u5F55");
+  };
   var formTitle = form.title,
     formExtra = form.extra,
     formRight = form.right,
-    formItem = form.formItem,
-    items = form.items,
+    formItems = form.items,
     formReset = form.reset,
     dataForm = form.dataForm,
     formHandleValues = form.handleValues,
     formOnResetBefore = form.onResetBefore,
     otherFormProps = _objectWithoutProperties(form, _excluded2);
-  var formItems = formItem || items;
   var _table$useStore = table.useStore(useShallow(function (state) {
       return {
         data: state.data,
@@ -108,8 +108,7 @@ var ProTable = function ProTable(props) {
         setState({
           data: data
         });
-      },
-      loadingDelay: loadingDelay
+      }
     }),
     loading = _useFetch.loading;
   var _useMemo = useMemo(function () {
@@ -134,8 +133,9 @@ var ProTable = function ProTable(props) {
     }
   };
   var onReset = function onReset() {
+    var _ref, _pagination$pageSizeO2;
     setState({
-      size: 10,
+      size: (_ref = pagination === null || pagination === void 0 || (_pagination$pageSizeO2 = pagination.pageSizeOptions) === null || _pagination$pageSizeO2 === void 0 ? void 0 : _pagination$pageSizeO2[0]) !== null && _ref !== void 0 ? _ref : ProTable.pageSizeOptions[0],
       sorter: {}
     });
     if (formItems) {
@@ -155,7 +155,7 @@ var ProTable = function ProTable(props) {
     };
   }
   useEffect(function () {
-    if (manual) return;
+    if (request.manual) return;
     if (formItems) {
       table.form.submit();
     } else {
@@ -197,18 +197,11 @@ var ProTable = function ProTable(props) {
       onChange: function onChange(p, _, sorter) {
         return tableChange(p, sorter);
       },
-      pagination: {
+      pagination: _objectSpread({
         current: page,
         pageSize: size,
-        showQuickJumper: pagination ? pagination.showQuickJumper : true,
-        showSizeChanger: pagination ? pagination.showSizeChanger : true,
-        hideOnSinglePage: pagination ? pagination.hideOnSinglePage : false,
-        pageSizeOptions: pageSizeOptions,
-        total: total,
-        showTotal: function showTotal(total) {
-          return "\u5171 ".concat(total, " \u6761\u8BB0\u5F55");
-        }
-      },
+        total: total
+      }, pagination),
       dataSource: dataSource
     }, prop));
   };
@@ -269,8 +262,14 @@ ProTable.getQuery = function (options) {
 };
 ProTable.formatDate = formatDate;
 ProTable.removeEmpty = removeEmpty;
-ProTable.pageSizeOptions = [10, 20, 50, 100];
-//自定义配置参数组合方式.  默认提供 page,size，orderField，isAsc，...urlParams,...search
+ProTable.pageSizeOptions = DEFAULT_PAGE_SIZE_OPTIONS;
+
+/**
+ * 自定义配置参数组合方式.
+ * getQuery函数配置默认提供 page,size，orderField，isAsc，...params,...search
+ * @param options
+ * @returns
+ */
 ProTable.config = function (options) {
   if (!options || !isObject(options)) return;
   if (options.getQuery) {

package/es/components/TableUseFetch/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
-import type { FormInstance, TableColumnType, TableProps, FormProps } from "antd";
+import type { FormInstance, TableColumnType, TableProps, FormProps, PaginationProps } from "../../../node_modules/antd";
 import type { HttpMethod } from "../../fetch";
-import type { UseBoundStore, StoreApi } from "zustand";
+import type { UseBoundStore, StoreApi } from "../../../node_modules/zustand";
 import type { GetQueryProps } from "../../utils/table";
 type RecordType = Record<string, any>;
 interface SorterType {
@@ -27,17 +27,16 @@ export interface TableInstance<TData = any> {
     reset: () => void;
     sortOrder: (key: string) => any;
     update: () => void;
+    resetStore: () => void;
     form?: FormInstance;
 }
 interface FormOptions extends Omit<FormProps, "form" | "title"> {
     title?: React.ReactNode;
-    /** @deprecated 此属性已废弃，请使用新的formItem属性代替 */
     items?: React.ReactNode | React.ReactNode[];
-    formItem?: React.ReactNode | React.ReactNode[];
     extra?: React.ReactNode;
+    reset?: boolean;
     right?: React.ReactNode;
     handleValues?: (values: Record<string, any>) => any;
-    reset?: boolean;
     onResetBefore?: () => void | boolean;
     dataForm?: FormProps;
 }
@@ -55,7 +54,10 @@ export interface ProTableProps<Tdata = any> extends Omit<TableProps<Tdata>, "col
     };
     request?: {
         url?: string;
+        /** 手动调用发送 table.run */
+        manual?: boolean;
         method?: HttpMethod;
+        /** 请求额外参数 */
         params?: RecordType;
         onBefore?: () => any;
         onSuccess?: (data: Tdata) => any;
@@ -64,18 +66,12 @@ export interface ProTableProps<Tdata = any> extends Omit<TableProps<Tdata>, "col
     locale?: Record<string, any>;
     dataKey?: string;
     totalKey?: string;
-    manual?: boolean;
     nostyle?: boolean;
     columns: ((data: Tdata) => TableColumnType<unknown>[]) | TableColumnType<unknown>[];
     form?: FormOptions;
     alert?: React.ReactNode | ((data: Tdata) => React.ReactNode);
     toolbar?: React.ReactNode;
-    pageSizeOptions?: number[];
-    pagination?: {
-        showQuickJumper?: boolean;
-        showSizeChanger?: boolean;
-        hideOnSinglePage?: boolean;
-    };
+    pagination?: PaginationProps;
     loadingDelay?: number;
 }
 export interface UseTableProps {
@@ -91,6 +87,7 @@ export interface TableRef {
     refresh: () => void;
     reset: () => void;
     sortOrder: (key: string) => "ascend" | "descend" | null;
+    resetStore: () => void;
     update: () => void;
 }
 export interface ProTableConfigOptions {