fix #152

AllenFang · Nov 25, 2015 · ee5e3f5 · ee5e3f5
1 parent 3d46d88
commit ee5e3f5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -150,6 +150,7 @@ class BootstrapTable extends React.Component {
   }
 
   render() {
+
     var tableClass = classSet("react-bs-table");
     var childrens = this.props.children;
     var style = {
@@ -176,6 +177,7 @@ class BootstrapTable extends React.Component {
     var pagination = this.renderPagination();
     var toolBar = this.renderToolBar();
     var tableFilter = this.renderTableFilter(columns);
+    var isSelectAll = this.isSelectAll();
     return (
       <div className="react-bs-container" ref="table">
         {toolBar}
@@ -189,7 +191,8 @@ class BootstrapTable extends React.Component {
             onSort={this.handleSort.bind(this)}
             onSelectAllRow={this.handleSelectAllRow.bind(this)}
             bordered={this.props.bordered}
-            condensed={this.props.condensed}>
+            condensed={this.props.condensed}
+            isSelectAll={isSelectAll}>
             {this.props.children}
           </TableHeader>
           <TableBody
@@ -216,6 +219,16 @@ class BootstrapTable extends React.Component {
     )
   }
 
+  isSelectAll(){
+    var defaultSelectRowKeys = this.store.getSelectedRowKeys();
+    var allRowKeys = this.store.getAllRowkey();
+    if(defaultSelectRowKeys.length !== allRowKeys.length){
+      return false;
+    } else {
+      return defaultSelectRowKeys.every(elm => allRowKeys.indexOf(elm)>-1);
+    }
+  }
+
   handleSort(order, sortField) {
     if (this.props.options.onSortChange) {
       this.props.options.onSortChange(sortField, order, this.props);

diff --git a/src/TableHeader.js b/src/TableHeader.js
@@ -63,7 +63,10 @@ class TableHeader extends React.Component{
     if(this.props.rowSelectType == Const.ROW_SELECT_SINGLE) {
       return (<SelectRowHeaderColumn></SelectRowHeaderColumn>);
     }else if(this.props.rowSelectType == Const.ROW_SELECT_MULTI){
-      return (<SelectRowHeaderColumn><input type="checkbox" onChange={this.props.onSelectAllRow}/></SelectRowHeaderColumn>);
+      return (<SelectRowHeaderColumn>
+          <input type="checkbox" onChange={this.props.onSelectAllRow} checked={this.props.isSelectAll}/>
+        </SelectRowHeaderColumn>
+      );
     }else{
       return null;
     }
@@ -106,7 +109,8 @@ TableHeader.propTypes = {
   sortOrder: React.PropTypes.string,
   hideSelectColumn: React.PropTypes.bool,
   bordered: React.PropTypes.bool,
-  condensed: React.PropTypes.bool
+  condensed: React.PropTypes.bool,
+  isSelectAll: React.PropTypes.bool
 };
 
 TableHeader.defaultProps = {