mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-24 11:10:01 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Fix overflow current state in Table, close #2301

Browse Source
This commit is contained in:
afc163 2016-07-12 18:45:45 +08:00
parent 1029419e95
commit 4b29e40089
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/table/Table.jsx
View File

@ -552,6 +552,14 @@ export default class Table extends React.Component {
return column.key || column.dataIndex || index;
}
getMaxCurrent(total) {
const { current, pageSize } = this.state.pagination;
if ((current - 1) * pageSize >= total) {
return current - 1;
}
return current;
}
isSortColumn(column) {
const { sortColumn } = this.state;
if (!column || !sortColumn) {
@ -648,6 +656,7 @@ export default class Table extends React.Component {
onChange={this.handlePageChange}
total={total}
size={size}
current={this.getMaxCurrent(total)}
onShowSizeChange={this.handleShowSizeChange}
/> : null;
}
@ -681,8 +690,9 @@ export default class Table extends React.Component {
current = 1;
} else {
pageSize = state.pagination.pageSize;
current = state.pagination.current;
current = this.getMaxCurrent(state.pagination.total || data.length);
}
// 分页
// ---
// 当数据量少于等于每页数量时，直接设置数据