@@ -1432,6 +1432,7 @@ return /******/ (function(modules) { // webpackBootstrap
14321432 children = _props3.children;
14331433
14341434 var enableShowOnlySelected = selectRow && selectRow.showOnlySelected;
1435+ var print = typeof this.props.options.printToolBar === 'undefined' ? true : this.props.options.printToolBar;
14351436 if (enableShowOnlySelected || insertRow || deleteRow || search || exportCSV || this.props.options.searchPanel || this.props.options.btnGroup || this.props.options.toolBar) {
14361437 var columns = void 0;
14371438 if (Array.isArray(children)) {
@@ -1461,7 +1462,7 @@ return /******/ (function(modules) { // webpackBootstrap
14611462 }
14621463 return _react2.default.createElement(
14631464 'div',
1464- { className: 'react-bs-table-tool-bar' },
1465+ { className: 'react-bs-table-tool-bar ' + (print ? '' : 'hidden-print') },
14651466 _react2.default.createElement(_ToolBar2.default, {
14661467 ref: 'toolbar',
14671468 defaultSearch: this.props.options.defaultSearch,
@@ -1775,7 +1776,8 @@ return /******/ (function(modules) { // webpackBootstrap
17751776 expandRowBgColor: _react.PropTypes.string,
17761777 expandBy: _react.PropTypes.string,
17771778 expanding: _react.PropTypes.array,
1778- beforeShowError: _react.PropTypes.func
1779+ beforeShowError: _react.PropTypes.func,
1780+ printToolBar: _react.PropTypes.bool
17791781 }),
17801782 fetchInfo: _react.PropTypes.shape({
17811783 dataTotalSize: _react.PropTypes.number
@@ -1917,7 +1919,8 @@ return /******/ (function(modules) { // webpackBootstrap
19171919 expandRowBgColor: undefined,
19181920 expandBy: _Const2.default.EXPAND_BY_ROW,
19191921 expanding: [],
1920- beforeShowError: undefined
1922+ beforeShowError: undefined,
1923+ printToolBar: true
19211924 },
19221925 fetchInfo: {
19231926 dataTotalSize: 0
@@ -2291,7 +2294,9 @@ return /******/ (function(modules) { // webpackBootstrap
22912294 }, {
22922295 key: 'renderSelectRowHeader',
22932296 value: function renderSelectRowHeader(rowCount, rowKey) {
2294- if (this.props.customComponent) {
2297+ if (this.props.hideSelectColumn) {
2298+ return null;
2299+ } else if (this.props.customComponent) {
22952300 var CustomComponent = this.props.customComponent;
22962301 return _react2.default.createElement(
22972302 _SelectRowHeaderColumn2.default,
@@ -2716,8 +2721,9 @@ return /******/ (function(modules) { // webpackBootstrap
27162721 }
27172722 return result;
27182723 }, this);
2724+
27192725 if (tableRows.length === 0 && !this.props.withoutNoDataText) {
2720- tableRows.push( _react2.default.createElement(
2726+ tableRows = [ _react2.default.createElement(
27212727 _TableRow2.default,
27222728 { key: '##table-empty##' },
27232729 _react2.default.createElement(
@@ -2727,7 +2733,7 @@ return /******/ (function(modules) { // webpackBootstrap
27272733 className: 'react-bs-table-no-data' },
27282734 this.props.noDataText || _Const2.default.NO_DATA_TEXT
27292735 )
2730- )) ;
2736+ )] ;
27312737 }
27322738
27332739 return _react2.default.createElement(
0 commit comments