fix #57

AllenFang · Sep 23, 2015 · 260a1a4 · 260a1a4
1 parent f463a68
commit 260a1a4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/example/js/demo.bundle.js b/example/js/demo.bundle.js
diff --git a/example/js/demo.js b/example/js/demo.js
@@ -49,6 +49,7 @@ function onAfterInsertRow(row){
 var selectRowProp = {
   mode: "checkbox",
   clickToSelect: true,
+  // hideSelectColumn: true, //you can hide select column, if you enable clickToSelect
   selected: [], //default select on table
   bgColor: "rgb(238, 193, 213)",
   onSelect: onRowSelect,

diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -125,6 +125,7 @@ class BootstrapTable extends React.Component{
         {toolBar}
         <div ref="table" style={style} className={tableClass}>
           <TableHeader rowSelectType={this.props.selectRow.mode}
+                       hideSelectColumn={this.props.selectRow.hideSelectColumn}
                        sortName={this.props.options.sortName}
                        sortOrder={this.props.options.sortOrder}
                        onSort={this.handleSort.bind(this)}
@@ -386,6 +387,7 @@ BootstrapTable.propTypes = {
     onSelect: React.PropTypes.func,
     onSelectAll: React.PropTypes.func,
     clickToSelect: React.PropTypes.bool,
+    hideSelectColumn: React.PropTypes.bool,
     clickToSelectAndEditCell: React.PropTypes.bool
   }),
   cellEdit: React.PropTypes.shape({
@@ -419,6 +421,7 @@ BootstrapTable.defaultProps = {
     onSelect: undefined,
     onSelectAll: undefined,
     clickToSelect: false,
+    hideSelectColumn: false,
     clickToSelectAndEditCell: false
   },
   cellEdit:{

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -77,7 +77,8 @@ class TableBody extends React.Component{
         }
       }, this);
       var selected = this.props.selectedRowKeys.indexOf(data[this.props.keyField]) != -1;
-      var selectRowColumn = isSelectRowDefined?this.renderSelectRowColumn(selected):null;
+      var selectRowColumn = isSelectRowDefined && !this.props.selectRow.hideSelectColumn?
+                              this.renderSelectRowColumn(selected):null;
       return (
         <TableRow isSelected={selected} key={r}
           selectRow={isSelectRowDefined?this.props.selectRow:undefined}
@@ -118,7 +119,7 @@ class TableBody extends React.Component{
       let style = {
         width:35
       }
-      selectRowHeader = (<th style={style} key={-1}></th>);
+      selectRowHeader = this.props.selectRow.hideSelectColumn?null:(<th style={style} key={-1}></th>);
     }
     var theader = this.props.columns.map(function(column, i){
       let style={
@@ -157,6 +158,8 @@ class TableBody extends React.Component{
     this.editing = true;
     if(this._isSelectRowDefined()){
       columnIndex--;
+      if(this.props.selectRow.hideSelectColumn)
+        columnIndex++;
     }
     rowIndex--;
     var stateObj = {

diff --git a/src/TableHeader.js b/src/TableHeader.js
@@ -38,7 +38,7 @@ class TableHeader extends React.Component{
 
   render(){
     var containerClasses = classSet("table-header");
-    var selectRowHeaderCol = this.renderSelectRowHeader();
+    var selectRowHeaderCol = this.props.hideSelectColumn?null:this.renderSelectRowHeader();
     this._attachClearSortCaretFunc();
 
     return(
@@ -82,7 +82,8 @@ TableHeader.propTypes = {
   onSort: React.PropTypes.func,
   onSelectAllRow: React.PropTypes.func,
   sortName: React.PropTypes.string,
-  sortOrder: React.PropTypes.string
+  sortOrder: React.PropTypes.string,
+  hideSelectColumn: React.PropTypes.bool
 };
 
 TableHeader.defaultProps = {