added showExpandAllHeaderColumn to show/hide header column

AllenFang · Oct 17, 2017 · 061ffa5 · 061ffa5
1 parent 344308f
commit 061ffa5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/css/react-bootstrap-table.css b/css/react-bootstrap-table.css
@@ -261,7 +261,7 @@ td.react-bs-table-expand-cell {
     cursor: pointer;
 }
 
-th.react-bs-table-expand-cell {
+th.react-bs-table-expand-cell > div {
   cursor: pointer;
 }
 

diff --git a/examples/js/expandRow/custom-expand-indicator.js b/examples/js/expandRow/custom-expand-indicator.js
@@ -93,7 +93,8 @@ export default class ExpandRow extends React.Component {
   render() {
     const options = {
       expandRowBgColor: 'rgb(242, 255, 163)',
-      expandAllChilds: false
+      expandAllChilds: false,
+      showExpandAllHeaderColumn: true
     };
     return (
       <BootstrapTable data={ products }

diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
@@ -480,6 +480,7 @@ class BootstrapTable extends Component {
             expandedColumnHeaderComponent={ expandColumnOptions.expandedColumnHeaderComponent }
             expandAllChilds={ this.state.expandAllChilds }
             toggleExpandAllChilds={ this.toggleExpandAllChilds }
+            showExpandAllHeaderColumn={ this.props.options.showExpandAllHeaderColumn }
             expandColumnBeforeSelectColumn={ expandColumnOptions.expandColumnBeforeSelectColumn }>
             { this.props.children }
           </TableHeader>
@@ -1727,7 +1728,8 @@ BootstrapTable.propTypes = {
     printToolBar: PropTypes.bool,
     insertFailIndicator: PropTypes.string,
     noAutoBOM: PropTypes.bool,
-    expandAllChilds: PropTypes.bool
+    expandAllChilds: PropTypes.bool,
+    showExpandAllHeaderColumn: PropTypes.bool
   }),
   fetchInfo: PropTypes.shape({
     dataTotalSize: PropTypes.number
@@ -1897,7 +1899,8 @@ BootstrapTable.defaultProps = {
     printToolBar: true,
     insertFailIndicator: Const.INSERT_FAIL_INDICATOR,
     noAutoBOM: true,
-    expandAllChilds: false
+    expandAllChilds: false,
+    showExpandAllHeaderColumn: false
   },
   fetchInfo: {
     dataTotalSize: 0

diff --git a/src/ExpandRowHeaderColumn.js b/src/ExpandRowHeaderColumn.js
@@ -13,17 +13,23 @@ class ExpandRowHeaderColumn extends Component {
   }
 
   render() {
-    const { expandedColumnHeaderComponent, expandAllChilds } = this.props;
-    const defaultExpandedHeaderComponent = (expandAllChilds ? '(-)' : '(+)' );
+    const {
+      expandedColumnHeaderComponent,
+      expandAllChilds,
+      showExpandAllHeaderColumn
+    } = this.props;
+    const expandedHeaderComponent = (expandAllChilds ? '(-)' : '(+)' );
     const ExpandedColumnHeaderComponent = expandedColumnHeaderComponent;
 
     return (
       <th rowSpan={ this.props.rowCount } style={ { textAlign: 'center' } }
         className='react-bs-table-expand-cell'
-        data-is-only-head={ false } onClick={ this.toggleExpandAllChilds }>
-        { this.props.expandedColumnHeaderComponent ?
-          <ExpandedColumnHeaderComponent
-            expandAllChilds={ this.props.expandAllChilds } /> : defaultExpandedHeaderComponent }
+        data-is-only-head={ false }>
+        { showExpandAllHeaderColumn && <div onClick={ this.toggleExpandAllChilds }>
+          { expandedColumnHeaderComponent ?
+            <ExpandedColumnHeaderComponent
+              expandAllChilds={ this.props.expandAllChilds } /> : expandedHeaderComponent }
+        </div> }
       </th>
     );
   }
@@ -32,6 +38,7 @@ ExpandRowHeaderColumn.propTypes = {
   expandedColumnHeaderComponent: PropTypes.func,
   rowCount: PropTypes.number,
   expandAllChilds: PropTypes.bool,
-  toggleExpandAllChilds: PropTypes.func
+  toggleExpandAllChilds: PropTypes.func,
+  showExpandAllHeaderColumn: PropTypes.bool
 };
 export default ExpandRowHeaderColumn;
diff --git a/src/TableHeader.js b/src/TableHeader.js
@@ -39,7 +39,8 @@ class TableHeader extends Component {
 
   render() {
     const { sortIndicator, sortList, onSort, reset, version, condensed, bordered,
-      expandedColumnHeaderComponent, expandAllChilds, toggleExpandAllChilds } = this.props;
+      expandedColumnHeaderComponent, expandAllChilds, toggleExpandAllChilds,
+      showExpandAllHeaderColumn } = this.props;
     const containerClasses = classSet(
       'react-bs-container-header',
       'table-header-wrapper',
@@ -68,7 +69,8 @@ class TableHeader extends Component {
           <ExpandRowHeaderColumn key='expandCol' rowCount={ rowCount + 1 }
             expandedColumnHeaderComponent={ expandedColumnHeaderComponent }
             expandAllChilds={ expandAllChilds }
-            toggleExpandAllChilds={ toggleExpandAllChilds }/>
+            toggleExpandAllChilds={ toggleExpandAllChilds }
+            showExpandAllHeaderColumn={ showExpandAllHeaderColumn }/>
     ], [
       this.renderSelectRowHeader(rowCount + 1, rowKey++)
     ], [
@@ -77,7 +79,8 @@ class TableHeader extends Component {
           <ExpandRowHeaderColumn key='expandCol' rowCount={ rowCount + 1 }
             expandedColumnHeaderComponent={ expandedColumnHeaderComponent }
             expandAllChilds={ expandAllChilds }
-            toggleExpandAllChilds={ toggleExpandAllChilds }/>
+            toggleExpandAllChilds={ toggleExpandAllChilds }
+            showExpandAllHeaderColumn={ showExpandAllHeaderColumn }/>
     ]);
 
     React.Children.forEach(this.props.children, (elm) => {
@@ -177,7 +180,8 @@ TableHeader.propTypes = {
   expandColumnBeforeSelectColumn: PropTypes.bool,
   version: PropTypes.string,
   expandAllChilds: PropTypes.bool,
-  toggleExpandAllChilds: PropTypes.func
+  toggleExpandAllChilds: PropTypes.func,
+  showExpandAllHeaderColumn: PropTypes.bool
 };
 
 export default TableHeader;