Skip to content

Commit cb2775f

Browse files
RSS1102tdesign-bot
andauthored
fix(table): ensure defaultPageSize is used when pageSize not provided (#6101)
* fix(pagination): ensure default page size is used when pageSize is not provided * fix(pagination): reset current page to 1 when total page count changes * fix(pagination): remove redundant reset of current page when total page count changes * chore: stash changelog [ci skip] --------- Co-authored-by: tdesign-bot <tdesign@tencent.com>
1 parent 3db1009 commit cb2775f

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

packages/components/pagination/pagination.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ export default defineComponent({
140140
return array;
141141
});
142142

143-
// 如果页面总数发生变化并当前页数大于总页数则重置为1
144-
watch(
145-
() => pageCount.value,
146-
() => {
147-
if (innerCurrent.value > pageCount.value) innerCurrent.value = 1;
148-
},
149-
);
150143
watch(
151144
() => innerCurrent.value,
152145
(val) => (jumpIndex.value = val),

packages/components/table/hooks/usePagination.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ export default function usePagination(
3737
if (!pagination.value || !pagination.value.current) return;
3838
const { current, pageSize } = pagination.value;
3939
innerPagination.value = { current, pageSize };
40-
updateDataSourceAndPaginate(pagination.value.current, pagination.value.pageSize);
40+
updateDataSourceAndPaginate(
41+
pagination.value.current,
42+
pagination.value.pageSize || pagination.value.defaultPageSize,
43+
);
4144
},
4245
{ immediate: true },
4346
);
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
pr_number: 6101
3+
contributor: RSS1102
4+
---
5+
6+
- fix(table): 当未提供 `pageSize` 时确保使用 `defaultPageSize` 大小 @RSS1102 ([#6101](https://github.com/Tencent/tdesign-vue-next/pull/6101))

0 commit comments

Comments
 (0)