hrsass-components 2.3.3 → 2.3.5

package/lib/hrsass-components.js

@@ -46,13 +46,13 @@ function _interopNamespace(e) {
 var _asyncToGenerator = _interopDefault(require('@babel/runtime/helpers/asyncToGenerator'));
 var _toConsumableArray = _interopDefault(require('@babel/runtime/helpers/toConsumableArray'));
 var _defineProperty = _interopDefault(require('@babel/runtime/helpers/defineProperty'));
+var _typeof = _interopDefault(require('@babel/runtime/helpers/typeof'));
 var _regeneratorRuntime = _interopDefault(require('@babel/runtime/regenerator'));
 var Vue = _interopDefault(require('vue'));
 var classNames = _interopDefault(require('classnames'));
 var _objectWithoutProperties = _interopDefault(require('@babel/runtime/helpers/objectWithoutProperties'));
 var antDesignVue = require('ant-design-vue');
 var lodash = require('lodash');
-var _typeof = _interopDefault(require('@babel/runtime/helpers/typeof'));
 var _slicedToArray = _interopDefault(require('@babel/runtime/helpers/slicedToArray'));
 var resizeDetector = require('resize-detector');
 var moment = require('moment');
@@ -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.3";
+var version = "2.3.5";
 
 /**
  * 版本号
@@ -4897,7 +4897,8 @@ var TableProps = {
   autoLoad: VuePropTypes.bool,
   normalizeConfig: VuePropTypes.func,
   normalizeData: VuePropTypes.func,
-  selectedRowsList: VuePropTypes.array
+  selectedRowsList: VuePropTypes.array,
+  keepSelected: VuePropTypes.bool
   // dataSource: PropTypes.array,
 };
 var FilterProps = {
@@ -8006,9 +8007,10 @@ var HrTableBase = {
         },
         on: {
           "reset": function reset() {
-            return [_this11.setState({
+            _this11.setState({
               selectedRows: []
-            })];
+            });
+            _this11.$emit("rowSelected", []);
           },
           "delete": function _delete(id) {
             var _selectedRows = Object.assign([], selectedRows);
@@ -8019,6 +8021,7 @@ var HrTableBase = {
             _this11.setState({
               selectedRows: _selectedRows
             });
+            _this11.$emit("rowSelected", _selectedRows);
           },
           "close": function close(v) {
             _this11.setState({
@@ -8131,7 +8134,8 @@ var index = {
     },
     normalizeData: function normalizeData(data) {
       return data;
-    }
+    },
+    keepSelected: false //是否保持跨页选中
   }),
   data: function data() {
     return {
@@ -8212,18 +8216,32 @@ var index = {
     },
     //根据回填传的rowIds，过滤选中的行
     selectedRowsList: {
-      handler: function handler(rowIds) {
+      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 + '');
         });
+        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;
           });
-        }) ? this.selectedUpdateRows : this.selectedUpdateRows.concat(_selectedUpdateRows);
+        }) ? _selectedUpdateRows : this.selectedUpdateRows.concat(_selectedUpdateRows);
+        if (this.keepSelected) {
+          var notInCurrentPageRows = this.selectedRowsList.filter(function (item) {
+            return !_this2.selectedUpdateRows.some(function (selectedItem) {
+              return item.id === selectedItem.id;
+            });
+          });
+          this.selectedUpdateRows = this.selectedUpdateRows.concat(notInCurrentPageRows);
+        }
       },
       immediate: true
     }
@@ -8405,18 +8423,34 @@ var index = {
         sortList: sort,
         conditionList: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone))
       }).then(function (res) {
-        var _this6$selectedRowsLi, _this6$selectedUpdate, _this6$dataSource;
+        var _this6$selectedRowsLi, _this6$selectedRowsLi2;
+        //res.dataList根据rowKey去重
+        res.dataList = _.uniqBy(res.dataList, _this6.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 && (_this6 === null || _this6 === void 0 || (_this6$selectedUpdate = _this6.selectedUpdateRows) === null || _this6$selectedUpdate === void 0 ? void 0 : _this6$selectedUpdate.length) == 0 && (_this6 === null || _this6 === void 0 || (_this6$dataSource = _this6.dataSource) === null || _this6$dataSource === void 0 ? void 0 : _this6$dataSource.length) == 0) {
+        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) {
+            return _typeof(item) === 'object' ? item.id || item.t_0_hid : item;
+          });
           _this6.selectedUpdateRows = res.dataList.filter(function (item) {
-            return _this6.selectedRowsList.includes(item.t_0_hid) || (_this6.selectedRowsList || []).map(function (id) {
+            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 item.id === selectedItem.id;
+              });
+            });
+            _this6.selectedUpdateRows = _this6.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();
         }
         _this6.setState({
           pagination: _objectSpread$d(_objectSpread$d({}, pagination), {}, {