mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 22:36:31 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Merge branch master into develop-1.0.0

Browse Source
This commit is contained in:
afc163 2016-04-01 01:09:24 +08:00
commit 84b731df0f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/table/demo/paging.md
View File

@ -36,7 +36,6 @@ for (let i = 0; i < 46; i++) {
const pagination = {
total: data.length,
current: 1,
showSizeChanger: true,
onShowSizeChange(current, pageSize) {
console.log('Current: ', current, '; PageSize: ', pageSize);

17
components/table/index.jsx
View File

@ -362,6 +362,7 @@ const Table = React.createClass({
},
handlePageChange(current) {
const props = this.props;
let pagination = { ...this.state.pagination };
if (current) {
pagination.current = current;
@ -372,10 +373,22 @@ const Table = React.createClass({
const newState = {
selectionDirty: false,
pagination
pagination,
};
// Controlled current prop will not respond user interaction
if (props.pagination && 'current' in props.pagination) {
newState.pagination = {
...pagination,
current: this.state.pagination.current,
};
}
this.setState(newState);
this.props.onChange(...this.prepareParamsArguments({ ...this.state, ...newState }));
this.props.onChange(...this.prepareParamsArguments({
...this.state,
selectionDirty: false,
pagination,
}));
},
onRadioChange(ev) {