@kdcloudjs/table 1.1.4 → 1.1.5-canary.1

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

@@ -19,6 +19,12 @@ Object.defineProperty(exports, "buildTree", {
     return _buildTree.buildTree;
   }
 });
+Object.defineProperty(exports, "colGroupExtendable", {
+  enumerable: true,
+  get: function get() {
+    return _colGroupExtendable.colGroupExtendable;
+  }
+});
 Object.defineProperty(exports, "columnDrag", {
   enumerable: true,
   get: function get() {
@@ -55,6 +61,18 @@ Object.defineProperty(exports, "filter", {
     return _filterInstanceProperty(_columnFilter);
   }
 });
+Object.defineProperty(exports, "footerDataSource", {
+  enumerable: true,
+  get: function get() {
+    return _footerDataSource.footerDataSource;
+  }
+});
+Object.defineProperty(exports, "footerRowMetaSymbol", {
+  enumerable: true,
+  get: function get() {
+    return _footerDataSource.footerRowMetaSymbol;
+  }
+});
 Object.defineProperty(exports, "mergeCellHover", {
   enumerable: true,
   get: function get() {
@@ -156,4 +174,8 @@ var _columnFilter = require("./columnFilter");
 
 var _rangeSelection = require("./rangeSelection");
 
-var _mergeCellHover = require("./mergeCellHover");
+var _mergeCellHover = require("./mergeCellHover");
+
+var _footerDataSource = require("./footerDataSource");
+
+var _colGroupExtendable = require("./colGroupExtendable");

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

@@ -61,7 +61,8 @@ function multiSelect() {
     /** 所有有效的 keys（disable 状态为 false） */
 
     var allKeys = [];
-    dataSource.forEach(function (row, rowIndex) {
+    var flatDataSource = (0, _utils.collectNodes)(dataSource);
+    flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
       fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
@@ -130,6 +131,10 @@ function multiSelect() {
           return (0, _utils.mergeCellProps)(preCellProps, checkboxCellProps);
         },
         render: function render(_, row, rowIndex) {
+          if (row[pipeline.getFeatureOptions('footerRowMetaKey')]) {
+            return null;
+          }
+
           var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
           var checked = set.has(key);

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

@@ -6,5 +6,5 @@ export interface RangeSelectionFeatureOptions {
     preventkDefaultOfKeyDownEvent?: boolean;
 }
 export declare const rangeSelectionKey = "rangeSelection";
-export declare const lastClickCell = "lastClickCell";
+export declare const lastClickCellKey = "lastClickCell";
 export declare function rangeSelection(opts: RangeSelectionFeatureOptions): (pipeline: TablePipeline) => TablePipeline;

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

@@ -7,7 +7,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.lastClickCell = void 0;
+exports.lastClickCellKey = void 0;
 exports.rangeSelection = rangeSelection;
 exports.rangeSelectionKey = void 0;
 
@@ -21,6 +21,8 @@ var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-
 
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+
 var _utils = require("../../utils");
 
 var _others = require("../../utils/others");
@@ -35,42 +37,44 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var rangeSelectionKey = 'rangeSelection';
 exports.rangeSelectionKey = rangeSelectionKey;
-var lastClickCell = 'lastClickCell';
-exports.lastClickCell = lastClickCell;
+var lastClickCellKey = 'lastClickCell';
+exports.lastClickCellKey = lastClickCellKey;
 
 function rangeSelection(opts) {
   return function step(pipeline) {
     var SCROLL_SIZE = 30;
     var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
+    var tableFooter = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableFooter;
 
     if (!tableBody) {
       return pipeline;
     }
 
     var columns = pipeline.getColumns();
+    var dataSource = pipeline.getDataSource();
 
     var rangeSelectedChange = function rangeSelectedChange(rangeSelection) {
       var _a;
 
       pipeline.setStateAtKey(rangeSelectionKey, rangeSelection);
       (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection);
-    }; // if (!pipeline.getFeatureOptions(rangeSelectionKey)) {
-    //   pipeline.setFeatureOptions(rangeSelectionKey, {
-    //     optionKey: rangeSelectionKey,
-    //     rangeSelectedChange: rangeSelectedChange
-    //   })
-    // }
-
+    };
 
     var setRangeSelection = function setRangeSelection(startDragCell, draggingCell) {
-      if (!startDragCell || !draggingCell || isSameCell(startDragCell, draggingCell)) return;
+      if (!startDragCell || !draggingCell) return;
       var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
-      var isTopToBottom = startDragCell.rowIndex <= draggingCell.rowIndex;
+
+      var _getRangeSelectionRow = getRangeSelectionRowInfo(startDragCell, draggingCell, dataSource),
+          startRow = _getRangeSelectionRow.startRow,
+          endRow = _getRangeSelectionRow.endRow,
+          footerRowRange = _getRangeSelectionRow.footerRowRange;
+
       var rangeSelection = {
-        startRow: isTopToBottom ? startDragCell.rowIndex : startDragCell.rowIndex + startDragCell.rowSpan - 1,
-        endRow: isTopToBottom ? draggingCell.rowIndex + draggingCell.rowSpan - 1 : draggingCell.rowIndex,
+        startRow: startRow,
+        endRow: endRow,
         columns: rangeColumns,
-        startColumn: startDragCell.column
+        startColumn: startDragCell.column,
+        footerRowRange: footerRowRange
       };
       rangeSelectedChange(rangeSelection);
     };
@@ -81,23 +85,23 @@ function rangeSelection(opts) {
 
       if (clickCell) {
         if (event.shiftKey) {
-          var _lastClickCell = pipeline.getStateAtKey(lastClickCell);
+          var _lastClickCell = pipeline.getStateAtKey(lastClickCellKey);
 
           if (_lastClickCell) {
             setRangeSelection(_lastClickCell, clickCell);
           } else {
             // 第一次进来就按住shift键，这时候要记住点击的单元格
-            pipeline.setStateAtKey(lastClickCell, clickCell);
+            pipeline.setStateAtKey(lastClickCellKey, clickCell);
           }
         } else {
-          pipeline.setStateAtKey(lastClickCell, clickCell);
-          rangeSelectedChange(null);
+          pipeline.setStateAtKey(lastClickCellKey, clickCell);
+          setRangeSelection(clickCell, clickCell);
         }
       }
     };
 
     var onMouseDown = function onMouseDown(mouseDownEvent) {
-      if (mouseDownEvent.button !== 0 || !(0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent)) return; // mouseDownEvent.preventDefault()
+      if (mouseDownEvent.button !== 0 || !((0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
       // shift + 点击选中
 
       shiftKeySelect(mouseDownEvent);
@@ -153,18 +157,23 @@ function rangeSelection(opts) {
     };
 
     var onKeyDown = function onKeyDown(e) {
-      if (!(0, _utils.isElementInEventPath)(tableBody, e.nativeEvent)) return;
+      if (!((0, _utils.isElementInEventPath)(tableBody, e.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, e.nativeEvent))) return;
 
       if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
         var rowLen = pipeline.getDataSource().length;
+        var footerDataSource = pipeline.getFooterDataSource() || []; // 焦点位于可编辑的单元格内不做全选
 
-        if (columns.length && rowLen) {
+        if (columns.length && rowLen && !getElementEditable(e.target)) {
           opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
           rangeSelectedChange({
             startRow: 0,
             endRow: rowLen - 1,
-            columns: columns,
-            startColumn: columns[0]
+            columns: (0, _utils.collectNodes)(columns, 'leaf-only'),
+            startColumn: columns[0],
+            footerRowRange: footerDataSource.length > 0 ? {
+              startRow: 0,
+              endRow: footerDataSource.length - 1
+            } : null
           });
         }
       }
@@ -173,7 +182,8 @@ function rangeSelection(opts) {
     pipeline.addTableProps({
       onMouseDown: onMouseDown,
       onKeyDown: onKeyDown,
-      tabIndex: -1
+      tabIndex: -1,
+      className: (0, _classnames.default)([_styles.Classes.rangeSelection])
     }); // todo: 后面可以把mousedown放到一个流里面
 
     return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col) {
@@ -189,15 +199,29 @@ function rangeSelection(opts) {
           var _cx;
 
           var prevCellProps = prevGetCellProps === null || prevGetCellProps === void 0 ? void 0 : prevGetCellProps(value, record, rowIndex);
+          var isInFooter = record[pipeline.getFeatureOptions('footerRowMetaKey')];
           var startRow = rangeSelection.startRow,
               endRow = rangeSelection.endRow,
-              columns = rangeSelection.columns;
-          var startIndex = startRow < endRow ? startRow : endRow;
-          var endIndex = startRow < endRow ? endRow : startRow;
+              columns = rangeSelection.columns,
+              footerRowRange = rangeSelection.footerRowRange;
+
+          var _getRowIndex = getRowIndex(startRow, endRow),
+              startRowIndex = _getRowIndex.startRowIndex,
+              endRowIndex = _getRowIndex.endRowIndex;
+
+          var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
+              footerStartRowIndex = _getFooterRowIndex.startRowIndex,
+              footerEndRowIndex = _getFooterRowIndex.endRowIndex;
+
           var startCol = columns[0];
           var endCol = columns[columns.length - 1];
-          var match = rowIndex >= startIndex && rowIndex <= endIndex;
-          var className = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSelected, match), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeTop, rowIndex === startIndex), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeLeft, col.code === startCol.code && match), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeBottom, rowIndex === endIndex), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeRight, col.code === endCol.code && match), _cx));
+          var bodyMatch = !isInFooter && rowIndex >= startRowIndex && rowIndex <= endRowIndex;
+          var footerMatch = isInFooter && footerRowRange && rowIndex >= footerStartRowIndex && rowIndex <= footerEndRowIndex;
+          var match = footerMatch || bodyMatch;
+          var matchSingleCell = match && isCellRangeSingleCell(rangeSelection); // 单个范围选中单元格不显示样式
+
+          var showCellRangeStyle = match && !matchSingleCell;
+          var className = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSingleCell, matchSingleCell), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSelected, showCellRangeStyle), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeTop, showCellRangeStyle && (isInFooter ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex)), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeLeft, showCellRangeStyle && col.code === startCol.code), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeBottom, showCellRangeStyle && (isInFooter ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex)), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeRight, showCellRangeStyle && col.code === endCol.code), _cx));
           return (0, _utils.mergeCellProps)(prevCellProps, {
             className: className
           });
@@ -223,7 +247,8 @@ function getTargetCell(target, columns) {
             rowIndex: parseInt(target.getAttribute('data-rowindex')),
             rowSpan: parseInt(target.getAttribute('rowspan') || 1),
             code: columnCode,
-            column: column
+            column: column,
+            isInFooter: isEleInFooter(target)
           }
         };
       }();
@@ -238,7 +263,19 @@ function getTargetCell(target, columns) {
 }
 
 function isSameCell(cell1, cell2) {
-  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code;
+  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isInFooter === cell2.isInFooter;
+}
+
+function isEleInFooter(target) {
+  while (target && !target.classList.contains(_styles.Classes.artTable)) {
+    if (target.classList.contains(_styles.Classes.tableFooter)) {
+      return true;
+    }
+
+    target = target.parentElement;
+  }
+
+  return false;
 }
 
 function getRangeColumns(startCell, endCell, columns) {
@@ -255,4 +292,108 @@ function getRangeColumns(startCell, endCell, columns) {
   } else {
     return (0, _slice.default)(flatColumns).call(flatColumns, endIndex, startIndex + 1);
   }
+}
+
+function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
+  var footerRowRange = null;
+  var startRow = -1;
+  var endRow = -1;
+
+  var _getCellRangeRow = getCellRangeRow(startCell, endCell),
+      _startRow = _getCellRangeRow.startRow,
+      _endRow = _getCellRangeRow.endRow; // 两个单元格都在表体
+
+
+  if (!startCell.isInFooter && !endCell.isInFooter) {
+    startRow = _startRow;
+    endRow = _endRow;
+  } else if (startCell.isInFooter && endCell.isInFooter) {
+    // 两个单元格都在表底
+    footerRowRange = {
+      startRow: _startRow,
+      endRow: _endRow
+    };
+  } else {
+    // 一个单元格在表体，一个在表底
+    if (startCell.isInFooter) {
+      startRow = dataSource.length - 1;
+      endRow = endCell.rowIndex;
+      footerRowRange = {
+        startRow: startCell.rowIndex,
+        endRow: 0
+      };
+    } else {
+      startRow = startCell.rowIndex;
+      endRow = dataSource.length - 1;
+      footerRowRange = {
+        startRow: 0,
+        endRow: endCell.rowIndex
+      };
+    }
+  }
+
+  return {
+    startRow: startRow,
+    endRow: endRow,
+    footerRowRange: footerRowRange
+  };
+}
+
+function getCellRangeRow(startCell, endCell) {
+  if (isSameCell(startCell, endCell)) {
+    return {
+      startRow: startCell.rowIndex,
+      endRow: startCell.rowIndex
+    };
+  }
+
+  var isTopToBottom = startCell.rowIndex <= endCell.rowIndex;
+  var startRow = isTopToBottom ? startCell.rowIndex : startCell.rowIndex + startCell.rowSpan - 1;
+  var endRow = isTopToBottom ? endCell.rowIndex + endCell.rowSpan - 1 : endCell.rowIndex;
+  return {
+    startRow: startRow,
+    endRow: endRow
+  };
+}
+
+function isCellRangeSingleCell(rangeSelection) {
+  var startRow = rangeSelection.startRow,
+      endRow = rangeSelection.endRow,
+      columns = rangeSelection.columns,
+      footerRowRange = rangeSelection.footerRowRange;
+  var isBodySingleCell = !footerRowRange && startRow === endRow && columns.length === 1;
+  var isFooterSingleCell = startRow === -1 && footerRowRange.startRow === footerRowRange.endRow && columns.length === 1;
+  return isBodySingleCell || isFooterSingleCell;
+}
+
+function getRowIndex(startRow, endRow) {
+  var isReverse = startRow > endRow;
+  var startRowIndex = isReverse ? endRow : startRow;
+  var endRowIndex = isReverse ? startRow : endRow;
+  return {
+    startRowIndex: startRowIndex,
+    endRowIndex: endRowIndex
+  };
+}
+
+function getFooterRowIndex(footerRowRange) {
+  if (footerRowRange) {
+    return getRowIndex(footerRowRange.startRow, footerRowRange.endRow);
+  }
+
+  return {
+    startRowIndex: -1,
+    endRowIndex: -1
+  };
+}
+
+function getElementEditable(target) {
+  var _context2;
+
+  if (!target) return;
+
+  if ((0, _includes.default)(_context2 = ['input', 'textarea']).call(_context2, target.tagName.toLowerCase())) {
+    if (target.type === 'checkbox') return;
+    return !target.disabled && !target.readOnly;
+  }
 }

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

@@ -76,6 +76,10 @@ function singleSelect() {
         return preCellProps;
       },
       render: function render(_, row, rowIndex) {
+        if (row[pipeline.getFeatureOptions('footerRowMetaKey')]) {
+          return null;
+        }
+
         var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
         return /*#__PURE__*/_react.default.createElement(Radio, {

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

@@ -32,6 +32,8 @@ export interface TreeModeFeatureOptions {
     stopClickEventPropagation?: boolean;
     /** 指定表格每一行元信息的记录字段 */
     treeMetaKey?: string | symbol;
+    /** 指定展开列 */
+    expandColCode?: string;
 }
 export declare function treeMode(opts?: TreeModeFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 
-var _sliceInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
 
 var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
 
@@ -16,8 +16,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.treeMetaSymbol = void 0;
 exports.treeMode = treeMode;
 
-var _toArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toArray"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
 var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -32,7 +30,7 @@ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
-var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
+var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -48,7 +46,7 @@ var _styles = require("../../base/styles");
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol2 !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray(o, minLen) { var _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty2(_context3 = Object.prototype.toString.call(o)).call(_context3, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { var _context2; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context2 = Object.prototype.toString.call(o)).call(_context2, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
@@ -63,11 +61,6 @@ function treeMode() {
     var stateKey = 'treeMode';
     var ctx = pipeline.ctx;
     var primaryKey = pipeline.ensurePrimaryKey('treeMode');
-
-    if (typeof primaryKey !== 'string') {
-      throw new Error('treeMode 仅支持字符串作为 primaryKey');
-    }
-
     var openKeys = (_c = (_b = (_a = opts.openKeys) !== null && _a !== void 0 ? _a : pipeline.getStateAtKey(stateKey)) !== null && _b !== void 0 ? _b : opts.defaultOpenKeys) !== null && _c !== void 0 ? _c : [];
     var openKeySet = new _set.default(openKeys);
 
@@ -122,7 +115,9 @@ function treeMode() {
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
-            var rowKey = node[primaryKey];
+
+            var rowKey = _internals.internals.safeGetRowKey(primaryKey, node, -1);
+
             var expanded = openKeySet.has(rowKey);
             var isLeaf = isLeafNode(node, {
               depth: depth,
@@ -152,18 +147,19 @@ function treeMode() {
     }
 
     function processColumns(columns) {
-      var _context2;
-
       if (columns.length === 0) {
         return columns;
       }
 
-      var _columns = (0, _toArray2.default)(columns),
-          firstCol = _columns[0],
-          others = (0, _slice.default)(_columns).call(_columns, 1);
+      var expandColIndex = (0, _findIndex.default)(columns).call(columns, function (_ref) {
+        var code = _ref.code;
+        return code && opts.expandColCode === code;
+      });
+      expandColIndex = expandColIndex === -1 ? 0 : expandColIndex;
+      var expandCol = columns[expandColIndex];
 
       var render = function render(value, record, recordIndex) {
-        var content = _internals.internals.safeRender(firstCol, record, recordIndex);
+        var content = _internals.internals.safeRender(expandCol, record, recordIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的渲染结果
@@ -223,7 +219,7 @@ function treeMode() {
       };
 
       var getCellProps = function getCellProps(value, record, rowIndex) {
-        var prevProps = _internals.internals.safeGetCellProps(firstCol, record, rowIndex);
+        var prevProps = _internals.internals.safeGetCellProps(expandCol, record, rowIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的 cellProps
@@ -252,15 +248,17 @@ function treeMode() {
         });
       };
 
-      return (0, _concat.default)(_context2 = [(0, _extends3.default)((0, _extends3.default)({}, firstCol), {
+      columns[expandColIndex] = (0, _extends3.default)((0, _extends3.default)({}, expandCol), {
         title: /*#__PURE__*/_react.default.createElement("span", {
           style: {
-            marginLeft: iconIndent + iconWidth + iconGap
+            marginLeft: iconIndent + iconWidth + iconGap,
+            display: 'flex'
           }
-        }, _internals.internals.safeRenderHeader(firstCol)),
+        }, _internals.internals.safeRenderHeader(expandCol)),
         render: render,
-        getCellProps: clickArea === 'cell' ? getCellProps : firstCol.getCellProps
-      })]).call(_context2, (0, _toConsumableArray2.default)(others));
+        getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
+      });
+      return (0, _toConsumableArray2.default)(columns);
     }
   };
 }

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

@@ -36,7 +36,7 @@ export declare class TablePipeline {
     private _tableProps;
     private _dataSource;
     private _columns;
-    private _footerDataSource;
+    private _footerDataSource?;
     static defaultIndents: TablePipelineIndentsConfig;
     readonly ctx: TablePipelineCtx;
     private readonly state;
@@ -88,6 +88,10 @@ export declare class TablePipeline {
     setFeatureOptions(optionKey: string, value: any): void;
     /** 获取 BaseTable 的 props，结果中包含 dataSource/columns/primaryKey/getRowProps 四个字段 */
     getProps(this: TablePipeline): TableProps;
+    /**
+     * 清除范围选中内容
+     */
+    clearRangeSelection(): void;
 }
 export declare function useTablePipeline(ctx?: Partial<TablePipelineCtx>): TablePipeline;
 export {};

package/lib/table/pipeline/pipeline.js

@@ -28,6 +28,8 @@ var _utils = require("../utils");
 
 var _autoFill = require("./features/autoFill");
 
+var _rangeSelection = require("./features/rangeSelection");
+
 /**
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法，包括……
  *
@@ -292,19 +294,19 @@ var TablePipeline = /*#__PURE__*/function () {
 
       result.setTableDomHelper = function (domHelper) {
         _this2.ref.current.domHelper = domHelper;
-      }; // if (this.getFeatureOptions(rangeSelectionKey)) {
-      //   result.clearRangeSelectionStatus = () => {
-      //     const { rangeSelectedChange } = this.getFeatureOptions(rangeSelectionKey)
-      //     const rangeSelection = this.getStateAtKey(rangeSelectionKey)
-      //     if (rangeSelection) {
-      //       rangeSelectedChange?.(null)
-      //     }
-      //   }
-      // }
-
+      };
 
       return result;
     }
+    /**
+     * 清除范围选中内容
+     */
+
+  }, {
+    key: "clearRangeSelection",
+    value: function clearRangeSelection() {
+      this.setStateAtKey(_rangeSelection.rangeSelectionKey, null);
+    }
   }]);
   return TablePipeline;
 }();

package/lib/table/utils/element.d.ts

@@ -39,4 +39,5 @@ export declare function keepWithinBounds(popupParent: HTMLElement, popup: HTMLEl
     x: number;
     y: number;
 };
+export declare function hasScroll(ele: HTMLElement, isHorizontal?: boolean): boolean;
 export {};

package/lib/table/utils/element.js

@@ -7,6 +7,7 @@ exports.calculatePointerRelative = calculatePointerRelative;
 exports.calculatePopupRelative = calculatePopupRelative;
 exports.getEventPath = getEventPath;
 exports.getTargetEleInEventPath = getTargetEleInEventPath;
+exports.hasScroll = hasScroll;
 exports.isElementInEventPath = isElementInEventPath;
 exports.keepWithinBounds = keepWithinBounds;
 
@@ -240,4 +241,9 @@ function keepWithinBounds(popupParent, popup, x, y, isPerfect) {
     x: x,
     y: y
   };
+}
+
+function hasScroll(ele) {
+  var isHorizontal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  return isHorizontal ? ele.scrollWidth > ele.clientWidth : ele.scrollHeight > ele.clientHeight;
 }

package/lib/table/utils/keyCode.d.ts

@@ -0,0 +1,5 @@
+declare const KeyCode: {
+    ENTER: number;
+    ESC: number;
+};
+export default KeyCode;

package/lib/table/utils/keyCode.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var KeyCode = {
+  ENTER: 13,
+  ESC: 27
+};
+var _default = KeyCode;
+exports.default = _default;

package/lib/table/utils/mergeCellProps.js

@@ -17,13 +17,9 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 function composeEventHandler(handler1, handler2) {
   return function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
     // 先执行原有的事件回调函数
-    handler1(args);
-    handler2(args); // 事件回调函数没有返回值，故这里不进行 return
+    handler1.apply(void 0, arguments);
+    handler2.apply(void 0, arguments); // 事件回调函数没有返回值，故这里不进行 return
   };
 }
 /** 合并两个 cellProps（单元格属性）对象，返回一个合并后的全新对象。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.4",
+  "version": "1.1.5-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/"
   },