Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Transfer): 修复设置pageSizeOptions时切换pageSize无法生效得问题 #3374

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/transfer/components/transfer-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ export default mixins(keepAnimationMixins, classPrefixMixins).extend({
return {
filterValue: '', // 搜索框输入内容,
// 用于兼容处理 Pagination 的非受控属性(非受控属性仅有 change 事件变化,无 props 变化,因此只需监听事件)
defaultCurrent: 1,
defaultCurrent: null,
// 用于兼容处理 Pagination 的非受控属性
defaultPageSize: 0,
defaultPageSize: null,
// 支持targetList 排序
draggingIndex: null,
dragoverIndex: null,
Expand All @@ -102,10 +102,10 @@ export default mixins(keepAnimationMixins, classPrefixMixins).extend({
// this.defaultCurrent 属于分页组件抛出的事件参数,非受控的情况也会有该事件触发
// this.pagination.defaultCurrent 为表格组件传入的非受控属性
currentPage(): number {
return this.pagination?.current ?? this.defaultCurrent ?? this.pagination?.defaultCurrent;
return this.pagination?.current ?? this.defaultCurrent ?? this.pagination?.defaultCurrent ?? 1;
},
pageSize(): number {
return this.pagination?.pageSize ?? this.defaultPageSize ?? this.pagination?.defaultPageSize;
return this.pagination?.pageSize ?? this.defaultPageSize ?? this.pagination?.defaultPageSize ?? 10;
},
pageTotal(): number {
return (this.filteredData && this.filteredData.length) || 0;
Expand Down
Loading