@kdcloudjs/table 1.1.4 → 1.1.5-canary.1

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

@@ -3,6 +3,7 @@ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import { mergeCellProps, makeRecursiveMapper, isElementInEventPath, collectNodes } from '../../utils';
 import { findByTree } from '../../utils/others';
 import { fromEvent } from 'rxjs';
@@ -10,40 +11,42 @@ import { map, takeUntil } from 'rxjs/operators';
 import { Classes } from '../../base/styles';
 import cx from 'classnames';
 export var rangeSelectionKey = 'rangeSelection';
-export var lastClickCell = 'lastClickCell';
+export var lastClickCellKey = 'lastClickCell';
 export 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);
     };
@@ -54,23 +57,23 @@ export 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 || !isElementInEventPath(tableBody, mouseDownEvent.nativeEvent)) return; // mouseDownEvent.preventDefault()
+      if (mouseDownEvent.button !== 0 || !(isElementInEventPath(tableBody, mouseDownEvent.nativeEvent) || isElementInEventPath(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
       // shift + 点击选中
 
       shiftKeySelect(mouseDownEvent);
@@ -126,18 +129,23 @@ export function rangeSelection(opts) {
     };
 
     var onKeyDown = function onKeyDown(e) {
-      if (!isElementInEventPath(tableBody, e.nativeEvent)) return;
+      if (!(isElementInEventPath(tableBody, e.nativeEvent) || 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: collectNodes(columns, 'leaf-only'),
+            startColumn: columns[0],
+            footerRowRange: footerDataSource.length > 0 ? {
+              startRow: 0,
+              endRow: footerDataSource.length - 1
+            } : null
           });
         }
       }
@@ -146,7 +154,8 @@ export function rangeSelection(opts) {
     pipeline.addTableProps({
       onMouseDown: onMouseDown,
       onKeyDown: onKeyDown,
-      tabIndex: -1
+      tabIndex: -1,
+      className: cx([Classes.rangeSelection])
     }); // todo: 后面可以把mousedown放到一个流里面
 
     return pipeline.mapColumns(makeRecursiveMapper(function (col) {
@@ -162,15 +171,29 @@ export 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 = cx((_cx = {}, _defineProperty(_cx, Classes.tableCellRangeSelected, match), _defineProperty(_cx, Classes.tableCellRangeTop, rowIndex === startIndex), _defineProperty(_cx, Classes.tableCellRangeLeft, col.code === startCol.code && match), _defineProperty(_cx, Classes.tableCellRangeBottom, rowIndex === endIndex), _defineProperty(_cx, 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 = cx((_cx = {}, _defineProperty(_cx, Classes.tableCellRangeSingleCell, matchSingleCell), _defineProperty(_cx, Classes.tableCellRangeSelected, showCellRangeStyle), _defineProperty(_cx, Classes.tableCellRangeTop, showCellRangeStyle && (isInFooter ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex)), _defineProperty(_cx, Classes.tableCellRangeLeft, showCellRangeStyle && col.code === startCol.code), _defineProperty(_cx, Classes.tableCellRangeBottom, showCellRangeStyle && (isInFooter ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex)), _defineProperty(_cx, Classes.tableCellRangeRight, showCellRangeStyle && col.code === endCol.code), _cx));
           return mergeCellProps(prevCellProps, {
             className: className
           });
@@ -196,7 +219,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)
           }
         };
       }();
@@ -211,7 +235,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(Classes.artTable)) {
+    if (target.classList.contains(Classes.tableFooter)) {
+      return true;
+    }
+
+    target = target.parentElement;
+  }
+
+  return false;
 }
 
 function getRangeColumns(startCell, endCell, columns) {
@@ -230,4 +266,108 @@ function getRangeColumns(startCell, endCell, columns) {
   } else {
     return _sliceInstanceProperty(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 (_includesInstanceProperty(_context2 = ['input', 'textarea']).call(_context2, target.tagName.toLowerCase())) {
+    if (target.type === 'checkbox') return;
+    return !target.disabled && !target.readOnly;
+  }
 }

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

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

package/es/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/es/table/pipeline/features/treeMode.js

@@ -1,13 +1,13 @@
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
-import _toArray from "@babel/runtime-corejs3/helpers/toArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "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 = _sliceInstanceProperty(_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; }
 
@@ -15,7 +15,7 @@ import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import cx from 'classnames';
 import React from 'react';
 import { ExpansionCell, icons, InlineFlexCell } from '../../common-views';
@@ -31,11 +31,6 @@ export 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(openKeys);
 
@@ -90,7 +85,7 @@ export function treeMode() {
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var node = _step.value;
-            var rowKey = node[primaryKey];
+            var rowKey = internals.safeGetRowKey(primaryKey, node, -1);
             var expanded = openKeySet.has(rowKey);
             var isLeaf = isLeafNode(node, {
               depth: depth,
@@ -120,18 +115,20 @@ export function treeMode() {
     }
 
     function processColumns(columns) {
-      var _context2;
-
       if (columns.length === 0) {
         return columns;
       }
 
-      var _columns = _toArray(columns),
-          firstCol = _columns[0],
-          others = _sliceInstanceProperty(_columns).call(_columns, 1);
+      var expandColIndex = _findIndexInstanceProperty(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.safeRender(firstCol, record, recordIndex);
+        var content = internals.safeRender(expandCol, record, recordIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的渲染结果
@@ -191,7 +188,7 @@ export function treeMode() {
       };
 
       var getCellProps = function getCellProps(value, record, rowIndex) {
-        var prevProps = internals.safeGetCellProps(firstCol, record, rowIndex);
+        var prevProps = internals.safeGetCellProps(expandCol, record, rowIndex);
 
         if (record[treeMetaKey] == null) {
           // 没有 treeMeta 信息的话，就返回原先的 cellProps
@@ -220,15 +217,17 @@ export function treeMode() {
         });
       };
 
-      return _concatInstanceProperty(_context2 = [_extends(_extends({}, firstCol), {
+      columns[expandColIndex] = _extends(_extends({}, expandCol), {
         title: /*#__PURE__*/React.createElement("span", {
           style: {
-            marginLeft: iconIndent + iconWidth + iconGap
+            marginLeft: iconIndent + iconWidth + iconGap,
+            display: 'flex'
           }
-        }, internals.safeRenderHeader(firstCol)),
+        }, internals.safeRenderHeader(expandCol)),
         render: render,
-        getCellProps: clickArea === 'cell' ? getCellProps : firstCol.getCellProps
-      })]).call(_context2, _toConsumableArray(others));
+        getCellProps: clickArea === 'cell' ? getCellProps : expandCol.getCellProps
+      });
+      return _toConsumableArray(columns);
     }
   };
 }

package/es/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/es/table/pipeline/pipeline.js

@@ -8,6 +8,7 @@ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instan
 import { useState, useRef } from 'react';
 import { mergeCellProps } from '../utils';
 import { autoFillTableWidth, tableWidthKey } from './features/autoFill';
+import { rangeSelectionKey } from './features/rangeSelection';
 /**
  * 表格数据处理流水线。TablePipeline 提供了表格数据处理过程中的一些上下方与工具方法，包括……
  *
@@ -276,19 +277,19 @@ export 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(rangeSelectionKey, null);
+    }
   }]);
 
   return TablePipeline;

package/es/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/es/table/utils/element.js

@@ -225,4 +225,8 @@ export function keepWithinBounds(popupParent, popup, x, y, isPerfect) {
     x: x,
     y: y
   };
+}
+export 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/es/table/utils/keyCode.d.ts

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

package/es/table/utils/keyCode.js

@@ -0,0 +1,5 @@
+var KeyCode = {
+  ENTER: 13,
+  ESC: 27
+};
+export default KeyCode;

package/es/table/utils/mergeCellProps.js

@@ -5,13 +5,9 @@ import cx from '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/lib/table/base/html-table.js

@@ -141,7 +141,7 @@ function HtmlTable(_ref) {
       positionStyle.left = hozInfo.stickyLeftMap.get(colIndex);
     } else if (colIndex >= fullFlatCount - rightFlatCount) {
       positionStyle.position = 'sticky';
-      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - stickyRightOffset;
+      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
     }
 
     return /*#__PURE__*/_react.default.createElement('td', (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({

package/lib/table/base/styles.d.ts

@@ -2,6 +2,7 @@ export declare const LOCK_SHADOW_PADDING = 20;
 export declare const Classes: {
     /** BaseTable 表格组件的外层包裹 div */
     readonly artTableWrapper: string;
+    readonly artTableBordered: string;
     readonly artTable: string;
     readonly tableHeaderMain: string;
     readonly tableHeader: string;
@@ -37,9 +38,12 @@ export declare const Classes: {
     readonly tableHeaderCellLine: string;
     readonly tableFilterTrigger: string;
     readonly tableSortIcon: string;
+    readonly tableExtendIcon: string;
     readonly button: string;
     readonly buttonPrimary: string;
     readonly filterIcon: string;
+    readonly rangeSelection: string;
+    readonly tableCellRangeSingleCell: string;
     readonly tableCellRangeSelected: string;
     readonly tableCellRangeTop: string;
     readonly tableCellRangeLeft: string;
@@ -60,6 +64,9 @@ export declare const Classes: {
     readonly leaf: string;
     readonly expanded: string;
     readonly collapsed: string;
+    readonly popup: string;
+    readonly popupHeader: string;
+    readonly popupBody: string;
 };
 export declare const MenuClasses: {
     menu: string;
@@ -112,13 +119,13 @@ export declare type BaseTableCSSVariables = Partial<{
     '--border-color': string;
     /** 单元格边框，默认为 1px solid #dfe3e8 */
     '--cell-border': string;
-    /** 单元格上下边框，默认为 #dfe3e8 */
+    /** 单元格上下边框，默认为 none ，默认值为 1px solid #dfe3e8 */
     '--cell-border-horizontal': string;
     /** 单元格左右边框，默认为 #dfe3e8 */
     '--cell-border-vertical': string;
     /** 表头单元格边框，默认为 1px solid #dfe3e8 */
     '--header-cell-border': string;
-    /** 表头单元格上下边框，默认为 1px solid #dfe3e8 */
+    /** 表头单元格上下边框，默认为 none ，默认值为 1px solid #dfe3e8 */
     '--header-cell-border-horizontal': string;
     /** 表头单元格左右边框，默认为 1px solid #dfe3e8 */
     '--header-cell-border-vertical': string;
@@ -148,7 +155,9 @@ export declare const defaultCSSVariables: {
     '--cell-border-horizontal': string;
     '---cell-border-vertical': string;
     '--header-cell-border': string;
+    '--cell-border-vertical': string;
     '--header-cell-border-horizontal': string;
+    '--header-cell-border-vertical': string;
 };
 export declare const variableConst: string;
 export declare const StyledArtTableWrapper: any;