File tree 2 files changed +50
-7
lines changed
packages/hooks/src/useAntdTable
2 files changed +50
-7
lines changed Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ import useAntdTable from '../index';
5
5
interface Query {
6
6
current : number ;
7
7
pageSize : number ;
8
+
8
9
[ key : string ] : any ;
9
10
}
10
11
@@ -233,7 +234,7 @@ describe('useAntdTable', () => {
233
234
expect ( queryArgs . name ) . toBe ( 'change name' ) ;
234
235
} ) ;
235
236
236
- it ( 'should reset params work ' , async ( ) => {
237
+ it ( 'should reset pageSize in defaultParams ' , async ( ) => {
237
238
queryArgs = undefined ;
238
239
form . resetFields ( ) ;
239
240
act ( ( ) => {
@@ -276,4 +277,47 @@ describe('useAntdTable', () => {
276
277
expect ( queryArgs . pageSize ) . toBe ( 10 ) ;
277
278
} ) ;
278
279
} ) ;
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
+ } ) ;
279
323
} ) ;
Original file line number Diff line number Diff line change @@ -155,12 +155,11 @@ const useAntdTable = <TData extends Data, TParams extends Params>(
155
155
if ( form ) {
156
156
form . resetFields ( ) ;
157
157
}
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
+ } ) ;
164
163
} ;
165
164
166
165
const submit = ( e ?: any ) => {
You can’t perform that action at this time.
0 commit comments