hrsass-components 2.3.7 → 2.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/hrsass-components.js +17 -2
- package/lib/hrsass-components.min.js +1 -1
- package/package.json +1 -1
- package/rollup.build.css +0 -5246
package/lib/hrsass-components.js
CHANGED
|
@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
|
|
|
65
65
|
var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
|
|
66
66
|
var saveSvgAsPng = require('save-svg-as-png');
|
|
67
67
|
|
|
68
|
-
var version = "2.3.
|
|
68
|
+
var version = "2.3.8";
|
|
69
69
|
|
|
70
70
|
/**
|
|
71
71
|
* 版本号
|
|
@@ -8522,8 +8522,23 @@ var index = {
|
|
|
8522
8522
|
var _conditionList = conditionList.filter(function (item) {
|
|
8523
8523
|
return item.value || item.controlType === "SWITCH";
|
|
8524
8524
|
});
|
|
8525
|
+
_conditionList = _conditionList.concat(tempConditionListByScheme, conditionListByScheme);
|
|
8526
|
+
var conditonListDeepClone = _.cloneDeep(_conditionList);
|
|
8527
|
+
var fitlerOtehrConditionListDeepClone = conditonListDeepClone.filter(function (item) {
|
|
8528
|
+
return item.codeType !== "org_organize_dept_tree_all" && item.controlType !== "DATERANGE";
|
|
8529
|
+
});
|
|
8530
|
+
console.log('toolbar conditionListDeepClone', fitlerOtehrConditionListDeepClone);
|
|
8531
|
+
var fitlerConditionListDeepClone = conditonListDeepClone.filter(function (item) {
|
|
8532
|
+
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) {
|
|
8533
|
+
return typeof val === 'string' && val.trim() === '';
|
|
8534
|
+
});
|
|
8535
|
+
}).map(function (sub) {
|
|
8536
|
+
return _objectSpread$d(_objectSpread$d({}, sub), {}, {
|
|
8537
|
+
value: sub.value.join(",")
|
|
8538
|
+
});
|
|
8539
|
+
});
|
|
8525
8540
|
var opts = {
|
|
8526
|
-
condition:
|
|
8541
|
+
condition: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone)),
|
|
8527
8542
|
columns: columns
|
|
8528
8543
|
};
|
|
8529
8544
|
this.$axios.post("platform/imp/downloadGridData.search?code=".concat(code), opts).then(function (res) {
|