Merge branch 'master' into develop-0.12.0

This commit is contained in:
afc163 2016-01-16 14:58:05 +08:00
commit 4b5e09de8d
2 changed files with 3 additions and 2 deletions

View File

@ -4,7 +4,7 @@
选择后进行操作,完成后清空选择,通过 `rowSelection.selectedRowKeys` 来控制选中项。 选择后进行操作,完成后清空选择,通过 `rowSelection.selectedRowKeys` 来控制选中项。
不支持跨页选择,选中项只限当页,换页后将会清空 此版本换页后将会清空选中
--- ---
@ -50,7 +50,7 @@ const App = React.createClass({
}, 1000); }, 1000);
}, },
onSelectChange(selectedRowKeys) { onSelectChange(selectedRowKeys) {
console.log('selectedRowKeys changed: ' + selectedRowKeys); console.log('selectedRowKeys changed: ', selectedRowKeys);
this.setState({ selectedRowKeys }); this.setState({ selectedRowKeys });
}, },
render() { render() {

View File

@ -215,6 +215,7 @@
&:not([disabled]).active { &:not([disabled]).active {
> .@{iconfont-css-prefix} { > .@{iconfont-css-prefix} {
color: @btn-primary-color; color: @btn-primary-color;
position: relative;
} }
} }