Comparing version 0.7.3-beta1 to 0.7.3-beta2
@@ -31,2 +31,2 @@ require('./index.css'); | ||
antd.version = '0.7.3-beta1'; | ||
antd.version = '0.7.3-beta2'; |
@@ -62,11 +62,9 @@ 'use strict'; | ||
} | ||
var pagination = undefined; | ||
if (this.props.pagination === false) { | ||
pagination = false; | ||
} else { | ||
pagination = (0, _objectAssign2['default'])({ | ||
pageSize: 10, | ||
total: this.props.dataSource.length | ||
}, this.props.pagination); | ||
} | ||
var noPagination = this.props.pagination === false; | ||
var pagination = (0, _objectAssign2['default'])({ | ||
pageSize: 10, | ||
total: this.props.dataSource.length | ||
}, this.props.pagination); | ||
return { | ||
@@ -76,2 +74,3 @@ selectedRowKeys: [], | ||
pagination: pagination, | ||
noPagination: noPagination, | ||
data: [] | ||
@@ -185,3 +184,7 @@ }; | ||
var pagination = this.state.pagination || {}; | ||
pagination.current = current || 1; | ||
if (current) { | ||
pagination.current = current; | ||
} else { | ||
pagination.current = pagination.current || 1; | ||
} | ||
this.setState({ | ||
@@ -270,3 +273,3 @@ pagination: pagination | ||
// 强制不需要分页 | ||
if (this.props.pagination === false) { | ||
if (this.state.noPagination) { | ||
return ''; | ||
@@ -337,3 +340,3 @@ } | ||
// 如果没有分页的话,默认全部展示 | ||
if (_this3.props.pagination === false) { | ||
if (_this3.state.noPagination) { | ||
pageSize = Number.MAX_VALUE; | ||
@@ -340,0 +343,0 @@ current = 1; |
{ | ||
"name": "antd", | ||
"version": "0.7.3-beta1", | ||
"version": "0.7.3-beta2", | ||
"stableVersion": "0.7.2", | ||
@@ -5,0 +5,0 @@ "title": "Ant Design", |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
242956
30
8903