test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-03 20:49:14 +08:00
Code Issues Actions 100 Packages Projects Releases Wiki Activity

fix: Table with invalidate pagination totol should ignore (#20532)

Browse Source
This commit is contained in:
二货机器人 2019-12-30 15:35:53 +08:00 committed by GitHub
parent 5f7ca16ed5
commit f2fdf490de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/table/__tests__/Table.pagination.test.js
View File

@ -315,4 +315,9 @@ describe('Table.pagination', () => {
wrapper.find('.ant-pagination-item-2').hasClass('ant-pagination-item-active'), wrapper.find('.ant-pagination-item-2').hasClass('ant-pagination-item-active'),
).toBeTruthy(); ).toBeTruthy();
}); });
it('pagination should ignore invalidate total', () => {
const wrapper = mount(createTable({ pagination: { total: null } }));
expect(wrapper.find('.ant-pagination-item-1').length).toBeTruthy();
});
}); });

7
components/table/hooks/usePagination.ts
View File

@ -30,7 +30,8 @@ export default function usePagination(
pagination: TablePaginationConfig | false | undefined, pagination: TablePaginationConfig | false | undefined,
onChange: (current: number, pageSize: number) => void, onChange: (current: number, pageSize: number) => void,
): [TablePaginationConfig, () => void] { ): [TablePaginationConfig, () => void] {
const paginationObj = pagination && typeof pagination === 'object' ? pagination : {}; const { total: paginationTotal = 0, ...paginationObj } =
pagination && typeof pagination === 'object' ? pagination : {};
const [innerPagination, setInnerPagination] = useState<TablePaginationConfig>(() => { const [innerPagination, setInnerPagination] = useState<TablePaginationConfig>(() => {
return { return {
@ -43,11 +44,11 @@ export default function usePagination(
// ============ Basic Pagination Config ============ // ============ Basic Pagination Config ============
const mergedPagination = { const mergedPagination = {
...innerPagination, ...innerPagination,
total,
...paginationObj, ...paginationObj,
total: paginationTotal > 0 ? paginationTotal : total,
}; };
if (!paginationObj.total) { if (!paginationTotal) {
// Reset `current` if data length changed. Only reset when paginationObj do not have total // Reset `current` if data length changed. Only reset when paginationObj do not have total
const maxPage = Math.ceil(total / mergedPagination.pageSize!); const maxPage = Math.ceil(total / mergedPagination.pageSize!);
if (maxPage < mergedPagination.current!) { if (maxPage < mergedPagination.current!) {