hrsass-components 2.3.6 → 2.3.8

package/lib/hrsass-components.js

@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
 var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
 var saveSvgAsPng = require('save-svg-as-png');
 
-var version = "2.3.6";
+var version = "2.3.8";
 
 /**
  * 版本号
@@ -8405,7 +8405,7 @@ var index = {
         sortList: sort,
         conditionList: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone))
       }).then(function (res) {
-        var _this5$selectedRowsLi, _this5$selectedRowsLi2;
+        var _this5$selectedRowsLi;
         //res.dataList根据rowKey去重
         res.dataList = _.uniqBy(res.dataList, _this5.rowKey || 'id');
         //外部处理数据
@@ -8431,9 +8431,9 @@ var index = {
             _this5.selectedUpdateRows = _this5.selectedUpdateRows.concat(notInCurrentPageRows);
           }
         }
-        if ((_this5 === null || _this5 === void 0 || (_this5$selectedRowsLi2 = _this5.selectedRowsList) === null || _this5$selectedRowsLi2 === void 0 ? void 0 : _this5$selectedRowsLi2.length) == 0) {
-          _this5.clearSelectedRows();
-        }
+        // if (this?.selectedRowsList?.length == 0) {
+        //   this.clearSelectedRows();
+        // }
         _this5.setState({
           pagination: _objectSpread$d(_objectSpread$d({}, pagination), {}, {
             total: res.total
@@ -8522,8 +8522,23 @@ var index = {
       var _conditionList = conditionList.filter(function (item) {
         return item.value || item.controlType === "SWITCH";
       });
+      _conditionList = _conditionList.concat(tempConditionListByScheme, conditionListByScheme);
+      var conditonListDeepClone = _.cloneDeep(_conditionList);
+      var fitlerOtehrConditionListDeepClone = conditonListDeepClone.filter(function (item) {
+        return item.codeType !== "org_organize_dept_tree_all" && item.controlType !== "DATERANGE";
+      });
+      console.log('toolbar conditionListDeepClone', fitlerOtehrConditionListDeepClone);
+      var fitlerConditionListDeepClone = conditonListDeepClone.filter(function (item) {
+        return (item.codeType === "org_organize_dept_tree_all" && item.controlType === "SELECTOR" || item.controlType === "DATERANGE") && _.isArray(item.value) && item.value.length > 0 && !item.value.every(function (val) {
+          return typeof val === 'string' && val.trim() === '';
+        });
+      }).map(function (sub) {
+        return _objectSpread$d(_objectSpread$d({}, sub), {}, {
+          value: sub.value.join(",")
+        });
+      });
       var opts = {
-        condition: _conditionList.concat(tempConditionListByScheme, conditionListByScheme),
+        condition: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone)),
         columns: columns
       };
       this.$axios.post("platform/imp/downloadGridData.search?code=".concat(code), opts).then(function (res) {