Merge branch master into develop-1.0.0

components/table/demo/row-selection.md

@@ -48,7 +48,7 @@ const rowSelection = {
   },
   onSelectAll(selected, selectedRows, changeRows) {
     console.log(selected, selectedRows, changeRows);
-  }
+  },
 };
 
 ReactDOM.render(<Table rowSelection={rowSelection} columns={columns} dataSource={data} />

components/table/index.jsx

@@ -64,7 +64,7 @@ export default class Table extends React.Component {
 
     this.state = {
       // 减少状态
-      selectedRowKeys: props.selectedRowKeys || [],
+      selectedRowKeys: (props.rowSelection || {}).selectedRowKeys || [],
       filters: this.getFiltersFromColumns(),
       selectionDirty: false,
       ...this.getSortStateFromColumns(),