fix #502

AllenFang · Jun 18, 2016 · f5faef1 · f5faef1
1 parent 7093d58
commit f5faef1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -907,7 +907,8 @@ BootstrapTable.propTypes = {
     clickToSelect: PropTypes.bool,
     hideSelectColumn: PropTypes.bool,
     clickToSelectAndEditCell: PropTypes.bool,
-    showOnlySelected: PropTypes.bool
+    showOnlySelected: PropTypes.bool,
+    unselectable: PropTypes.array
   }),
   cellEdit: PropTypes.shape({
     mode: PropTypes.string,
@@ -992,7 +993,8 @@ BootstrapTable.defaultProps = {
     clickToSelect: false,
     hideSelectColumn: false,
     clickToSelectAndEditCell: false,
-    showOnlySelected: false
+    showOnlySelected: false,
+    unselectable: []
   },
   cellEdit: {
     mode: Const.CELL_EDIT_NONE,

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -27,8 +27,10 @@ class TableBody extends Component {
       'table-condensed': this.props.condensed
     }, this.props.tableBodyClass);
 
+    const unselectable = this.props.selectRow.unselectable || [];
     const isSelectRowDefined = this._isSelectRowDefined();
     const tableHeader = this.renderTableHeader(isSelectRowDefined);
+    const inputType = this.props.selectRow.mode === Const.ROW_SELECT_SINGLE ? 'radio' : 'checkbox';
 
     const tableRows = this.props.data.map(function(data, r) {
       const tableColumns = this.props.columns.map(function(column, i) {
@@ -96,10 +98,10 @@ class TableBody extends Component {
           );
         }
       }, this);
-
+      const disable = unselectable.indexOf(data[this.props.keyField]) !== -1;
       const selected = this.props.selectedRowKeys.indexOf(data[this.props.keyField]) !== -1;
       const selectRowColumn = isSelectRowDefined && !this.props.selectRow.hideSelectColumn ?
-                              this.renderSelectRowColumn(selected) : null;
+                              this.renderSelectRowColumn(selected, inputType, disable) : null;
       // add by bluespring for className customize
       let trClassName = this.props.trClassName;
       if (isFun(this.props.trClassName)) {
@@ -112,7 +114,8 @@ class TableBody extends Component {
           onRowClick={ this.handleRowClick }
           onRowMouseOver={ this.handleRowMouseOver }
           onRowMouseOut={ this.handleRowMouseOut }
-          onSelectRow={ this.handleSelectRow }>
+          onSelectRow={ this.handleSelectRow }
+          unselectableRow={ disable }>
           { selectRowColumn }
           { tableColumns }
         </TableRow>
@@ -250,22 +253,13 @@ class TableBody extends Component {
     }
   }
 
-  renderSelectRowColumn(selected) {
-    if (this.props.selectRow.mode === Const.ROW_SELECT_SINGLE) {
-      return (
-        <TableColumn dataAlign='center'>
-          <input type='radio' checked={ selected }
-            onChange={ this.handleSelectRowColumChange }/>
-        </TableColumn>
-      );
-    } else {
-      return (
-        <TableColumn dataAlign='center'>
-          <input type='checkbox' checked={ selected }
+  renderSelectRowColumn(selected, inputType, disabled) {
+    return (
+      <TableColumn dataAlign='center'>
+        <input type={ inputType } checked={ selected } disabled={ disabled }
           onChange={ this.handleSelectRowColumChange }/>
-        </TableColumn>
-      );
-    }
+      </TableColumn>
+    );
   }
 
   _isSelectRowDefined() {

diff --git a/src/TableRow.js b/src/TableRow.js
@@ -14,9 +14,10 @@ class TableRow extends Component {
         e.target.tagName !== 'TEXTAREA') {
       const rowIndex = e.currentTarget.rowIndex + 1;
       if (this.props.selectRow) {
-        if (this.props.selectRow.clickToSelect) {
+        if (this.props.selectRow.clickToSelect && !this.props.unselectableRow) {
           this.props.onSelectRow(rowIndex, !this.props.isSelected, e);
-        } else if (this.props.selectRow.clickToSelectAndEditCell) {
+        } else if (this.props.selectRow.clickToSelectAndEditCell
+          && !this.props.unselectableRow) {
           this.clickNum++;
           /** if clickToSelectAndEditCell is enabled,
            *  there should be a delay to prevent a selection changed when
@@ -79,7 +80,8 @@ TableRow.propTypes = {
   onRowClick: PropTypes.func,
   onSelectRow: PropTypes.func,
   onRowMouseOut: PropTypes.func,
-  onRowMouseOver: PropTypes.func
+  onRowMouseOver: PropTypes.func,
+  unselectableRow: PropTypes.bool
 };
 TableRow.defaultProps = {
   onRowClick: undefined