Skip to content

Commit 112c2ef

Browse files
authored
fix(useAntdTable): reset pageSize (#2178)
* Revert "fix(useAntdTable): reset pageSize (#2090)" This reverts commit 2d2cd69. * fix: use defaultParams pageSize when defaultPageSize is not passed * fix: does not affect submit
1 parent b92ca0e commit 112c2ef

File tree

2 files changed

+50
-7
lines changed

2 files changed

+50
-7
lines changed

packages/hooks/src/useAntdTable/__tests__/index.test.ts

+45-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import useAntdTable from '../index';
55
interface Query {
66
current: number;
77
pageSize: number;
8+
89
[key: string]: any;
910
}
1011

@@ -233,7 +234,7 @@ describe('useAntdTable', () => {
233234
expect(queryArgs.name).toBe('change name');
234235
});
235236

236-
it('should reset params work', async () => {
237+
it('should reset pageSize in defaultParams', async () => {
237238
queryArgs = undefined;
238239
form.resetFields();
239240
act(() => {
@@ -276,4 +277,47 @@ describe('useAntdTable', () => {
276277
expect(queryArgs.pageSize).toBe(10);
277278
});
278279
});
280+
281+
it('should reset pageSize in defaultPageSize', async () => {
282+
queryArgs = undefined;
283+
form.resetFields();
284+
act(() => {
285+
hook = setUp(asyncFn, {
286+
form,
287+
defaultParams: {
288+
current: 1,
289+
pageSize: 10,
290+
},
291+
defaultPageSize: 20,
292+
});
293+
});
294+
295+
const { search, tableProps } = hook.result.current;
296+
expect(tableProps.loading).toBe(false);
297+
await waitFor(() => expect(queryArgs.current).toBe(1));
298+
expect(queryArgs.pageSize).toBe(20);
299+
300+
// change params
301+
act(() => {
302+
tableProps.onChange({
303+
current: 2,
304+
pageSize: 5,
305+
});
306+
});
307+
308+
await waitFor(() => {
309+
expect(queryArgs.current).toBe(2);
310+
expect(queryArgs.pageSize).toBe(5);
311+
});
312+
313+
// reset params
314+
act(() => {
315+
search.reset();
316+
});
317+
318+
await waitFor(() => {
319+
expect(queryArgs.current).toBe(1);
320+
expect(queryArgs.pageSize).toBe(20);
321+
});
322+
});
279323
});

packages/hooks/src/useAntdTable/index.tsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,11 @@ const useAntdTable = <TData extends Data, TParams extends Params>(
155155
if (form) {
156156
form.resetFields();
157157
}
158-
_submit(
159-
defaultParams?.[0] || {
160-
pageSize: options.defaultPageSize || 10,
161-
current: 1,
162-
},
163-
);
158+
_submit({
159+
...(defaultParams?.[0] || {}),
160+
pageSize: options.defaultPageSize || options.defaultParams?.[0]?.pageSize || 10,
161+
current: 1,
162+
});
164163
};
165164

166165
const submit = (e?: any) => {

0 commit comments

Comments
 (0)