@kdcloudjs/table 1.2.0 → 1.2.1-canary.1

package/es/table/base/helpers/getRichVisibleRectsStream.js

@@ -164,7 +164,8 @@ function getScrollParent(elem) {
 
 
 export function getRichVisibleRectsStream(target, structureMayChange$, virtualDebugLabel) {
-  return structureMayChange$.pipe(op.startWith('init'), op.map(function () {
+  return structureMayChange$.pipe(op.mapTo(target), op.distinctUntilChanged(shallowEqual), // 当target没有发生变化时，无需重新查找
+  op.startWith('init'), op.map(function () {
     // target 的第一个滚动父元素，我们认为这就是虚拟滚动发生的地方
     // 即虚拟滚动不考虑「更上层元素发生滚动」的情况
     // 直接从父元素开始查找，防止自身设置overflow属性导致是同一个元素

package/es/table/pipeline/features/multiSelect.js

@@ -7,6 +7,9 @@ import React from 'react';
 import { internals } from '../../internals';
 import { always, arrayUtils } from '../../utils/others';
 import { collectNodes, mergeCellProps, MULTI_SELECT_MARK_PROPNAME } from '../../utils';
+var fullRowsSetKey = 'fullRowsSetKey';
+var allEnableKeys = 'allEnableKeys';
+var selectValueSetKey = 'selectValueSetKey';
 export function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
@@ -37,10 +40,9 @@ export function multiSelect() {
         action: action
       });
     };
-
-    var dataSource = pipeline.getDataSource();
     /** dataSource 中包含的所有 keys */
 
+
     var fullKeySet = new _Set();
     /** 所有有效的 keys（disable 状态为 false） */
 
@@ -49,7 +51,7 @@ export function multiSelect() {
     var isAllChecked = set.size !== 0; // 当前不存在选中则默认为false
 
     var isAnyChecked = false;
-    var flatDataSource = collectNodes(dataSource);
+    var flatDataSource = collectNodes(pipeline.getDataSource());
     flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
       fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
@@ -77,6 +79,8 @@ export function multiSelect() {
         checked: isAllChecked,
         indeterminate: !isAllChecked && isAnyChecked,
         onChange: function onChange(_) {
+          var allKeys = pipeline.getFeatureOptions(allEnableKeys);
+
           if (isAllChecked) {
             _onChange(arrayUtils.diff(value, allKeys), '', allKeys, 'uncheck-all');
           } else {
@@ -97,9 +101,11 @@ export function multiSelect() {
           var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
           var checkboxCellProps = {};
           var preCellProps = (_b = (_a = opts.checkboxColumn) === null || _a === void 0 ? void 0 : _a.getCellProps) === null || _b === void 0 ? void 0 : _b.call(_a, value, row, rowIndex);
+          var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _Set();
+          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _Set();
 
-          if (fullKeySet.has(rowKey) && clickArea === 'cell') {
-            var prevChecked = set.has(rowKey);
+          if (fullRowsSet.has(rowKey) && clickArea === 'cell') {
+            var prevChecked = selectValueSet.has(rowKey);
             var disabled = isDisabled(row, rowIndex);
             checkboxCellProps = {
               style: {
@@ -123,7 +129,8 @@ export function multiSelect() {
           }
 
           var key = internals.safeGetRowKey(primaryKey, row, rowIndex);
-          var checked = set.has(key);
+          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _Set();
+          var checked = selectValueSet.has(key);
           return /*#__PURE__*/React.createElement(Checkbox, {
             checked: checked,
             disabled: isDisabled(row, rowIndex),
@@ -163,8 +170,9 @@ export function multiSelect() {
 
     pipeline.appendRowPropsGetter(function (row, rowIndex) {
       var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
+      var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _Set();
 
-      if (!fullKeySet.has(rowKey)) {
+      if (!fullRowsSet.has(rowKey)) {
         // rowKey 不在 fullKeySet 中说明这一行是在 multiSelect 之后才生成的，multiSelect 不对之后生成的行进行处理
         return;
       }
@@ -172,7 +180,8 @@ export function multiSelect() {
       var style = {};
       var className;
       var onClick;
-      var checked = set.has(rowKey);
+      var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _Set();
+      var checked = selectValueSet.has(rowKey);
 
       if (opts.highlightRowWhenSelected && checked) {
         className = 'highlight';
@@ -199,22 +208,32 @@ export function multiSelect() {
         style: style,
         onClick: onClick
       };
-    });
+    }); // 只保留一份到pipeline， 避免行数据过多时内容被握住
+
+    pipeline.setFeatureOptions(fullRowsSetKey, fullKeySet);
+    pipeline.setFeatureOptions(allEnableKeys, allKeys);
+    pipeline.setFeatureOptions(selectValueSetKey, set);
+    fullKeySet = null;
+    allKeys = null;
+    set = null;
     return pipeline;
 
     function onCheckboxChange(prevChecked, key, batch) {
       var batchKeys = [key];
 
       if (batch && lastKey) {
-        var lastIdx = allKeys.indexOf(lastKey);
-        var cntIdx = allKeys.indexOf(key);
+        var _allKeys = pipeline.getFeatureOptions(allEnableKeys);
+
+        var lastIdx = _allKeys.indexOf(lastKey);
+
+        var cntIdx = _allKeys.indexOf(key);
 
         var _ref = lastIdx < cntIdx ? [lastIdx, cntIdx] : [cntIdx, lastIdx],
             _ref2 = _slicedToArray(_ref, 2),
             start = _ref2[0],
             end = _ref2[1];
 
-        batchKeys = _sliceInstanceProperty(allKeys).call(allKeys, start, end + 1);
+        batchKeys = _sliceInstanceProperty(_allKeys).call(_allKeys, start, end + 1);
       }
 
       if (prevChecked) {

package/es/table/pipeline/features/treeMode.js

@@ -75,7 +75,7 @@ export function treeMode() {
         return pipeline.getFeatureOptions('lastTreeMode');
       }
 
-      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey) || openKeys);
+      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey));
       var result = [];
       dfs(input, 0);
 

package/lib/table/base/helpers/getRichVisibleRectsStream.js

@@ -194,7 +194,8 @@ function getScrollParent(elem) {
 
 
 function getRichVisibleRectsStream(target, structureMayChange$, virtualDebugLabel) {
-  return structureMayChange$.pipe(op.startWith('init'), op.map(function () {
+  return structureMayChange$.pipe(op.mapTo(target), op.distinctUntilChanged(_utils.shallowEqual), // 当target没有发生变化时，无需重新查找
+  op.startWith('init'), op.map(function () {
     // target 的第一个滚动父元素，我们认为这就是虚拟滚动发生的地方
     // 即虚拟滚动不考虑「更上层元素发生滚动」的情况
     // 直接从父元素开始查找，防止自身设置overflow属性导致是同一个元素

package/lib/table/pipeline/features/multiSelect.js

@@ -25,6 +25,10 @@ var _others = require("../../utils/others");
 
 var _utils = require("../../utils");
 
+var fullRowsSetKey = 'fullRowsSetKey';
+var allEnableKeys = 'allEnableKeys';
+var selectValueSetKey = 'selectValueSetKey';
+
 function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
@@ -55,10 +59,9 @@ function multiSelect() {
         action: action
       });
     };
-
-    var dataSource = pipeline.getDataSource();
     /** dataSource 中包含的所有 keys */
 
+
     var fullKeySet = new _set.default();
     /** 所有有效的 keys（disable 状态为 false） */
 
@@ -67,7 +70,7 @@ function multiSelect() {
     var isAllChecked = set.size !== 0; // 当前不存在选中则默认为false
 
     var isAnyChecked = false;
-    var flatDataSource = (0, _utils.collectNodes)(dataSource);
+    var flatDataSource = (0, _utils.collectNodes)(pipeline.getDataSource());
     flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
@@ -96,6 +99,8 @@ function multiSelect() {
         checked: isAllChecked,
         indeterminate: !isAllChecked && isAnyChecked,
         onChange: function onChange(_) {
+          var allKeys = pipeline.getFeatureOptions(allEnableKeys);
+
           if (isAllChecked) {
             _onChange(_others.arrayUtils.diff(value, allKeys), '', allKeys, 'uncheck-all');
           } else {
@@ -117,9 +122,11 @@ function multiSelect() {
 
           var checkboxCellProps = {};
           var preCellProps = (_b = (_a = opts.checkboxColumn) === null || _a === void 0 ? void 0 : _a.getCellProps) === null || _b === void 0 ? void 0 : _b.call(_a, value, row, rowIndex);
+          var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _set.default();
+          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
 
-          if (fullKeySet.has(rowKey) && clickArea === 'cell') {
-            var prevChecked = set.has(rowKey);
+          if (fullRowsSet.has(rowKey) && clickArea === 'cell') {
+            var prevChecked = selectValueSet.has(rowKey);
             var disabled = isDisabled(row, rowIndex);
             checkboxCellProps = {
               style: {
@@ -144,7 +151,8 @@ function multiSelect() {
 
           var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-          var checked = set.has(key);
+          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
+          var checked = selectValueSet.has(key);
           return /*#__PURE__*/_react.default.createElement(Checkbox, {
             checked: checked,
             disabled: isDisabled(row, rowIndex),
@@ -183,7 +191,9 @@ function multiSelect() {
     pipeline.appendRowPropsGetter(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-      if (!fullKeySet.has(rowKey)) {
+      var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _set.default();
+
+      if (!fullRowsSet.has(rowKey)) {
         // rowKey 不在 fullKeySet 中说明这一行是在 multiSelect 之后才生成的，multiSelect 不对之后生成的行进行处理
         return;
       }
@@ -191,7 +201,8 @@ function multiSelect() {
       var style = {};
       var className;
       var onClick;
-      var checked = set.has(rowKey);
+      var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
+      var checked = selectValueSet.has(rowKey);
 
       if (opts.highlightRowWhenSelected && checked) {
         className = 'highlight';
@@ -218,22 +229,32 @@ function multiSelect() {
         style: style,
         onClick: onClick
       };
-    });
+    }); // 只保留一份到pipeline， 避免行数据过多时内容被握住
+
+    pipeline.setFeatureOptions(fullRowsSetKey, fullKeySet);
+    pipeline.setFeatureOptions(allEnableKeys, allKeys);
+    pipeline.setFeatureOptions(selectValueSetKey, set);
+    fullKeySet = null;
+    allKeys = null;
+    set = null;
     return pipeline;
 
     function onCheckboxChange(prevChecked, key, batch) {
       var batchKeys = [key];
 
       if (batch && lastKey) {
-        var lastIdx = allKeys.indexOf(lastKey);
-        var cntIdx = allKeys.indexOf(key);
+        var _allKeys = pipeline.getFeatureOptions(allEnableKeys);
+
+        var lastIdx = _allKeys.indexOf(lastKey);
+
+        var cntIdx = _allKeys.indexOf(key);
 
         var _ref = lastIdx < cntIdx ? [lastIdx, cntIdx] : [cntIdx, lastIdx],
             _ref2 = (0, _slicedToArray2.default)(_ref, 2),
             start = _ref2[0],
             end = _ref2[1];
 
-        batchKeys = (0, _slice.default)(allKeys).call(allKeys, start, end + 1);
+        batchKeys = (0, _slice.default)(_allKeys).call(_allKeys, start, end + 1);
       }
 
       if (prevChecked) {

package/lib/table/pipeline/features/treeMode.js

@@ -105,7 +105,7 @@ function treeMode() {
         return pipeline.getFeatureOptions('lastTreeMode');
       }
 
-      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey) || openKeys);
+      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey));
       var result = [];
       dfs(input, 0);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.2.0",
+  "version": "1.2.1-canary.1",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [
@@ -54,8 +54,8 @@
     "test:update": "jest --config .jest.js --cache=false -u",
     "test:ci": "jest --config .jest.js  --coverage --ci --update-snapshot",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --skip-unstable",
-    "pub": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
-    "pub:beta": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=beta",
+    "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
+    "pub:canary": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canary",
     "new": "node scripts/create-component.js",
     "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
   },