hrsass-components 1.7.66 → 1.7.68

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 = "1.7.66";
+var version = "1.7.68";
 
 /**
  * 版本号
@@ -881,10 +881,10 @@ __$styleInject(".hr-constant-code {\n  width: 100%;\n}\n.hr-constant-code.hr-con
 function ownKeys$2(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread$2(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$2(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$2(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var HrConstantCode = {
-  name: 'HrConstantCode',
+  name: "HrConstantCode",
   model: {
-    prop: 'value',
-    event: 'change'
+    prop: "value",
+    event: "change"
   },
   props: {
     value: {
@@ -896,7 +896,7 @@ var HrConstantCode = {
     },
     filterCode: {
       type: String,
-      "default": ''
+      "default": ""
     },
     tags: {
       type: Boolean,
@@ -924,7 +924,7 @@ var HrConstantCode = {
       dataset: [],
       isCustom: false,
       labelMapping: Object.create(null),
-      treeLabel: ''
+      treeLabel: ""
     };
   },
   watch: {
@@ -944,7 +944,7 @@ var HrConstantCode = {
         this.updateDataset();
       }
     },
-    'calcValue.value': {
+    "calcValue.value": {
       handler: function handler(value) {
         if (this.isTree && value !== undefined && this.finalTreeSeparator !== false) {
           this.getLabel(value);
@@ -962,6 +962,21 @@ var HrConstantCode = {
         _this.getLabel(_this.calcValue.value);
       });
     }
+    this.throttleGetDataset = _.throttle(function (val) {
+      var code = _this.code,
+        filterCode = _this.filterCode;
+      return new Promise(function (resolve) {
+        _this.$axios.get("/platform/code/getSubCodeSelectorDataDTO.search?typeCode=".concat(code, "&filterCode=").concat(filterCode), {
+          filterStr: val
+        }).then(function (res) {
+          _this.dataset = _this.dataset.concat(res.codeList || []);
+          _this.dataset = _.uniqWith(_this.dataset, function (a, b) {
+            return a.code === b.code;
+          });
+          resolve();
+        });
+      });
+    }, 300);
   },
   mounted: function mounted() {
     if (!this.isCustom) {
@@ -972,32 +987,32 @@ var HrConstantCode = {
     codeData: function codeData() {
       var code = this.code,
         _this$filterCode = this.filterCode,
-        filterCode = _this$filterCode === void 0 ? '' : _this$filterCode;
+        filterCode = _this$filterCode === void 0 ? "" : _this$filterCode;
       var mappingKey = "".concat(code, "|").concat(filterCode);
       return this.$store.state.common.constCodes[mappingKey] || {};
     },
     type: function type() {
-      return this.codeData.dataStructure || 'LIST';
+      return this.codeData.dataStructure || "LIST";
     },
     isTree: function isTree() {
-      return this.type === 'TREE';
+      return this.type === "TREE";
     },
     finalTreeSeparator: function finalTreeSeparator() {
       var separator = this.codeData.treeSeparator || this.treeSeparator;
       return separator;
     },
     isAsync: function isAsync() {
-      return this.codeData.asyncloading === 'yes';
+      return this.codeData.asyncloading === "yes";
     },
     calcValue: function calcValue() {
       var value = this.value;
-      var val_key = this.isTree ? 'value' : 'key';
+      var val_key = this.isTree ? "value" : "key";
       if (_.isArray(value)) {
         value = value.map(function (item) {
           var val = _defineProperty({}, val_key, item);
           if (_.isObject(item)) {
             var _val2;
-            val = (_val2 = {}, _defineProperty(_val2, val_key, item.code || ''), _defineProperty(_val2, "label", item.name), _val2);
+            val = (_val2 = {}, _defineProperty(_val2, val_key, item.code || ""), _defineProperty(_val2, "label", item.name), _val2);
           }
           return val;
         });
@@ -1034,11 +1049,11 @@ var HrConstantCode = {
         if (this.isTree) {
           props.multiple = true;
         } else {
-          props.mode = 'multiple';
+          props.mode = "multiple";
         }
       }
       if (this.tags && !this.isTree) {
-        props.mode = 'tags';
+        props.mode = "tags";
       }
       // 搜索对应显示值
       props.showSearch = true;
@@ -1071,16 +1086,16 @@ var HrConstantCode = {
           }
           return nodeData;
         });
-        props.treeNodeFilterProp = 'label';
+        props.treeNodeFilterProp = "label";
         props.dropdownStyle = props.dropdownStyle || {
-          maxHeight: '400px',
-          overflow: 'auto'
+          maxHeight: "400px",
+          overflow: "auto"
         };
         if (this.isAsync) {
           props.loadData = this.onLoadData;
         }
       } else {
-        props.optionFilterProp = 'children';
+        props.optionFilterProp = "children";
       }
       if (this.readOnly) {
         props.disabled = true;
@@ -1095,7 +1110,7 @@ var HrConstantCode = {
         filterCode = this.filterCode;
       return new Promise(function (resolve) {
         var _id = treeNode.dataRef._id;
-        _this3.$axios.get("/platform/code/getSubCodeSelectorDataDTO.search?typeCode=".concat(code, "&filterCode=").concat(filterCode, "&parentId=").concat(_id)).then(function (res) {
+        _this3.$axios.post("/platform/code/getSubCodeSelectorDataDTO.search?typeCode=".concat(code, "&filterCode=").concat(filterCode, "&parentId=").concat(_id)).then(function (res) {
           _this3.dataset = _this3.dataset.concat(res.codeList || []);
           resolve();
         });
@@ -1104,7 +1119,7 @@ var HrConstantCode = {
     getDataset: function getDataset() {
       var code = this.code,
         filterCode = this.filterCode;
-      this.$store.dispatch('setConstCode', {
+      this.$store.dispatch("setConstCode", {
         code: code,
         filterCode: filterCode
       });
@@ -1115,7 +1130,7 @@ var HrConstantCode = {
       }
       var val = args[0],
         others = args.slice(1);
-      var val_key = this.isTree ? 'value' : 'key';
+      var val_key = this.isTree ? "value" : "key";
       if (_.isArray(val)) {
         val = val.map(function (item) {
           return {
@@ -1131,11 +1146,15 @@ var HrConstantCode = {
       } else if (val === undefined) {
         val = null;
       }
-      this.$emit.apply(this, ['change', val].concat(_toConsumableArray(others)));
+      this.$emit.apply(this, ["change", val].concat(_toConsumableArray(others)));
+    },
+    onSearch: function onSearch(value) {
+      console.log("value==", value);
+      this.throttleGetDataset(value);
     },
     updateDataset: function updateDataset() {
       this.dataset = this.codeData.codeList || [];
-      this.$emit('datasetChange', this.dataset);
+      this.$emit("datasetChange", this.dataset);
     },
     setDataset: function setDataset() {
       var dataset = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -1159,8 +1178,8 @@ var HrConstantCode = {
       } else {
         var name = item.name,
           parentCode = item.parentCode;
-        var separator = this.finalTreeSeparator === true ? ' ' : this.finalTreeSeparator;
-        while (parentCode !== '-1') {
+        var separator = this.finalTreeSeparator === true ? " " : this.finalTreeSeparator;
+        while (parentCode !== "-1") {
           var parentItem = this.dataset.find(function (item) {
             return item.code === parentCode;
           });
@@ -1168,7 +1187,7 @@ var HrConstantCode = {
             name = "".concat(parentItem.name).concat(separator).concat(name);
             parentCode = parentItem.parentCode;
           } else {
-            parentCode = '-1';
+            parentCode = "-1";
           }
         }
         this.labelMapping[item.id] = name;
@@ -1193,11 +1212,11 @@ var HrConstantCode = {
         change: this.onChange
       }))
     }, [dataset.map(function (item) {
-      if (_this5.type === 'LIST' && item.typeCode && (item.typeCode.includes('LabelColor') || item.typeCode.includes('OrgColor'))) {
+      if (_this5.type === "LIST" && item.typeCode && (item.typeCode.includes("LabelColor") || item.typeCode.includes("OrgColor"))) {
         var colorBlock = {
-          width: '16px',
-          height: '16px',
-          margin: '7px',
+          width: "16px",
+          height: "16px",
+          margin: "7px",
           backgroundColor: item.value
         };
         return h(antDesignVue.Select.Option, {
@@ -1220,12 +1239,13 @@ var HrConstantCode = {
         }, [item.name]);
       }
     })]);
-    if (type === 'TREE') {
+    if (type === "TREE") {
       Node = h(antDesignVue.TreeSelect, {
         props: options,
         "class": cls,
         on: _objectSpread$2({}, _objectSpread$2(_objectSpread$2({}, this.$listeners), {}, {
-          change: this.onChange
+          change: this.onChange,
+          search: this.onSearch
         }))
       });
     }
@@ -7902,8 +7922,9 @@ var index = {
     //是否显示筛选
     autoLoad: true,
     //自动加载数据
+    // action: { fixed: false, width: 100 }, //操作列宽度和锁定
     action: {
-      fixed: false,
+      fixed: 'right',
       width: 100
     },
     //操作列宽度和锁定
@@ -8212,6 +8233,7 @@ var index = {
       var lockLen = columnList.filter(function (o) {
         return o.checked != false && o.lock;
       }).length;
+      if (action.fixed) lockLen++;
       if (lockLen > 0) {
         var paddingWidth = dataSource.length > 0 ? 17 : 0;
         var columns = columnList.filter(function (o) {
@@ -8237,7 +8259,7 @@ var index = {
           }
         }
         var tableWidth = this.$refs.tableBase ? this.$refs.tableBase.$el.clientWidth : 0;
-        var resultWidth = selectionWidth + width + actionWidth;
+        var resultWidth = selectionWidth + width + actionWidth + widthLessColumns.length * 100;
         result = resultWidth > tableWidth ? resultWidth : null;
       }
       this.setState({