hrsass-components 2.3.4 → 2.3.6

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.4";
+var version = "2.3.6";
 
 /**
  * 版本号
@@ -8217,31 +8217,13 @@ var index = {
     //根据回填传的rowIds，过滤选中的行
     selectedRowsList: {
       handler: function handler(rows) {
-        var _this2 = this;
         var rowIds = rows.map(function (item) {
           return _typeof(item) === 'object' ? item.id || item.t_0_hid : item;
         });
-        var _selectedUpdateRows = this.dataSource.filter(function (item) {
-          return rowIds.includes(item.t_0_hid) || rowIds.map(function (id) {
-            return id + '';
-          }).includes(item.id + '');
-        });
+        this.selectedUpdateRows = rows;
         if (rowIds.length === 0) {
           this.selectedUpdateRows = [];
         }
-        this.selectedUpdateRows = _selectedUpdateRows.some(function (item) {
-          return _this2.selectedUpdateRows.find(function (selectedItem) {
-            return selectedItem.id === item.id || selectedItem.t_0_hid === item.t_0_hid;
-          });
-        }) ? _selectedUpdateRows : this.selectedUpdateRows.concat(_selectedUpdateRows);
-        if (this.keepSelected) {
-          var notInCurrentPageRows = rows.filter(function (item) {
-            return !_this2.selectedUpdateRows.some(function (selectedItem) {
-              return selectedItem.id === item.id || selectedItem.t_0_hid === item.t_0_hid;
-            });
-          });
-          this.selectedUpdateRows = this.selectedUpdateRows.concat(notInCurrentPageRows);
-        }
       },
       immediate: true
     }
@@ -8271,7 +8253,7 @@ var index = {
   methods: {
     //方案列表
     _getSchemeList: function _getSchemeList(id) {
-      var _this3 = this;
+      var _this2 = this;
       var _getOptionProps2 = getOptionProps(this),
         code = _getOptionProps2.code;
       this.setState({
@@ -8279,19 +8261,19 @@ var index = {
       });
       if (code) {
         this.$axios.get("/platform/userself/condition/getUserScreeningSchemeList.search?gridCode=".concat(code)).then(function (res) {
-          _this3.schemeList = res || [];
+          _this2.schemeList = res || [];
           //当前已选中修改的方案，则查看是否在列表中
           //在方案列表中，说明是修改，需更新当前条件
           //不在方案列表中，则为删除，清空条件
-          if (id && id === _this3.selectedSchemeId) {
-            var _selectedScheme = _this3.schemeList.find(function (item) {
+          if (id && id === _this2.selectedSchemeId) {
+            var _selectedScheme = _this2.schemeList.find(function (item) {
               return item.id === id;
             });
-            _this3.conditionListByScheme = [];
-            _this3.schemeSearchHandler(_selectedScheme);
+            _this2.conditionListByScheme = [];
+            _this2.schemeSearchHandler(_selectedScheme);
           }
         })["finally"](function () {
-          _this3.setState({
+          _this2.setState({
             loading: false
           });
         });
@@ -8299,18 +8281,18 @@ var index = {
     },
     //包装请求函数
     _getWrapAjax: function _getWrapAjax() {
-      var _this4 = this;
+      var _this3 = this;
       var _getOptionProps3 = getOptionProps(this),
         code = _getOptionProps3.code;
       if (code && !this.ajax) {
         var url = "platform/metadata/executeGridSearch.search?code=".concat(code);
         this.ajax = warpFun(function (data) {
-          return _this4.$axios.post(url, data);
+          return _this3.$axios.post(url, data);
         });
       }
     },
     _getConfig: function _getConfig() {
-      var _this5 = this;
+      var _this4 = this;
       var _getOptionProps4 = getOptionProps(this),
         code = _getOptionProps4.code,
         _getOptionProps4$quer = _getOptionProps4.queryData,
@@ -8326,13 +8308,13 @@ var index = {
           if (lodash.isFunction(normalizeConfig)) {
             res = normalizeConfig(res);
           }
-          _this5.configState = stateMap.loaded;
+          _this4.configState = stateMap.loaded;
           var conditions = res.conditions || [];
           var _query = queryData;
-          if (_this5.stack.length > 0) {
-            _query = _this5.stack[_this5.stack.length - 1];
-            _this5.stack.length = 0;
-            _this5.data = _query;
+          if (_this4.stack.length > 0) {
+            _query = _this4.stack[_this4.stack.length - 1];
+            _this4.stack.length = 0;
+            _this4.data = _query;
           }
           Object.keys(_query || {}).map(function (key) {
             var condition = conditions.find(function (item) {
@@ -8353,14 +8335,14 @@ var index = {
           columns = columns.map(function (item) {
             return item;
           });
-          _this5.setState({
+          _this4.setState({
             columnList: columns,
             conditionList: conditions
           }, function () {
-            if (_this5.autoLoad) {
-              _this5._getData();
+            if (_this4.autoLoad) {
+              _this4._getData();
             } else {
-              _this5.setState({
+              _this4.setState({
                 loading: false
               });
             }
@@ -8369,7 +8351,7 @@ var index = {
       }
     },
     _getData: function _getData() {
-      var _this6 = this;
+      var _this5 = this;
       var pagination = this.pagination,
         conditionList = this.conditionList,
         sorter = this.sorter,
@@ -8423,46 +8405,48 @@ var index = {
         sortList: sort,
         conditionList: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone))
       }).then(function (res) {
-        var _this6$selectedRowsLi, _this6$selectedRowsLi2;
+        var _this5$selectedRowsLi, _this5$selectedRowsLi2;
+        //res.dataList根据rowKey去重
+        res.dataList = _.uniqBy(res.dataList, _this5.rowKey || 'id');
         //外部处理数据
         if (lodash.isFunction(normalizeData)) {
           res = normalizeData(res);
         }
         //处理props传入的已选中
-        if ((_this6 === null || _this6 === void 0 || (_this6$selectedRowsLi = _this6.selectedRowsList) === null || _this6$selectedRowsLi === void 0 ? void 0 : _this6$selectedRowsLi.length) > 0) {
-          var selectedRowIds = _this6.selectedRowsList.map(function (item) {
+        if ((_this5 === null || _this5 === void 0 || (_this5$selectedRowsLi = _this5.selectedRowsList) === null || _this5$selectedRowsLi === void 0 ? void 0 : _this5$selectedRowsLi.length) > 0) {
+          var selectedRowIds = _this5.selectedRowsList.map(function (item) {
             return _typeof(item) === 'object' ? item.id || item.t_0_hid : item;
           });
-          _this6.selectedUpdateRows = res.dataList.filter(function (item) {
+          _this5.selectedUpdateRows = res.dataList.filter(function (item) {
             return selectedRowIds.includes(item.t_0_hid) || (selectedRowIds || []).map(function (id) {
               return id + '';
             }).includes(item.id + '');
           });
-          if (_this6.keepSelected) {
-            var notInCurrentPageRows = _this6.selectedRowsList.filter(function (item) {
-              return !_this6.selectedUpdateRows.some(function (selectedItem) {
-                return selectedItem.id === item.id || selectedItem.t_0_hid === item.t_0_hid;
+          if (_this5.keepSelected) {
+            var notInCurrentPageRows = _this5.selectedRowsList.filter(function (item) {
+              return !_this5.selectedUpdateRows.some(function (selectedItem) {
+                return item.id === selectedItem.id;
               });
             });
-            _this6.selectedUpdateRows = _this6.selectedUpdateRows.concat(notInCurrentPageRows);
+            _this5.selectedUpdateRows = _this5.selectedUpdateRows.concat(notInCurrentPageRows);
           }
         }
-        if ((_this6 === null || _this6 === void 0 || (_this6$selectedRowsLi2 = _this6.selectedRowsList) === null || _this6$selectedRowsLi2 === void 0 ? void 0 : _this6$selectedRowsLi2.length) == 0) {
-          _this6.clearSelectedRows();
+        if ((_this5 === null || _this5 === void 0 || (_this5$selectedRowsLi2 = _this5.selectedRowsList) === null || _this5$selectedRowsLi2 === void 0 ? void 0 : _this5$selectedRowsLi2.length) == 0) {
+          _this5.clearSelectedRows();
         }
-        _this6.setState({
+        _this5.setState({
           pagination: _objectSpread$d(_objectSpread$d({}, pagination), {}, {
             total: res.total
           }),
           dataSource: res.dataList,
           loading: false
         });
-        _this6.$emit("load");
+        _this5.$emit("load");
       });
     },
     //分页、排序
     _handleTableChange: function _handleTableChange(pager, filters) {
-      var _this7 = this;
+      var _this6 = this;
       var sort = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var pagination = this.pagination;
       this.setState({
@@ -8476,7 +8460,7 @@ var index = {
           field: sort.field
         }
       }, function () {
-        _this7._getData();
+        _this6._getData();
       });
     },
     /**
@@ -8563,10 +8547,10 @@ var index = {
         new Vue({
           el: div,
           mounted: function mounted() {
-            var _this8 = this;
+            var _this7 = this;
             setTimeout(function () {
-              _this8.$destroy();
-              _this8.$el.parentNode.removeChild(_this8.$el);
+              _this7.$destroy();
+              _this7.$el.parentNode.removeChild(_this7.$el);
             }, (duration + 0.5) * 1000);
           },
           render: function render() {
@@ -8595,19 +8579,19 @@ var index = {
      * 刷新表格
      */
     refresh: function refresh() {
-      var _this9 = this;
+      var _this8 = this;
       var pagination = this.pagination;
       pagination.current = 1;
       this.setState({
         pagination: pagination
       }, function () {
-        _this9._getData();
+        _this8._getData();
       });
     },
     getSchemeConditionList: function getSchemeConditionList(id) {
-      var _this10 = this;
+      var _this9 = this;
       return new Promise(function (resolve, reject) {
-        _this10.$axios.get("/platform/userself/condition/getUserScreeningScheme.search?id=".concat(id)).then(function (res) {
+        _this9.$axios.get("/platform/userself/condition/getUserScreeningScheme.search?id=".concat(id)).then(function (res) {
           var list = [];
           (res && res.userScreeningConditionVOList || []).map(function (item) {
             if (item.conditionList) {
@@ -8627,20 +8611,20 @@ var index = {
     },
     //选择方案搜索
     schemeSearchHandler: function schemeSearchHandler(scheme) {
-      var _this11 = this;
+      var _this10 = this;
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var list;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _this11.loading = true;
-              _this11.tempConditionListByScheme = [];
-              _this11.selectedSchemeId = scheme && scheme.id;
+              _this10.loading = true;
+              _this10.tempConditionListByScheme = [];
+              _this10.selectedSchemeId = scheme && scheme.id;
               if (scheme) {
                 _context.next = 7;
                 break;
               }
-              _this11.conditionListByScheme = [];
+              _this10.conditionListByScheme = [];
               _context.next = 16;
               break;
             case 7:
@@ -8648,18 +8632,18 @@ var index = {
                 _context.next = 11;
                 break;
               }
-              _this11.conditionListByScheme = scheme.$$conditionList;
+              _this10.conditionListByScheme = scheme.$$conditionList;
               _context.next = 16;
               break;
             case 11:
               _context.next = 13;
-              return _this11.getSchemeConditionList(scheme.id);
+              return _this10.getSchemeConditionList(scheme.id);
             case 13:
               list = _context.sent;
-              _this11.setSchemeConditionList(scheme.id, list);
-              _this11.conditionListByScheme = list;
+              _this10.setSchemeConditionList(scheme.id, list);
+              _this10.conditionListByScheme = list;
             case 16:
-              _this11.searchHandler();
+              _this10.searchHandler();
             case 17:
             case "end":
               return _context.stop();
@@ -8669,7 +8653,7 @@ var index = {
     },
     //搜索
     searchHandler: function searchHandler() {
-      var _this12 = this;
+      var _this11 = this;
       var pagination = this.pagination;
       if (this.$listeners.search) {
         this.setState({
@@ -8677,9 +8661,9 @@ var index = {
             current: 1
           })
         }, function () {
-          _this12.$emit("search", function () {
-            _this12._getData();
-          }, _this12);
+          _this11.$emit("search", function () {
+            _this11._getData();
+          }, _this11);
         });
       } else {
         this.setState({
@@ -8687,7 +8671,7 @@ var index = {
             current: 1
           })
         }, function () {
-          _this12._getData();
+          _this11._getData();
         });
       }
     },
@@ -8696,7 +8680,7 @@ var index = {
     }
   },
   render: function render() {
-    var _this13 = this;
+    var _this12 = this;
     var h = arguments[0];
     var $scopedSlots = this.$scopedSlots,
       loading = this.loading,
@@ -8754,42 +8738,42 @@ var index = {
       scopedSlots: $scopedSlots,
       on: {
         "change": function change(pagination, filters, sorter) {
-          _this13._handleTableChange(pagination, filters, sorter);
+          _this12._handleTableChange(pagination, filters, sorter);
         },
         "download": function download(columns, e) {
-          _this13._downloadHandler(columns, e);
+          _this12._downloadHandler(columns, e);
         },
         "rowSelected": function rowSelected(rows) {
-          _this13.$emit("rowSelected", rows);
+          _this12.$emit("rowSelected", rows);
         },
         "schemeChange": function schemeChange(id) {
-          _this13.editSchemeId = null;
+          _this12.editSchemeId = null;
           if (id) {
-            _this13._getSchemeList(id);
+            _this12._getSchemeList(id);
           } else {
             // this.selectedSchemeId = null;
-            _this13._getSchemeList();
+            _this12._getSchemeList();
           }
         },
         "tempSearch": function tempSearch(tempConditionList, schemeId) {
-          _this13.tempConditionListByScheme = tempConditionList;
-          _this13.editSchemeId = schemeId;
-          _this13.searchHandler();
+          _this12.tempConditionListByScheme = tempConditionList;
+          _this12.editSchemeId = schemeId;
+          _this12.searchHandler();
         },
         "schemeSearch": function schemeSearch(scheme) {
-          _this13.editSchemeId = null;
-          _this13.schemeSearchHandler(scheme);
+          _this12.editSchemeId = null;
+          _this12.schemeSearchHandler(scheme);
         },
         "search": function search() {
-          _this13.tempConditionListByScheme = [];
-          _this13.editSchemeId = null;
-          _this13.searchHandler();
+          _this12.tempConditionListByScheme = [];
+          _this12.editSchemeId = null;
+          _this12.searchHandler();
         },
         "cellClick": function cellClick(column, record) {
-          _this13.$emit("cellClick", column, record);
+          _this12.$emit("cellClick", column, record);
         },
         "settingChange": function settingChange(cols) {
-          _this13.setState({
+          _this12.setState({
             columnList: columnList.map(function (c) {
               var column = cols.find(function (o) {
                 return o.columnName === c.columnName;
@@ -8799,7 +8783,7 @@ var index = {
               });
             })
           }, function () {
-            _this13._setMaxWidth();
+            _this12._setMaxWidth();
           });
         }
       }