@kdcloudjs/table 1.2.0-canary.9 → 1.2.1-canary.1

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

@@ -1,18 +1,19 @@
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import React from 'react';
 import { internals } from '../../internals';
 import { always, arrayUtils } from '../../utils/others';
-import { collectNodes, mergeCellProps } from '../../utils';
+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) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
     var stateKey = 'multiSelect';
     var Checkbox = pipeline.ctx.components.Checkbox;
@@ -150,12 +151,13 @@ export function multiSelect() {
               }
             } : undefined
           });
-        }
+        },
+        features: _extends(_extends({}, (_l = opts.checkboxColumn) === null || _l === void 0 ? void 0 : _l.features), _defineProperty({}, MULTI_SELECT_MARK_PROPNAME, true))
       });
 
       var nextColumns = _sliceInstanceProperty(_context = pipeline.getColumns()).call(_context);
 
-      var checkboxPlacement = (_l = opts.checkboxPlacement) !== null && _l !== void 0 ? _l : 'start';
+      var checkboxPlacement = (_m = opts.checkboxPlacement) !== null && _m !== void 0 ? _m : 'start';
 
       if (checkboxPlacement === 'start') {
         nextColumns.unshift(checkboxColumn);

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

@@ -145,7 +145,9 @@ export function rangeSelection(opts) {
 
       var isCtrlKey = mouseDownEvent.ctrlKey || mouseDownEvent.metaKey;
       var isShiftKey = mouseDownEvent.shiftKey;
-      var target = mouseDownEvent.target; // 每次点击时先确认初始生效的框选范围
+      var target = mouseDownEvent.target;
+      var startDragCell = getTargetCell(target, columns);
+      if (!startDragCell) return; // 每次点击时先确认初始生效的框选范围
 
       setStartSelectedCellRanges(isCtrlKey, isShiftKey);
 
@@ -154,7 +156,6 @@ export function rangeSelection(opts) {
         return;
       }
 
-      var startDragCell = getTargetCell(target, columns);
       pipeline.setFeatureOptions(lastClickCellKey, startDragCell);
       var draggingCell = startDragCell;
       var mousemove$ = fromEvent(window, 'mousemove');

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

@@ -0,0 +1,30 @@
+import { TablePipeline } from '../pipeline';
+import { ArtColumn } from '../../interfaces';
+interface RowDragEvent {
+    startRowIndex: number;
+    startRow: any;
+    endRowIndex: number;
+    endRow: any;
+    isFinished: boolean;
+    dragPosition: string;
+}
+export interface RowDragFeatureOptions {
+    /** 拖拽开始事件 */
+    onDragStart?: (event: RowDragEvent) => void;
+    /** 拖拽移动事件 */
+    onDragMove?: (event: RowDragEvent) => void;
+    /** 拖拽结束事件 */
+    onDragEnd?: (event: RowDragEvent) => void;
+    /** 判断一行是否要禁用拖拽 */
+    isDisabled?: (row: any, rowIndex: number) => boolean;
+    /** 拖拽列定义 */
+    rowDragColumn?: ArtColumn;
+    /** 行高 */
+    rowHeight?: number;
+    /** 拖拽过程中是否禁止滚动条滚动 */
+    suppressScrollMove?: boolean;
+}
+export declare const ROW_DRAG_COLUMN_CODE = "$_row_drag_column_&";
+export declare const rowDragKey = "rowDragKey";
+export declare function rowDrag(opt: RowDragFeatureOptions): (pipeline: TablePipeline) => TablePipeline;
+export {};

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

@@ -0,0 +1,349 @@
+import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import React from 'react';
+import { fromEvent } from 'rxjs';
+import { map, takeUntil } from 'rxjs/operators';
+import cx from 'classnames';
+import { Classes } from '../../base/styles';
+export var ROW_DRAG_COLUMN_CODE = '$_row_drag_column_&';
+export var rowDragKey = 'rowDragKey';
+var SCROLL_OFFSET = 30;
+var defaultRowDragColumn = {
+  name: '拖拽列',
+  code: ROW_DRAG_COLUMN_CODE,
+  lock: true,
+  title: '',
+  width: 40,
+  align: 'center',
+  getCellProps: function getCellProps(value, row, rowIndex) {
+    return {
+      className: cx(Classes.rowDragCell)
+    };
+  },
+  render: function render(value, row, rowIndex) {
+    return /*#__PURE__*/React.createElement("svg", {
+      viewBox: '0 0 1024 1024',
+      version: '1.1',
+      xmlns: 'http://www.w3.org/1999/xlink',
+      "data-icon": 'drag',
+      width: '16',
+      height: '16'
+    }, /*#__PURE__*/React.createElement("path", {
+      d: 'M298.688 192a64 64 0 1 0 128 0 64 64 0 0 0-128 0z m298.624 0a64 64 0 1 0 128 0 64 64 0 0 0-128 0zM298.688 512a64 64 0 1 0 128 0 64 64 0 0 0-128 0z m298.624 0a64 64 0 1 0 128 0 64 64 0 0 0-128 0z m-298.624 320a64 64 0 1 0 128 0 64 64 0 0 0-128 0z m298.624 0a64 64 0 1 0 128 0 64 64 0 0 0-128 0z',
+      "p-id": '4278'
+    }));
+  }
+};
+export function rowDrag(opt) {
+  return function rowDragStep(pipeline) {
+    var _context;
+
+    var tableBody = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.tableBody;
+    var artTable = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.artTable;
+    if (!tableBody) return pipeline;
+    var dataSource = pipeline.getDataSource();
+    var rowHeight = (opt === null || opt === void 0 ? void 0 : opt.rowHeight) || 48;
+
+    var handleDragStrat = function handleDragStrat(event) {
+      var _a; // 开始拖拽
+
+
+      artTable.classList.add(cx(Classes.rowDragging));
+      (_a = opt === null || opt === void 0 ? void 0 : opt.onDragStart) === null || _a === void 0 ? void 0 : _a.call(opt, event);
+    };
+
+    var handleDragMove = function handleDragMove(event) {
+      var _a;
+
+      (_a = opt === null || opt === void 0 ? void 0 : opt.onDragMove) === null || _a === void 0 ? void 0 : _a.call(opt, event);
+      pipeline.setStateAtKey(rowDragKey, event);
+    };
+
+    var handleDragEnd = function handleDragEnd(event, isOutOfRange) {
+      var _a;
+
+      artTable.classList.remove(cx(Classes.rowDragging));
+      pipeline.setStateAtKey(rowDragKey, event); // 超出拖拽范围不触发dragend事件
+
+      if (!isOutOfRange) {
+        (_a = opt === null || opt === void 0 ? void 0 : opt.onDragEnd) === null || _a === void 0 ? void 0 : _a.call(opt, event);
+      }
+    };
+
+    var getDragEvent = function getDragEvent(startRowInfo, endRowInfo, _ref) {
+      var isFinished = _ref.isFinished,
+          _ref$dragPosition = _ref.dragPosition,
+          dragPosition = _ref$dragPosition === void 0 ? 'bottom' : _ref$dragPosition;
+      return {
+        startRowIndex: startRowInfo.rowIndex,
+        startRow: startRowInfo.row,
+        endRowIndex: endRowInfo.rowIndex,
+        endRow: endRowInfo.row,
+        dragPosition: dragPosition,
+        isFinished: isFinished
+      };
+    };
+
+    var updateScrollPosition = function updateScrollPosition(mouseMoveEvent) {
+      if (opt === null || opt === void 0 ? void 0 : opt.suppressScrollMove) return;
+      var clientY = mouseMoveEvent.clientY;
+      var tableBodyClientRect = tableBody.getBoundingClientRect();
+      var top = tableBodyClientRect.top,
+          height = tableBodyClientRect.height;
+
+      if (clientY + SCROLL_OFFSET >= top + height) {
+        pipeline.ref.current.domHelper.tableBody.scrollTop += SCROLL_OFFSET;
+      }
+
+      if (clientY + SCROLL_OFFSET <= top) {
+        pipeline.ref.current.domHelper.tableBody.scrollTop -= SCROLL_OFFSET;
+      }
+    };
+
+    var onMouseDown = function onMouseDown(mouseDownEvent) {
+      var _a;
+
+      var startRowInfo = getTargetRowInfo(mouseDownEvent.target, tableBody, dataSource);
+      var endRowInfo = startRowInfo;
+      if (!startRowInfo || startRowInfo.code !== rowDragColumn.code) return;
+      if ((_a = opt === null || opt === void 0 ? void 0 : opt.isDisabled) === null || _a === void 0 ? void 0 : _a.call(opt, startRowInfo.row, startRowInfo.rowIndex)) return; // 默认拖拽插入的位置是向下
+
+      var dragPosition = 'bottom';
+      var isOutOfRange = false;
+      var dragStartEvent = getDragEvent(startRowInfo, endRowInfo, {
+        isFinished: false,
+        dragPosition: 'bottom'
+      });
+      handleDragStrat(dragStartEvent);
+      var tableWidth = tableBody.clientWidth;
+      var startRowRects = startRowInfo.cell.getBoundingClientRect(); // 光标位置距离初始拖拽行的偏移量
+
+      var startOffset = mouseDownEvent.clientY - startRowRects.top;
+      var dragElement = createDragElement(startRowRects, tableWidth, rowHeight); // 可拖拽的范围
+
+      var dragRange = getDragRange(tableBody, {
+        startOffset: startOffset,
+        rowHeight: rowHeight
+      });
+      var mousePosition = {
+        x: mouseDownEvent.clientX,
+        y: mouseDownEvent.clientY
+      };
+      var mousemove$ = fromEvent(window, 'mousemove');
+      var mouseup$ = fromEvent(window, 'mouseup');
+
+      var scrollCallback = function scrollCallback(event) {
+        // 在当前表格内滚动不处理
+        if (event.target === tableBody) return;
+        dragRange = getDragRange(tableBody, {
+          startOffset: startOffset,
+          rowHeight: rowHeight
+        });
+        var isOutOfRange = isOutOfDragRange(mousePosition, dragRange);
+        updateCurSorStyle(isOutOfRange);
+      };
+
+      document.addEventListener('scroll', scrollCallback, true);
+      var rowDrag$ = mousemove$.pipe(map(function (mouseMoveEvent) {
+        var clientX = mouseMoveEvent.clientX,
+            clientY = mouseMoveEvent.clientY;
+        var tagretRow = getTargetRowInfo(mouseMoveEvent.target, tableBody, dataSource);
+
+        if (tagretRow) {
+          endRowInfo = tagretRow;
+        }
+
+        var targetRowRects = endRowInfo.cell.getBoundingClientRect(); // 判断拖拽插入的位置，拖拽框上边框位于目标行之上则向上插入，否则向下插入
+
+        var isMoveToTop = clientY - startOffset < targetRowRects.top;
+        dragPosition = isMoveToTop ? 'top' : 'bottom';
+        isOutOfRange = isOutOfDragRange({
+          x: clientX,
+          y: clientY
+        }, dragRange);
+        mousePosition = {
+          x: clientX,
+          y: clientY
+        };
+        updateScrollPosition(mouseMoveEvent); // 拖拽到底时让滚动条可以滚动
+
+        updateDragElementPosition(dragElement, dragRange, {
+          x: clientX,
+          y: clientY,
+          startOffset: startOffset
+        });
+        updateCurSorStyle(isOutOfRange);
+        return {
+          startRowInfo: startRowInfo,
+          endRowInfo: endRowInfo,
+          dragPosition: dragPosition
+        };
+      }), takeUntil(mouseup$));
+      rowDrag$.subscribe({
+        next: function next(_ref2) {
+          var startRowInfo = _ref2.startRowInfo,
+              endRowInfo = _ref2.endRowInfo,
+              dragPosition = _ref2.dragPosition;
+          var dragMoveEvent = getDragEvent(startRowInfo, endRowInfo, {
+            isFinished: false,
+            dragPosition: dragPosition
+          });
+          handleDragMove(dragMoveEvent);
+        },
+        complete: function complete() {
+          var dragEndEvent = getDragEvent(startRowInfo, endRowInfo, {
+            isFinished: true,
+            dragPosition: dragPosition
+          });
+          handleDragEnd(dragEndEvent, isOutOfRange);
+          removeDragElement(dragElement);
+          removeCurSorStyle();
+          document.removeEventListener('scroll', scrollCallback, true);
+        }
+      });
+    };
+
+    var rowDragColumn = (opt === null || opt === void 0 ? void 0 : opt.rowDragColumn) || defaultRowDragColumn;
+    pipeline.setFeatureOptions('rowDragColumnKey', rowDragColumn.code);
+
+    var nextColumns = _sliceInstanceProperty(_context = pipeline.getColumns()).call(_context);
+
+    nextColumns.unshift(rowDragColumn);
+    pipeline.columns(nextColumns);
+    pipeline.addTableProps({
+      onMouseDown: onMouseDown
+    });
+    pipeline.appendRowPropsGetter(function (row, rowIndex) {
+      var _cx;
+
+      var rowDragEvent = pipeline.getStateAtKey(rowDragKey) || {};
+      var startRowIndex = rowDragEvent.startRowIndex,
+          endRowIndex = rowDragEvent.endRowIndex,
+          isFinished = rowDragEvent.isFinished,
+          dragPosition = rowDragEvent.dragPosition;
+      var isFooterCell = row[pipeline.getFeatureOptions('footerRowMetaKey')];
+      if (isFooterCell || isFinished || rowIndex !== startRowIndex && rowIndex !== endRowIndex) return;
+      var className = cx((_cx = {}, _defineProperty(_cx, Classes.rowDragStart, rowIndex === startRowIndex), _defineProperty(_cx, Classes.rowDragEnd, rowIndex === endRowIndex), _defineProperty(_cx, Classes.rowDragEndToTop, rowIndex === endRowIndex && dragPosition === 'top'), _defineProperty(_cx, Classes.rowDragEndToBottom, rowIndex === endRowIndex && dragPosition === 'bottom'), _cx));
+      return {
+        className: className
+      };
+    });
+    return pipeline;
+  };
+}
+
+function getTargetRowInfo(target, tableBody, record) {
+  while (target && tableBody.contains(target)) {
+    if (target.getAttribute('data-role') === 'table-cell') {
+      var code = target.getAttribute('data-code');
+      var rowIndex = parseInt(target.getAttribute('data-rowindex'));
+      var row = record[rowIndex];
+      var isFooterCell = isEleInFooter(target);
+      if (!row || isFooterCell) return null;
+      return {
+        rowIndex: rowIndex,
+        row: row,
+        code: code,
+        cell: target
+      };
+    }
+
+    target = target.parentElement;
+  }
+
+  return null;
+}
+
+function isEleInFooter(target) {
+  while (target && !target.classList.contains(Classes.artTable)) {
+    if (target.classList.contains(Classes.tableFooter)) {
+      return true;
+    }
+
+    target = target.parentElement;
+  }
+
+  return false;
+}
+
+function createDragElement(rects, tableWidth, rowHeight) {
+  var _context2, _context3, _context4;
+
+  var x = rects.x,
+      y = rects.y;
+  var dragMoveElement = document.createElement('div');
+  dragMoveElement.className = cx(Classes.rowDragElement);
+  dragMoveElement.style.cssText = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = "position:fixed;z-index:9999;left:".concat(x, "px;top:")).call(_context4, y, "px;pointer-events:none;width:")).call(_context3, tableWidth, "px;height:")).call(_context2, rowHeight, "px;background:var(--primary-color);opacity: 0.1;");
+  document.body.appendChild(dragMoveElement);
+  return dragMoveElement;
+}
+
+function updateDragElementPosition(element, dragRange, _ref3) {
+  var x = _ref3.x,
+      y = _ref3.y,
+      startOffset = _ref3.startOffset;
+  var validPosition = getValidPosition({
+    x: x,
+    y: y
+  }, dragRange);
+  element.style.top = validPosition.y - startOffset + 'px';
+  return element;
+}
+
+function removeDragElement(element) {
+  document.body.removeChild(element);
+}
+
+function updateCurSorStyle(isOutOfRange) {
+  if (isOutOfRange) {
+    document.body.style.cursor = 'no-drop';
+  } else {
+    document.body.style.cursor = 'move';
+  }
+}
+
+function removeCurSorStyle() {
+  document.body.style.cursor = 'default';
+}
+
+function getDragRange(tableBody, _ref4) {
+  var startOffset = _ref4.startOffset,
+      rowHeight = _ref4.rowHeight;
+  var tableBodyClientRect = tableBody.getBoundingClientRect();
+  var height = tableBodyClientRect.height,
+      width = tableBodyClientRect.width,
+      top = tableBodyClientRect.top,
+      left = tableBodyClientRect.left;
+  return {
+    minX: left,
+    maxX: left + width,
+    minY: top - rowHeight + startOffset,
+    maxY: top + height + startOffset
+  };
+}
+
+function getValidPosition(position, dragRange) {
+  var x = position.x,
+      y = position.y;
+  var minX = dragRange.minX,
+      maxX = dragRange.maxX,
+      minY = dragRange.minY,
+      maxY = dragRange.maxY;
+  var newX = x < minX ? minX : x > maxX ? maxX : x;
+  var newY = y < minY ? minY : y > maxY ? maxY : y;
+  return {
+    x: newX,
+    y: newY
+  };
+}
+
+function isOutOfDragRange(position, dragRange) {
+  var x = position.x,
+      y = position.y;
+  var minX = dragRange.minX,
+      maxX = dragRange.maxX,
+      minY = dragRange.minY,
+      maxY = dragRange.maxY;
+  return x > maxX || x < minX || y > maxY || y < minY;
+}

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

@@ -1,15 +1,16 @@
+import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import React from 'react';
 import { internals } from '../../internals';
 import { always } from '../../utils/others';
-import { mergeCellProps } from '../../utils';
+import { mergeCellProps, SINGLE_SELECT_MARK_PROPNAME } from '../../utils';
 export function singleSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function singleSelectStep(pipeline) {
     var _context;
 
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
 
     var Radio = pipeline.ctx.components.Radio;
 
@@ -80,12 +81,13 @@ export function singleSelect() {
             onChange(rowKey);
           } : undefined
         });
-      }
+      },
+      features: _extends(_extends({}, (_e = opts.radioColumn) === null || _e === void 0 ? void 0 : _e.features), _defineProperty({}, SINGLE_SELECT_MARK_PROPNAME, true))
     });
 
     var nextColumns = _sliceInstanceProperty(_context = pipeline.getColumns()).call(_context);
 
-    var radioPlacement = (_e = opts.radioPlacement) !== null && _e !== void 0 ? _e : 'start';
+    var radioPlacement = (_f = opts.radioPlacement) !== null && _f !== void 0 ? _f : 'start';
 
     if (radioPlacement === 'start') {
       nextColumns.unshift(radioColumn);

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

@@ -71,6 +71,11 @@ export function treeMode() {
     return pipeline.mapDataSource(processDataSource).mapColumns(processColumns);
 
     function processDataSource(input) {
+      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys')) {
+        return pipeline.getFeatureOptions('lastTreeMode');
+      }
+
+      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey));
       var result = [];
       dfs(input, 0);
 
@@ -111,6 +116,7 @@ export function treeMode() {
         }
       }
 
+      pipeline.setFeatureOptions('lastTreeMode', result);
       return result;
     }
 

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

@@ -35,6 +35,7 @@ export declare class TablePipeline {
     private readonly _rowPropsGetters;
     private _tableProps;
     private _dataSource;
+    private _isSameInputDataSource;
     private _columns;
     private _footerDataSource?;
     static defaultIndents: TablePipelineIndentsConfig;
@@ -51,6 +52,7 @@ export declare class TablePipeline {
     appendRowPropsGetter(getter: RowPropsGetter): this;
     addTableProps(props: React.HTMLAttributes<HTMLTableElement>): void;
     getDataSource(name?: string): any[];
+    isSameInputDataSource(): boolean;
     getColumns(name?: string): any[];
     getFooterDataSource(): any[];
     getStateAtKey<T = any>(stateKey: string, defaultValue?: T): T;

package/es/table/pipeline/pipeline.js

@@ -76,6 +76,11 @@ export var TablePipeline = /*#__PURE__*/function () {
         return this._snapshots[name].dataSource;
       }
     }
+  }, {
+    key: "isSameInputDataSource",
+    value: function isSameInputDataSource() {
+      return this._isSameInputDataSource;
+    }
   }, {
     key: "getColumns",
     value: function getColumns(name) {
@@ -127,9 +132,12 @@ export var TablePipeline = /*#__PURE__*/function () {
 
       if (this._dataSource != null || this._columns != null) {
         throw new Error('input 不能调用两次');
-      }
+      } // 在 pipeline 中识别本次更新是否有数据变化
+
 
+      this._isSameInputDataSource = _input.dataSource === this.ref.current._lastInputDataSource;
       this._dataSource = _input.dataSource;
+      this.ref.current._lastInputDataSource = _input.dataSource;
       this._columns = _mapInstanceProperty(_context = _input.columns).call(_context, function (col) {
         return _extends(_extends({}, col), {
           key: _this.guid()

package/es/table/utils/index.d.ts

@@ -17,3 +17,4 @@ export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
 export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

package/es/table/utils/index.js

@@ -16,4 +16,5 @@ export { copyDataToClipboard, executeOnTempElement } from './copyToClipboard';
 export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
-export { browserType } from './browserType';
+export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

package/es/table/utils/selectColumn.d.ts

@@ -0,0 +1,4 @@
+import { ArtColumn } from '../interfaces';
+export declare const MULTI_SELECT_MARK_PROPNAME = "checkboxSelection";
+export declare const SINGLE_SELECT_MARK_PROPNAME = "radioSelection";
+export declare function isSelectColumn(column: ArtColumn): boolean;

package/es/table/utils/selectColumn.js

@@ -0,0 +1,6 @@
+export var MULTI_SELECT_MARK_PROPNAME = 'checkboxSelection';
+export var SINGLE_SELECT_MARK_PROPNAME = 'radioSelection';
+export function isSelectColumn(column) {
+  var features = column.features || {};
+  return features[MULTI_SELECT_MARK_PROPNAME] === true || features[SINGLE_SELECT_MARK_PROPNAME] === true;
+}

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

@@ -4,6 +4,7 @@ interface TableHeaderProps {
     info: RenderInfo;
     theaderPosition?: 'left' | 'center' | 'right';
     rowCount?: number;
+    stickyRightOffset?: number;
 }
-export default function TableHeader({ info, theaderPosition, rowCount: _rowCount }: TableHeaderProps): JSX.Element;
+export default function TableHeader({ info, theaderPosition, rowCount: _rowCount, stickyRightOffset }: TableHeaderProps): JSX.Element;
 export {};

package/lib/table/base/header.js

@@ -249,7 +249,8 @@ function TableHeader(_ref2) {
 
   var info = _ref2.info,
       theaderPosition = _ref2.theaderPosition,
-      _rowCount = _ref2.rowCount;
+      _rowCount = _ref2.rowCount,
+      stickyRightOffset = _ref2.stickyRightOffset;
   var nested = info.nested,
       flat = (0, _flat.default)(info),
       stickyLeftMap = info.stickyLeftMap,
@@ -293,7 +294,8 @@ function TableHeader(_ref2) {
           positionStyle.left = stickyLeftMap.get(colIndex);
         } else if (colIndex >= fullFlatCount - rightFlatCount) {
           positionStyle.position = 'sticky';
-          positionStyle.right = stickyRightMap.get(colIndex);
+          var stickyRightIndex = colSpan > 1 ? colIndex + colSpan - 1 : colIndex;
+          positionStyle.right = stickyRightMap.get(stickyRightIndex) + stickyRightOffset;
         }
 
         var justifyContent = col.align === 'right' ? 'flex-end' : col.align === 'center' ? 'center' : 'flex-start';

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

@@ -107,7 +107,9 @@ var TableDOMHelper = /*#__PURE__*/function () {
     this.tableFooter = this.artTable.querySelector(".".concat(_styles.Classes.tableFooter));
     this.tableFooterMain = this.artTable.querySelector(".".concat(_styles.Classes.tableFooterMain));
     var stickyScrollSelector = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = ".".concat(_styles.Classes.artTable, " + .")).call(_context3, _styles.Classes.horizontalStickyScrollContainer, " .")).call(_context2, _styles.Classes.stickyScroll);
-    this.stickyScroll = artTableWrapper.querySelector(stickyScrollSelector);
+    var stickyScrolls = artTableWrapper.querySelectorAll(stickyScrollSelector);
+    this.stickyScroll = stickyScrolls[stickyScrolls.length - 1]; // 当嵌套多层表格时，需要查找最后一个，否则会查找到父表格内嵌套的子表格的
+
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(_styles.Classes.stickyScrollItem));
   }
 

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/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) - (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
+      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)({