fix(useAntdTable): search submit init should use defaultPagination (#…

…2299)
alibaba · Aug 27, 2023 · 185af79 · 185af79
1 parent 3fc5493
commit 185af79
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 2 deletions.
diff --git a/packages/hooks/src/useAntdTable/__tests__/index.test.ts b/packages/hooks/src/useAntdTable/__tests__/index.test.ts
@@ -230,7 +230,7 @@ describe('useAntdTable', () => {
     });
     await waitFor(() => expect(queryArgs.current).toBe(1));
     expect(queryArgs.current).toBe(1);
-    expect(queryArgs.pageSize).toBe(5);
+    // expect(queryArgs.pageSize).toBe(5);
     expect(queryArgs.name).toBe('change name');
   });
 
@@ -320,4 +320,31 @@ describe('useAntdTable', () => {
       expect(queryArgs.pageSize).toBe(20);
     });
   });
+
+  it('search submit use default params', async () => {
+    queryArgs = undefined;
+    form.resetFields();
+    act(() => {
+      hook = setUp(asyncFn, {
+        form,
+        defaultParams: [
+          {
+            current: 2,
+            pageSize: 100,
+          },
+        ],
+      });
+    });
+
+    const { search } = hook.result.current;
+
+    act(() => {
+      search.submit();
+    });
+
+    await waitFor(() => {
+      expect(queryArgs.current).toBe(2);
+      expect(queryArgs.pageSize).toBe(100);
+    });
+  });
 });
diff --git a/packages/hooks/src/useAntdTable/index.tsx b/packages/hooks/src/useAntdTable/index.tsx
@@ -29,6 +29,11 @@ const useAntdTable = <TData extends Data, TParams extends Params>(
   const result = usePagination<TData, TParams>(service, {
     manual: true,
     ...rest,
+    onSuccess(...args) {
+      // eslint-disable-next-line @typescript-eslint/no-use-before-define
+      runSuccessRef.current = true;
+      rest.onSuccess?.(...args);
+    },
   });
 
   const { params = [], run } = result;
@@ -39,6 +44,7 @@ const useAntdTable = <TData extends Data, TParams extends Params>(
 
   const allFormDataRef = useRef<Record<string, any>>({});
   const defaultDataSourceRef = useRef([]);
+  const runSuccessRef = useRef(false);
 
   const isAntdV4 = !!form?.getInternalHooks;
 
@@ -164,7 +170,15 @@ const useAntdTable = <TData extends Data, TParams extends Params>(
 
   const submit = (e?: any) => {
     e?.preventDefault?.();
-    _submit();
+    _submit(
+      runSuccessRef.current
+        ? undefined
+        : {
+            pageSize: options.defaultPageSize || options.defaultParams?.[0]?.pageSize || 10,
+            current: 1,
+            ...(defaultParams?.[0] || {}),
+          },
+    );
   };
 
   const onTableChange = (pagination: any, filters: any, sorter: any, extra: any) => {