@kdcloudjs/table 1.1.5-canary.9 → 1.1.5

package/es/table/base/styles.js

@@ -103,7 +103,7 @@ export var defaultCSSVariables = {
   '--row-height': '48px',
   '--color': '#333',
   '--bgcolor': 'white',
-  '--hover-bgcolor': 'var(--hover-color, #F2F6FF)',
+  '--hover-bgcolor': 'var(--hover-color, #f5f5f5)',
   '--highlight-bgcolor': '#eee',
   '--primary-color': '#5582F3',
   '--primary-color-level1': 'rgb(242, 248, 255)',

package/es/table/common-views.js

@@ -67,4 +67,4 @@ export var icons = {
   CaretRight: CaretRightIcon,
   Info: InfoIcon
 };
-export var ContextMenuStyleWrap = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  &.", "{\n    border: 1px solid #e9ecf1;\n    border-radius: 2px;\n    background-color: #Fff;\n    box-shadow: 0px 0px 5px 0px rgb(154 154 154 / 50%);\n    cursor: default;\n    font-size: 13px;\n    position:absolute;\n    z-index: 1050;\n    width:120px;\n  }\n\n  .", "{\n    width:100%;\n    display: table;\n  }\n\n  .", " .", "{\n    display: table-row;\n    color: #666666;\n  }\n\n  .", " .", "{\n    background-color: #f5f5f5;\n  }\n\n  .", " .", " .", "{\n    display: table-cell;\n    padding: 5px 8px;\n  }\n  .", " .", ".", "{\n    opacity: .5;\n  }\n\n"])), MenuClasses.menu, MenuClasses.menuList, MenuClasses.menuList, MenuClasses.menuOption, MenuClasses.menuList, MenuClasses.menuOptionActive, MenuClasses.menuList, MenuClasses.menuOption, MenuClasses.menuOptionText, MenuClasses.menuList, MenuClasses.menuOption, MenuClasses.menuOptionDisable);
+export var ContextMenuStyleWrap = styled.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  &.", "{\n    border: 1px solid #e9ecf1;\n    border-radius: 2px;\n    background-color: #Fff;\n    box-shadow: 0px 0px 5px 0px rgb(154 154 154 / 50%);\n    cursor: default;\n    font-size: 12px;\n    position:absolute;\n    z-index: 1050;\n    max-width: 600px;\n    padding: 8px 0;\n  }\n\n  .", "{\n    width:100%;\n    display: table;\n  }\n\n  .", " .", "{\n    display: table-row;\n    color: #212121;\n  }\n\n  .", " .", "{\n    background-color: var(--hover-bgcolor);\n  }\n\n  .", " .", " .", "{\n    display: table-cell;\n    padding: 8px 12px;\n    max-width: 576px;\n    overflow: hidden;\n    white-space: nowrap;\n    text-overflow: ellipsis;\n    line-height: 16px;\n  }\n  .", " .", ".", "{\n    opacity: .5;\n  }\n\n"])), MenuClasses.menu, MenuClasses.menuList, MenuClasses.menuList, MenuClasses.menuOption, MenuClasses.menuList, MenuClasses.menuOptionActive, MenuClasses.menuList, MenuClasses.menuOption, MenuClasses.menuOptionText, MenuClasses.menuList, MenuClasses.menuOption, MenuClasses.menuOptionDisable);

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

@@ -4,6 +4,7 @@ import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 import { getLeftNestedLockCount } from '../../base/calculations';
 import { isLeafNode, makeRecursiveMapper } from '../../utils';
 import { Classes } from '../../base/styles';
+import { COLUMN_RESIZE_KEY } from './columnResizeWidth';
 export var FILL_COLUMN_CODE = '$_fill_column_&';
 export var tableWidthKey = 'tableWidth';
 var fillColumnWidthKey = 'fillColumnWidth';
@@ -53,7 +54,7 @@ var setAutoFillWidth = function setAutoFillWidth(pipeline) {
         code = col.code;
 
     if (isLeafNode(col) && code !== FILL_COLUMN_CODE) {
-      var resizeColumn = pipeline.getStateAtKey('columnResize');
+      var resizeColumn = pipeline.getFeatureOptions(COLUMN_RESIZE_KEY);
       columnWidthSum += resizeColumn && resizeColumn[code] || width;
     }
 

package/es/table/pipeline/features/columnResizeWidth.d.ts

@@ -20,5 +20,6 @@ export interface ColumnResizeOptions {
     onChangeSize?(nextSize: ColumnSize): void;
     afterChangeSize?(nextSize: ColumnSize, changedColumnSize: ChangedColumnSize[]): void;
 }
+export declare const COLUMN_RESIZE_KEY = "columnResize";
 export declare function columnResize(opts?: ColumnResizeOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

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

@@ -23,17 +23,18 @@ function disableSelect(event) {
   event.preventDefault();
 }
 
+var stateKey = 'columnResize';
+export var COLUMN_RESIZE_KEY = 'columnResize';
 export function columnResize() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
   var _a, _b, _c;
 
-  var stateKey = 'columnResize';
   var minSize = (_a = opts.minSize) !== null && _a !== void 0 ? _a : 60;
   var fallbackSize = (_b = opts.fallbackSize) !== null && _b !== void 0 ? _b : 150;
   var maxSize = (_c = opts.maxSize) !== null && _c !== void 0 ? _c : 1000;
   return function columnResizeFeature(pipeline) {
-    var _a, _b, _c;
+    var _a, _b;
 
     var columnSize = (_b = (_a = opts.columnSize) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : {};
     var leafColumns = collectNodes(pipeline.getColumns(), 'leaf-only');
@@ -48,15 +49,10 @@ export function columnResize() {
           columnSize[code] = fallbackSize;
         }
       }
-    }); // 初始化 || opts.columnSize发生变化（为了autofill时能取到最新值）
+    }); // 为了autofill时能取到最新值，实时存储一份最新的columnSize
+    // 存在state里可能存到取不到最新的
 
-    if (!pipeline.getStateAtKey(stateKey) || ((_c = pipeline.ref) === null || _c === void 0 ? void 0 : _c.current.lastOptColumnSize) !== opts.columnSize) {
-      pipeline.setStateAtKey(stateKey, columnSize);
-    }
-
-    if (pipeline.ref) {
-      pipeline.ref.current.lastOptColumnSize = opts.columnSize;
-    }
+    pipeline.setFeatureOptions(COLUMN_RESIZE_KEY, columnSize);
 
     var onChangeSize = function onChangeSize(nextColumnSize) {
       window.requestAnimationFrame(function () {
@@ -64,12 +60,6 @@ export function columnResize() {
 
         pipeline.setStateAtKey(stateKey, nextColumnSize);
         (_a = opts === null || opts === void 0 ? void 0 : opts.onChangeSize) === null || _a === void 0 ? void 0 : _a.call(opts, nextColumnSize);
-
-        if (opts.columnSize) {
-          if (pipeline.ref) {
-            pipeline.ref.current.lastOptColumnSize = nextColumnSize; // 这里记录由列宽拖拽导致的opts.columnSize变化,避免重复渲染
-          }
-        }
       });
     };
 

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

@@ -44,28 +44,34 @@ export function multiSelect() {
     /** 所有有效的 keys（disable 状态为 false） */
 
     var allKeys = [];
+    var set = new _Set(value);
+    var isAllChecked = set.size !== 0; // 当前不存在选中则默认为false
+
+    var isAnyChecked = false;
     var flatDataSource = collectNodes(dataSource);
     flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
       fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
 
       if (!isDisabled(row, rowIndex)) {
-        allKeys.push(rowKey);
+        allKeys.push(rowKey); // 存在一个非选中，则不再进行判断
+
+        if (isAllChecked) {
+          isAllChecked = set.has(rowKey);
+        } // 存在一个选中，则不再进行判断
+
+
+        if (!isAnyChecked) {
+          isAnyChecked = set.has(rowKey);
+        }
       }
-    });
-    var set = new _Set(value); // todo: 暂使用hidden隐藏选择列 后续增加配置
+    }); // todo: 暂使用hidden隐藏选择列 后续增加配置
 
     var hiddenSelectColumn = opts.checkboxColumn && opts.checkboxColumn.hidden === true;
 
     if (!hiddenSelectColumn) {
       var _context;
 
-      var isAllChecked = allKeys.length > 0 && allKeys.every(function (key) {
-        return set.has(key);
-      });
-      var isAnyChecked = allKeys.some(function (key) {
-        return set.has(key);
-      });
       var defaultCheckboxColumnTitle = /*#__PURE__*/React.createElement(Checkbox, {
         checked: isAllChecked,
         indeterminate: !isAllChecked && isAnyChecked,

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

@@ -65,16 +65,16 @@ export function rangeSelection(opts) {
 
       if (clickCell) {
         if (event.shiftKey) {
-          var _lastClickCell = pipeline.getStateAtKey(lastClickCellKey);
+          var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
 
           if (_lastClickCell) {
             setRangeSelection(_lastClickCell, clickCell);
           } else {
             // 第一次进来就按住shift键，这时候要记住点击的单元格
-            pipeline.setStateAtKey(lastClickCellKey, clickCell);
+            pipeline.setFeatureOptions(lastClickCellKey, clickCell);
           }
         } else {
-          pipeline.setStateAtKey(lastClickCellKey, clickCell);
+          pipeline.setFeatureOptions(lastClickCellKey, clickCell);
           setRangeSelection(clickCell, clickCell);
         }
       }

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

@@ -171,6 +171,10 @@ export function sort() {
         return dataSource;
       }
 
+      if (sortMap.size === 0) {
+        return dataSource;
+      }
+
       var sortColumnsMap = new _Map(_mapInstanceProperty(_context = _filterInstanceProperty(_context2 = collectNodes(columns, 'leaf-only')).call(_context2, function (col) {
         var _a, _b;
 

package/lib/table/base/styles.js

@@ -128,7 +128,7 @@ var defaultCSSVariables = {
   '--row-height': '48px',
   '--color': '#333',
   '--bgcolor': 'white',
-  '--hover-bgcolor': 'var(--hover-color, #F2F6FF)',
+  '--hover-bgcolor': 'var(--hover-color, #f5f5f5)',
   '--highlight-bgcolor': '#eee',
   '--primary-color': '#5582F3',
   '--primary-color-level1': 'rgb(242, 248, 255)',

package/lib/table/common-views.js

@@ -85,6 +85,6 @@ var icons = {
 };
 exports.icons = icons;
 
-var ContextMenuStyleWrap = _styledComponents.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  &.", "{\n    border: 1px solid #e9ecf1;\n    border-radius: 2px;\n    background-color: #Fff;\n    box-shadow: 0px 0px 5px 0px rgb(154 154 154 / 50%);\n    cursor: default;\n    font-size: 13px;\n    position:absolute;\n    z-index: 1050;\n    width:120px;\n  }\n\n  .", "{\n    width:100%;\n    display: table;\n  }\n\n  .", " .", "{\n    display: table-row;\n    color: #666666;\n  }\n\n  .", " .", "{\n    background-color: #f5f5f5;\n  }\n\n  .", " .", " .", "{\n    display: table-cell;\n    padding: 5px 8px;\n  }\n  .", " .", ".", "{\n    opacity: .5;\n  }\n\n"])), _styles.MenuClasses.menu, _styles.MenuClasses.menuList, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOption, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOptionActive, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOption, _styles.MenuClasses.menuOptionText, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOption, _styles.MenuClasses.menuOptionDisable);
+var ContextMenuStyleWrap = _styledComponents.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  &.", "{\n    border: 1px solid #e9ecf1;\n    border-radius: 2px;\n    background-color: #Fff;\n    box-shadow: 0px 0px 5px 0px rgb(154 154 154 / 50%);\n    cursor: default;\n    font-size: 12px;\n    position:absolute;\n    z-index: 1050;\n    max-width: 600px;\n    padding: 8px 0;\n  }\n\n  .", "{\n    width:100%;\n    display: table;\n  }\n\n  .", " .", "{\n    display: table-row;\n    color: #212121;\n  }\n\n  .", " .", "{\n    background-color: var(--hover-bgcolor);\n  }\n\n  .", " .", " .", "{\n    display: table-cell;\n    padding: 8px 12px;\n    max-width: 576px;\n    overflow: hidden;\n    white-space: nowrap;\n    text-overflow: ellipsis;\n    line-height: 16px;\n  }\n  .", " .", ".", "{\n    opacity: .5;\n  }\n\n"])), _styles.MenuClasses.menu, _styles.MenuClasses.menuList, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOption, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOptionActive, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOption, _styles.MenuClasses.menuOptionText, _styles.MenuClasses.menuList, _styles.MenuClasses.menuOption, _styles.MenuClasses.menuOptionDisable);
 
 exports.ContextMenuStyleWrap = ContextMenuStyleWrap;

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

@@ -19,6 +19,8 @@ var _utils = require("../../utils");
 
 var _styles = require("../../base/styles");
 
+var _columnResizeWidth = require("./columnResizeWidth");
+
 var FILL_COLUMN_CODE = '$_fill_column_&';
 exports.FILL_COLUMN_CODE = FILL_COLUMN_CODE;
 var tableWidthKey = 'tableWidth';
@@ -71,7 +73,7 @@ var setAutoFillWidth = function setAutoFillWidth(pipeline) {
         code = col.code;
 
     if ((0, _utils.isLeafNode)(col) && code !== FILL_COLUMN_CODE) {
-      var resizeColumn = pipeline.getStateAtKey('columnResize');
+      var resizeColumn = pipeline.getFeatureOptions(_columnResizeWidth.COLUMN_RESIZE_KEY);
       columnWidthSum += resizeColumn && resizeColumn[code] || width;
     }
 

package/lib/table/pipeline/features/columnResizeWidth.d.ts

@@ -20,5 +20,6 @@ export interface ColumnResizeOptions {
     onChangeSize?(nextSize: ColumnSize): void;
     afterChangeSize?(nextSize: ColumnSize, changedColumnSize: ChangedColumnSize[]): void;
 }
+export declare const COLUMN_RESIZE_KEY = "columnResize";
 export declare function columnResize(opts?: ColumnResizeOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

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

@@ -11,6 +11,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.COLUMN_RESIZE_KEY = void 0;
 exports.columnResize = columnResize;
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
@@ -53,17 +54,20 @@ function disableSelect(event) {
   event.preventDefault();
 }
 
+var stateKey = 'columnResize';
+var COLUMN_RESIZE_KEY = 'columnResize';
+exports.COLUMN_RESIZE_KEY = COLUMN_RESIZE_KEY;
+
 function columnResize() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
   var _a, _b, _c;
 
-  var stateKey = 'columnResize';
   var minSize = (_a = opts.minSize) !== null && _a !== void 0 ? _a : 60;
   var fallbackSize = (_b = opts.fallbackSize) !== null && _b !== void 0 ? _b : 150;
   var maxSize = (_c = opts.maxSize) !== null && _c !== void 0 ? _c : 1000;
   return function columnResizeFeature(pipeline) {
-    var _a, _b, _c;
+    var _a, _b;
 
     var columnSize = (_b = (_a = opts.columnSize) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : {};
     var leafColumns = (0, _utils.collectNodes)(pipeline.getColumns(), 'leaf-only');
@@ -78,15 +82,10 @@ function columnResize() {
           columnSize[code] = fallbackSize;
         }
       }
-    }); // 初始化 || opts.columnSize发生变化（为了autofill时能取到最新值）
-
-    if (!pipeline.getStateAtKey(stateKey) || ((_c = pipeline.ref) === null || _c === void 0 ? void 0 : _c.current.lastOptColumnSize) !== opts.columnSize) {
-      pipeline.setStateAtKey(stateKey, columnSize);
-    }
+    }); // 为了autofill时能取到最新值，实时存储一份最新的columnSize
+    // 存在state里可能存到取不到最新的
 
-    if (pipeline.ref) {
-      pipeline.ref.current.lastOptColumnSize = opts.columnSize;
-    }
+    pipeline.setFeatureOptions(COLUMN_RESIZE_KEY, columnSize);
 
     var onChangeSize = function onChangeSize(nextColumnSize) {
       window.requestAnimationFrame(function () {
@@ -94,12 +93,6 @@ function columnResize() {
 
         pipeline.setStateAtKey(stateKey, nextColumnSize);
         (_a = opts === null || opts === void 0 ? void 0 : opts.onChangeSize) === null || _a === void 0 ? void 0 : _a.call(opts, nextColumnSize);
-
-        if (opts.columnSize) {
-          if (pipeline.ref) {
-            pipeline.ref.current.lastOptColumnSize = nextColumnSize; // 这里记录由列宽拖拽导致的opts.columnSize变化,避免重复渲染
-          }
-        }
       });
     };
 

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

@@ -61,6 +61,10 @@ function multiSelect() {
     /** 所有有效的 keys（disable 状态为 false） */
 
     var allKeys = [];
+    var set = new _set.default(value);
+    var isAllChecked = set.size !== 0; // 当前不存在选中则默认为false
+
+    var isAnyChecked = false;
     var flatDataSource = (0, _utils.collectNodes)(dataSource);
     flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
@@ -68,23 +72,24 @@ function multiSelect() {
       fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
 
       if (!isDisabled(row, rowIndex)) {
-        allKeys.push(rowKey);
+        allKeys.push(rowKey); // 存在一个非选中，则不再进行判断
+
+        if (isAllChecked) {
+          isAllChecked = set.has(rowKey);
+        } // 存在一个选中，则不再进行判断
+
+
+        if (!isAnyChecked) {
+          isAnyChecked = set.has(rowKey);
+        }
       }
-    });
-    var set = new _set.default(value); // todo: 暂使用hidden隐藏选择列 后续增加配置
+    }); // todo: 暂使用hidden隐藏选择列 后续增加配置
 
     var hiddenSelectColumn = opts.checkboxColumn && opts.checkboxColumn.hidden === true;
 
     if (!hiddenSelectColumn) {
       var _context;
 
-      var isAllChecked = allKeys.length > 0 && allKeys.every(function (key) {
-        return set.has(key);
-      });
-      var isAnyChecked = allKeys.some(function (key) {
-        return set.has(key);
-      });
-
       var defaultCheckboxColumnTitle = /*#__PURE__*/_react.default.createElement(Checkbox, {
         checked: isAllChecked,
         indeterminate: !isAllChecked && isAnyChecked,

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

@@ -93,16 +93,16 @@ function rangeSelection(opts) {
 
       if (clickCell) {
         if (event.shiftKey) {
-          var _lastClickCell = pipeline.getStateAtKey(lastClickCellKey);
+          var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
 
           if (_lastClickCell) {
             setRangeSelection(_lastClickCell, clickCell);
           } else {
             // 第一次进来就按住shift键，这时候要记住点击的单元格
-            pipeline.setStateAtKey(lastClickCellKey, clickCell);
+            pipeline.setFeatureOptions(lastClickCellKey, clickCell);
           }
         } else {
-          pipeline.setStateAtKey(lastClickCellKey, clickCell);
+          pipeline.setFeatureOptions(lastClickCellKey, clickCell);
           setRangeSelection(clickCell, clickCell);
         }
       }

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

@@ -198,6 +198,10 @@ function sort() {
         return dataSource;
       }
 
+      if (sortMap.size === 0) {
+        return dataSource;
+      }
+
       var sortColumnsMap = new _map.default((0, _map2.default)(_context = (0, _filter.default)(_context2 = (0, _utils.collectNodes)(columns, 'leaf-only')).call(_context2, function (col) {
         var _a, _b;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.5-canary.9",
+  "version": "1.1.5",
   "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 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",
+    "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",
     "new": "node scripts/create-component.js",
     "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
   },