mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-29 13:47:02 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch master into develop-1.0.0

Browse Source
This commit is contained in:
afc163 2016-04-16 17:10:10 +08:00
commit d2ffb0978f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/table/index.jsx
View File

@ -96,9 +96,9 @@ export default class Table extends React.Component {
componentWillReceiveProps(nextProps) {
if (('pagination' in nextProps) && nextProps.pagination !== false) {
this.setState({
pagination: { ...defaultPagination, ...this.state.pagination, ...nextProps.pagination },
});
this.setState(previousState => ({
pagination: { ...defaultPagination, ...previousState.pagination, ...nextProps.pagination },
}));
}
// dataSource 的变化会清空选中项
if ('dataSource' in nextProps &&