hrsass-components 2.3.4 → 2.3.5

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.5";
 
 /**
  * 版本号
@@ -8235,9 +8235,9 @@ var index = {
           });
         }) ? _selectedUpdateRows : this.selectedUpdateRows.concat(_selectedUpdateRows);
         if (this.keepSelected) {
-          var notInCurrentPageRows = rows.filter(function (item) {
+          var notInCurrentPageRows = this.selectedRowsList.filter(function (item) {
             return !_this2.selectedUpdateRows.some(function (selectedItem) {
-              return selectedItem.id === item.id || selectedItem.t_0_hid === item.t_0_hid;
+              return item.id === selectedItem.id;
             });
           });
           this.selectedUpdateRows = this.selectedUpdateRows.concat(notInCurrentPageRows);
@@ -8424,6 +8424,8 @@ var index = {
         conditionList: [].concat(_toConsumableArray(fitlerOtehrConditionListDeepClone), _toConsumableArray(fitlerConditionListDeepClone))
       }).then(function (res) {
         var _this6$selectedRowsLi, _this6$selectedRowsLi2;
+        //res.dataList根据rowKey去重
+        res.dataList = _.uniqBy(res.dataList, _this6.rowKey || 'id');
         //外部处理数据
         if (lodash.isFunction(normalizeData)) {
           res = normalizeData(res);
@@ -8441,7 +8443,7 @@ var index = {
           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;
+                return item.id === selectedItem.id;
               });
             });
             _this6.selectedUpdateRows = _this6.selectedUpdateRows.concat(notInCurrentPageRows);