@jswork/antd-components 1.0.150 → 1.0.152

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jswork/antd-components",
-  "version": "1.0.150",
+  "version": "1.0.152",
   "main": "dist/main.cjs.js",
   "module": "dist/main.esm.js",
   "types": "dist/main.d.ts",

package/src/lib/table.tsx

@@ -2,7 +2,7 @@
  * @Author: aric 1290657123@qq.com
  * @Date: 2025-10-03 07:11:26
  * @LastEditors: aric 1290657123@qq.com
- * @LastEditTime: 2025-10-26 19:06:05
+ * @LastEditTime: 2025-10-26 19:35:27
  *
  *
  * 路由风格: /{module}/{name} eg: /admin/staff-roles
@@ -54,6 +54,12 @@ export type AcTableProps = TableProps & {
    * `paramsEdit` will merge with `paramsAdd` when redirect to edit page.
    */
   paramsEdit?: Record<string, any>;
+
+  /**
+   * The extra params when reset.
+   * `paramsReset` will merge with `params` when reset.
+   */
+  paramsReset?: Record<string, any>;
   /**
    * Custom get standard data.
    * @param params { current: number; pageSize: number }
@@ -70,10 +76,10 @@ export type AcTableProps = TableProps & {
    */
   onPageChange?: (page: number, size: number) => void;
   /**
-   * When destroy success.
+   * When destroy complete.
    * @param model
    */
-  onDestroySuccess?: (model: any) => void;
+  onDestroyComplete?: (model: any) => void;
   /**
    * Default page.
    */
@@ -153,6 +159,10 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
     this.defaultFetcher = fetcher || nx.createFetcher(resourceId, { dataPath, totalPath });
   }
 
+  private toQueryString(params?: Record<string, any>) {
+    return params ? `?${new URLSearchParams(params).toString()}` : '';
+  }
+
   async componentDidMount() {
     const { current, pageSize } = this.state;
     this.harmonyEvents = ReactHarmonyEvents.create(this);
@@ -165,14 +175,15 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
     this.sync.cancel();
   }
 
-  fetchData = async (page: number, size: number) => {
+  fetchData = async (page: number, size: number, extraParams?: Record<string, any>) => {
     const abortController = new AbortController();
     const { params } = this.props;
     const { current, pageSize } = this.state;
+    const lastParams = { current, pageSize, ...params, ...extraParams };
     this.setState({ isLoading: true });
-    this.sync.schedule({ page: current, size: pageSize, ...params });
+    this.sync.schedule({ page: current, size: pageSize, ...lastParams });
     try {
-      const result = await this.defaultFetcher({ current: page, pageSize: size, params });
+      const result = await this.defaultFetcher({ current: page, pageSize: size, params: lastParams });
       if (!abortController.signal.aborted) {
         this.setState({
           dataSource: result.data || [],
@@ -194,24 +205,33 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
   };
 
   /* ----- public eventBus methods start ----- */
+  /**
+   * Refresh data use current state.
+   */
   public refetch = async () => {
     const { current, pageSize } = this.state;
     await this.fetchData(current, pageSize);
   };
 
+  /**
+   * Reset to default state, and fetch data.
+   */
   public reset = async () => {
-    const { defaultCurrent, defaultPageSize } = this.props;
+    const { defaultCurrent, defaultPageSize, paramsReset } = this.props;
     this.setState(
       {
         current: defaultCurrent,
         pageSize: defaultPageSize,
       },
       () => {
-        void this.fetchData(defaultCurrent!, defaultPageSize!);
+        void this.fetchData(defaultCurrent!, defaultPageSize!, paramsReset);
       },
     );
   };
 
+  /**
+   * CURD(local): optimisticUpdate data before data fetch.
+   */
   public draft = async (payload: Record<string, any>) => {
     const { rowKey } = this.props;
     const id = payload[rowKey as string];
@@ -226,26 +246,35 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
     }
   };
 
+  /**
+   * CURD(action): Delete data from backend.
+   */
   public destroy = (item) => {
-    const { name, onDestroySuccess } = this.props;
+    const { name, onDestroyComplete } = this.props;
     this.setState({ isLoading: true });
     nx.$api[`${name}_destroy`](item)
       .then(this.refetch)
       .finally(() => {
-        onDestroySuccess?.(item);
+        onDestroyComplete?.(item);
         this.setState({ isLoading: false });
       });
   };
 
+  /**
+   * CURD(page): Redirect to add page.
+   */
   public add = () => {
     const { module, paramsAdd } = this.props;
-    const qs = paramsAdd ? `?${new URLSearchParams(paramsAdd).toString()}` : '';
+    const qs = this.toQueryString(paramsAdd);
     nx.$nav?.(`/${module}/${this.routerKey}/add${qs}`);
   };
 
+  /**
+   * CURD(page): Redirect to edit page.
+   */
   public edit = (item: any) => {
     const { module, rowKey, paramsEdit } = this.props;
-    const qs = paramsEdit ? `?${new URLSearchParams(paramsEdit).toString()}` : '';
+    const qs = this.toQueryString(paramsEdit);
     nx.$nav?.(`/${module}/${this.routerKey}/${item[rowKey as string]}/edit${qs}`);
   };