fix #1166

AllenFang · Apr 15, 2017 · c4c1b7f · c4c1b7f
1 parent 387118c
commit c4c1b7f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -411,6 +411,7 @@ class BootstrapTable extends Component {
             withoutNoDataText={ this.props.options.withoutNoDataText }
             expanding={ this.state.expanding }
             onExpand={ this.handleExpandRow }
+            onlyOneExpanding={ this.props.options.onlyOneExpanding }
             beforeShowError={ this.props.options.beforeShowError }
             keyBoardNav={ this.props.keyBoardNav }
             onNavigateCell={ this.handleNavigateCell }
@@ -1385,6 +1386,7 @@ BootstrapTable.propTypes = {
     expandRowBgColor: PropTypes.string,
     expandBy: PropTypes.string,
     expanding: PropTypes.array,
+    onlyOneExpanding: PropTypes.bool,
     beforeShowError: PropTypes.func,
     printToolBar: PropTypes.bool
   }),
@@ -1529,6 +1531,7 @@ BootstrapTable.defaultProps = {
     expandRowBgColor: undefined,
     expandBy: Const.EXPAND_BY_ROW,
     expanding: [],
+    onlyOneExpanding: false,
     beforeShowError: undefined,
     printToolBar: true
   },

diff --git a/src/TableBody.js b/src/TableBody.js
@@ -303,7 +303,8 @@ class TableBody extends Component {
       expandableRow,
       selectRow: {
         clickToExpand
-      }
+      },
+      onlyOneExpanding
     } = this.props;
     const selectRowAndExpand = this._isSelectRowDefined() && !clickToExpand ? false : true;
     columnIndex = this._isSelectRowDefined() ? columnIndex - 1 : columnIndex;
@@ -320,7 +321,8 @@ class TableBody extends Component {
       if (expanding.indexOf(rowKey) > -1) {
         expanding = expanding.filter(k => k !== rowKey);
       } else {
-        expanding.push(rowKey);
+        if (onlyOneExpanding) expanding = [ rowKey ];
+        else expanding.push(rowKey);
       }
       this.props.onExpand(expanding);
     }
@@ -489,6 +491,7 @@ TableBody.propTypes = {
   expandBy: PropTypes.string,
   expanding: PropTypes.array,
   onExpand: PropTypes.func,
+  onlyOneExpanding: PropTypes.bool,
   beforeShowError: PropTypes.func,
   keyBoardNav: PropTypes.oneOfType([ PropTypes.bool, PropTypes.object ]),
   x: PropTypes.number,