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

Fix Table data.length without specifing pagination, close #1683

Browse Source
This commit is contained in:
afc163 2016-05-13 13:49:08 +08:00
parent 7504d04ad7
commit 22af4a9592
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

@ -570,7 +570,7 @@ export default class Table extends React.Component {
}));
}
renderPagination(data) {
renderPagination() {
// 强制不需要分页
if (!this.hasPagination()) {
return null;
@ -581,7 +581,7 @@ export default class Table extends React.Component {
} else if (this.props.size === 'middle' || this.props.size === 'small') {
size = 'small';
}
let total = this.state.pagination.total || (data || this.getLocalData()).length;
let total = this.state.pagination.total || this.getLocalData().length;
return (total > 0) ?
<Pagination {...this.state.pagination}
className={`${this.props.prefixCls}-pagination`}
@ -719,7 +719,7 @@ export default class Table extends React.Component {
return (
<div className={`${emptyClass} ${className} clearfix`} style={style}>
{<Spin className={spinClassName} spinning={this.props.loading}>{table}</Spin>}
{this.renderPagination(data)}
{this.renderPagination()}
</div>
);
}