@jswork/antd-components 1.0.189 → 1.0.191

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jswork/antd-components",
-  "version": "1.0.189",
+  "version": "1.0.191",
   "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.zheng 1290657123@qq.com
- * @LastEditTime: 2025-10-29 15:31:38
+ * @LastEditTime: 2025-10-29 15:42:04
  *
  *
  * 路由风格: /{module}/{name} eg: /admin/staff-roles
@@ -83,6 +83,14 @@ export type AcTableProps = TableProps & {
    * @param model
    */
   onDestroyComplete?: (model: any) => void;
+  /**
+   * When refetch called.
+   */
+  onRefetch?: () => void;
+  /**
+   * When reset called.
+   */
+  onReset?: () => void;
   /**
    * Default page.
    */
@@ -103,7 +111,6 @@ export type AcTableProps = TableProps & {
    * The response total key.
    */
   totalPath?: string;
-
   /**
    * Column fields for table.
    */
@@ -228,11 +235,13 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
     // 2. 合并所有过滤/搜索参数：
     // 优先级：overrideParams > propsParams > currentUrlParams
     // 注意：这里不包含 page 和 size，它们将作为独立参数处理
-    const filterParams = overrideParams === null ? propsParams : {
-      ...currentUrlParams, // 从 URL 读取的现有参数
-      ...propsParams,     // 组件 props 中定义的固定参数
-      ...overrideParams,  // 动态传入的覆盖参数（例如搜索关键字）
-    };
+    const filterParams = nx.compactObject(
+      overrideParams === null ? propsParams : {
+        ...currentUrlParams, // 从 URL 读取的现有参数
+        ...propsParams,     // 组件 props 中定义的固定参数
+        ...overrideParams,  // 动态传入的覆盖参数（例如搜索关键字）
+      },
+    );
 
     // 3. 确保 page 和 size 是明确的，并从 filterParams 中移除它们，
     // 以便传递给 fetcher 的 params 字段时不会重复
@@ -297,15 +306,17 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
    * Refresh data use current state.
    */
   public refetch = async () => {
+    const { onRefetch } = this.props;
     const { current, pageSize } = this.state;
     await this.fetchData(current, pageSize);
+    onRefetch?.();
   };
 
   /**
    * Reset to default state, and fetch data.
    */
   public reset = async () => {
-    const { defaultCurrent, defaultPageSize } = this.props;
+    const { defaultCurrent, defaultPageSize, onReset } = this.props;
     this.setState(
       {
         current: defaultCurrent,
@@ -315,6 +326,7 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
       },
       () => {
         void this.fetchData(defaultCurrent!, defaultPageSize!, null);
+        onReset?.();
       },
     );
   };
@@ -387,6 +399,8 @@ export class AcTable extends React.Component<AcTableProps, AcTableState> {
       className,
       pagination,
       onPageChange,
+      onRefetch,
+      onReset,
       params,
       paramsAdd,
       paramsEdit,