@@ -2723,13 +2723,16 @@ return /******/ (function(modules) { // webpackBootstrap
2723
2723
}, this);
2724
2724
2725
2725
if (tableRows.length === 0 && !this.props.withoutNoDataText) {
2726
+ var colSpan = this.props.columns.filter(function (c) {
2727
+ return !c.hidden;
2728
+ }).length + (isSelectRowDefined ? 1 : 0);
2726
2729
tableRows = [_react2.default.createElement(
2727
2730
_TableRow2.default,
2728
2731
{ key: '##table-empty##' },
2729
2732
_react2.default.createElement(
2730
2733
'td',
2731
2734
{ 'data-toggle': 'collapse',
2732
- colSpan: this.props.columns.length + (isSelectRowDefined ? 1 : 0) ,
2735
+ colSpan: colSpan ,
2733
2736
className: 'react-bs-table-no-data' },
2734
2737
this.props.noDataText || _Const2.default.NO_DATA_TEXT
2735
2738
)
@@ -3685,6 +3688,10 @@ return /******/ (function(modules) { // webpackBootstrap
3685
3688
return _this.__handleCustomUpdate__REACT_HOT_LOADER__.apply(_this, arguments);
3686
3689
};
3687
3690
3691
+ _this.notifyToastr = function () {
3692
+ return _this.__notifyToastr__REACT_HOT_LOADER__.apply(_this, arguments);
3693
+ };
3694
+
3688
3695
_this.handleClick = function () {
3689
3696
return _this.__handleClick__REACT_HOT_LOADER__.apply(_this, arguments);
3690
3697
};
@@ -3762,16 +3769,10 @@ return /******/ (function(modules) { // webpackBootstrap
3762
3769
var responseType = typeof checkVal === 'undefined' ? 'undefined' : _typeof(checkVal);
3763
3770
if (responseType !== 'object' && checkVal !== true) {
3764
3771
valid = false;
3765
- var toastr = this.props.beforeShowError && this.props.beforeShowError('error', checkVal, _Const2.default.CANCEL_TOASTR);
3766
- if (toastr) {
3767
- ts.refs.notifier.notice('error', checkVal, _Const2.default.CANCEL_TOASTR);
3768
- }
3772
+ this.notifyToastr('error', checkVal, _Const2.default.CANCEL_TOASTR);
3769
3773
} else if (responseType === 'object' && checkVal.isValid !== true) {
3770
3774
valid = false;
3771
- var _toastr = this.props.beforeShowError && this.props.beforeShowError(checkVal.notification.type, checkVal.notification.msg, checkVal.notification.title);
3772
- if (_toastr) {
3773
- ts.refs.notifier.notice(checkVal.notification.type, checkVal.notification.msg, checkVal.notification.title);
3774
- }
3775
+ this.notifyToastr(checkVal.notification.type, checkVal.notification.msg, checkVal.notification.title);
3775
3776
}
3776
3777
if (!valid) {
3777
3778
// animate input
@@ -3793,6 +3794,19 @@ return /******/ (function(modules) { // webpackBootstrap
3793
3794
}
3794
3795
// END
3795
3796
3797
+ }, {
3798
+ key: '__notifyToastr__REACT_HOT_LOADER__',
3799
+ value: function __notifyToastr__REACT_HOT_LOADER__(type, message, title) {
3800
+ var toastr = true;
3801
+ var beforeShowError = this.props.beforeShowError;
3802
+
3803
+ if (beforeShowError) {
3804
+ toastr = beforeShowError(type, message, title);
3805
+ }
3806
+ if (toastr) {
3807
+ this.refs.notifier.notice(type, message, title);
3808
+ }
3809
+ }
3796
3810
}, {
3797
3811
key: 'clearTimeout',
3798
3812
value: function (_clearTimeout) {
0 commit comments