mirror of
https://github.com/ant-design/ant-design.git
synced 2025-01-18 06:03:38 +08:00
Merge pull request #831 from ant-design/fix-table
fix: Pagination.onChange should be called #824
This commit is contained in:
commit
f978a01802
@ -39,6 +39,9 @@ const pagination = {
|
||||
showSizeChanger: true,
|
||||
onShowSizeChange: function(current, pageSize) {
|
||||
console.log('Current: ', current, '; PageSize: ', pageSize);
|
||||
},
|
||||
onChange: function(current) {
|
||||
console.log('Current: ', current);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -19,6 +19,13 @@ const defaultLocale = {
|
||||
emptyText: '暂无数据',
|
||||
};
|
||||
|
||||
const defaultPagination = {
|
||||
pageSize: 10,
|
||||
current: 1,
|
||||
onChange: noop,
|
||||
onShowSizeChange: noop,
|
||||
};
|
||||
|
||||
let AntTable = React.createClass({
|
||||
getInitialState() {
|
||||
return {
|
||||
@ -30,10 +37,9 @@ let AntTable = React.createClass({
|
||||
sortOrder: '',
|
||||
sorter: null,
|
||||
radioIndex: null,
|
||||
pagination: this.hasPagination() ? objectAssign({
|
||||
pageSize: 10,
|
||||
current: 1
|
||||
}, this.props.pagination) : {}
|
||||
pagination: this.hasPagination() ?
|
||||
objectAssign({}, defaultPagination, this.props.pagination) :
|
||||
{},
|
||||
};
|
||||
},
|
||||
|
||||
@ -253,6 +259,8 @@ let AntTable = React.createClass({
|
||||
} else {
|
||||
pagination.current = pagination.current || 1;
|
||||
}
|
||||
pagination.onChange(pagination.current);
|
||||
|
||||
const newState = {
|
||||
selectionDirty: false,
|
||||
pagination
|
||||
@ -423,9 +431,7 @@ let AntTable = React.createClass({
|
||||
|
||||
handleShowSizeChange(current, pageSize) {
|
||||
const pagination = this.state.pagination;
|
||||
if (pagination.onShowSizeChange) {
|
||||
pagination.onShowSizeChange(current, pageSize);
|
||||
}
|
||||
pagination.onShowSizeChange(current, pageSize);
|
||||
|
||||
let nextPagination = objectAssign(pagination, {
|
||||
pageSize: pageSize
|
||||
|
Loading…
Reference in New Issue
Block a user