@kdcloudjs/table 1.2.0-canary.9 → 1.2.0

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

@@ -9,7 +9,9 @@ exports.multiSelect = multiSelect;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
@@ -23,14 +25,10 @@ var _others = require("../../utils/others");
 
 var _utils = require("../../utils");
 
-var fullRowsSetKey = 'fullRowsSetKey';
-var allEnableKeys = 'allEnableKeys';
-var selectValueSetKey = 'selectValueSetKey';
-
 function multiSelect() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function multiSelectStep(pipeline) {
-    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;
@@ -57,8 +55,9 @@ function multiSelect() {
         action: action
       });
     };
-    /** dataSource 中包含的所有 keys */
 
+    var dataSource = pipeline.getDataSource();
+    /** dataSource 中包含的所有 keys */
 
     var fullKeySet = new _set.default();
     /** 所有有效的 keys（disable 状态为 false） */
@@ -68,7 +67,7 @@ function multiSelect() {
     var isAllChecked = set.size !== 0; // 当前不存在选中则默认为false
 
     var isAnyChecked = false;
-    var flatDataSource = (0, _utils.collectNodes)(pipeline.getDataSource());
+    var flatDataSource = (0, _utils.collectNodes)(dataSource);
     flatDataSource.forEach(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
@@ -97,8 +96,6 @@ function multiSelect() {
         checked: isAllChecked,
         indeterminate: !isAllChecked && isAnyChecked,
         onChange: function onChange(_) {
-          var allKeys = pipeline.getFeatureOptions(allEnableKeys);
-
           if (isAllChecked) {
             _onChange(_others.arrayUtils.diff(value, allKeys), '', allKeys, 'uncheck-all');
           } else {
@@ -107,7 +104,7 @@ function multiSelect() {
         }
       });
 
-      var checkboxColumn = (0, _extends2.default)((0, _extends2.default)({
+      var checkboxColumn = (0, _extends3.default)((0, _extends3.default)({
         name: '是否选中',
         title: defaultCheckboxColumnTitle,
         width: 50,
@@ -120,11 +117,9 @@ function multiSelect() {
 
           var checkboxCellProps = {};
           var preCellProps = (_b = (_a = opts.checkboxColumn) === null || _a === void 0 ? void 0 : _a.getCellProps) === null || _b === void 0 ? void 0 : _b.call(_a, value, row, rowIndex);
-          var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _set.default();
-          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
 
-          if (fullRowsSet.has(rowKey) && clickArea === 'cell') {
-            var prevChecked = selectValueSet.has(rowKey);
+          if (fullKeySet.has(rowKey) && clickArea === 'cell') {
+            var prevChecked = set.has(rowKey);
             var disabled = isDisabled(row, rowIndex);
             checkboxCellProps = {
               style: {
@@ -149,8 +144,7 @@ function multiSelect() {
 
           var key = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-          var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
-          var checked = selectValueSet.has(key);
+          var checked = set.has(key);
           return /*#__PURE__*/_react.default.createElement(Checkbox, {
             checked: checked,
             disabled: isDisabled(row, rowIndex),
@@ -171,10 +165,11 @@ function multiSelect() {
               }
             } : undefined
           });
-        }
+        },
+        features: (0, _extends3.default)((0, _extends3.default)({}, (_l = opts.checkboxColumn) === null || _l === void 0 ? void 0 : _l.features), (0, _defineProperty2.default)({}, _utils.MULTI_SELECT_MARK_PROPNAME, true))
       });
       var nextColumns = (0, _slice.default)(_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);
@@ -188,9 +183,7 @@ function multiSelect() {
     pipeline.appendRowPropsGetter(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
-      var fullRowsSet = pipeline.getFeatureOptions(fullRowsSetKey) || new _set.default();
-
-      if (!fullRowsSet.has(rowKey)) {
+      if (!fullKeySet.has(rowKey)) {
         // rowKey 不在 fullKeySet 中说明这一行是在 multiSelect 之后才生成的，multiSelect 不对之后生成的行进行处理
         return;
       }
@@ -198,8 +191,7 @@ function multiSelect() {
       var style = {};
       var className;
       var onClick;
-      var selectValueSet = pipeline.getFeatureOptions(selectValueSetKey) || new _set.default();
-      var checked = selectValueSet.has(rowKey);
+      var checked = set.has(rowKey);
 
       if (opts.highlightRowWhenSelected && checked) {
         className = 'highlight';
@@ -226,32 +218,22 @@ function multiSelect() {
         style: style,
         onClick: onClick
       };
-    }); // 只保留一份到pipeline， 避免行数据过多时内容被握住
-
-    pipeline.setFeatureOptions(fullRowsSetKey, fullKeySet);
-    pipeline.setFeatureOptions(allEnableKeys, allKeys);
-    pipeline.setFeatureOptions(selectValueSetKey, set);
-    fullKeySet = null;
-    allKeys = null;
-    set = null;
+    });
     return pipeline;
 
     function onCheckboxChange(prevChecked, key, batch) {
       var batchKeys = [key];
 
       if (batch && lastKey) {
-        var _allKeys = pipeline.getFeatureOptions(allEnableKeys);
-
-        var lastIdx = _allKeys.indexOf(lastKey);
-
-        var cntIdx = _allKeys.indexOf(key);
+        var lastIdx = allKeys.indexOf(lastKey);
+        var cntIdx = allKeys.indexOf(key);
 
         var _ref = lastIdx < cntIdx ? [lastIdx, cntIdx] : [cntIdx, lastIdx],
             _ref2 = (0, _slicedToArray2.default)(_ref, 2),
             start = _ref2[0],
             end = _ref2[1];
 
-        batchKeys = (0, _slice.default)(_allKeys).call(_allKeys, start, end + 1);
+        batchKeys = (0, _slice.default)(allKeys).call(allKeys, start, end + 1);
       }
 
       if (prevChecked) {

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

@@ -176,7 +176,9 @@ 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);
 
@@ -185,7 +187,6 @@ function rangeSelection(opts) {
         return;
       }
 
-      var startDragCell = getTargetCell(target, columns);
       pipeline.setFeatureOptions(lastClickCellKey, startDragCell);
       var draggingCell = startDragCell;
       var mousemove$ = (0, _rxjs.fromEvent)(window, 'mousemove');

package/lib/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/lib/table/pipeline/features/rowDrag.js

@@ -0,0 +1,371 @@
+"use strict";
+
+var _mapInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/map");
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ROW_DRAG_COLUMN_CODE = void 0;
+exports.rowDrag = rowDrag;
+exports.rowDragKey = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
+
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _rxjs = require("rxjs");
+
+var _operators = require("rxjs/operators");
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _styles = require("../../base/styles");
+
+var ROW_DRAG_COLUMN_CODE = '$_row_drag_column_&';
+exports.ROW_DRAG_COLUMN_CODE = ROW_DRAG_COLUMN_CODE;
+var rowDragKey = 'rowDragKey';
+exports.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: (0, _classnames.default)(_styles.Classes.rowDragCell)
+    };
+  },
+  render: function render(value, row, rowIndex) {
+    return /*#__PURE__*/_react.default.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.default.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'
+    }));
+  }
+};
+
+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((0, _classnames.default)(_styles.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((0, _classnames.default)(_styles.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$ = (0, _rxjs.fromEvent)(window, 'mousemove');
+      var mouseup$ = (0, _rxjs.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((0, _mapInstanceProperty(_operators))(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
+        };
+      }), (0, _operators.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 = (0, _slice.default)(_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 = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.rowDragStart, rowIndex === startRowIndex), (0, _defineProperty2.default)(_cx, _styles.Classes.rowDragEnd, rowIndex === endRowIndex), (0, _defineProperty2.default)(_cx, _styles.Classes.rowDragEndToTop, rowIndex === endRowIndex && dragPosition === 'top'), (0, _defineProperty2.default)(_cx, _styles.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(_styles.Classes.artTable)) {
+    if (target.classList.contains(_styles.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 = (0, _classnames.default)(_styles.Classes.rowDragElement);
+  dragMoveElement.style.cssText = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = (0, _concat.default)(_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/lib/table/pipeline/features/singleSelect.js

@@ -9,7 +9,9 @@ exports.singleSelect = singleSelect;
 
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _extends3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -24,7 +26,7 @@ function singleSelect() {
   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;
 
@@ -45,7 +47,7 @@ function singleSelect() {
       pipeline.setStateAtKey(stateKey, rowKey);
     };
 
-    var radioColumn = (0, _extends2.default)((0, _extends2.default)({
+    var radioColumn = (0, _extends3.default)((0, _extends3.default)({
       name: '',
       width: 50,
       align: 'center'
@@ -97,10 +99,11 @@ function singleSelect() {
             onChange(rowKey);
           } : undefined
         });
-      }
+      },
+      features: (0, _extends3.default)((0, _extends3.default)({}, (_e = opts.radioColumn) === null || _e === void 0 ? void 0 : _e.features), (0, _defineProperty2.default)({}, _utils.SINGLE_SELECT_MARK_PROPNAME, true))
     });
     var nextColumns = (0, _slice.default)(_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/lib/table/pipeline/features/treeMode.js

@@ -101,6 +101,11 @@ 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) || openKeys);
       var result = [];
       dfs(input, 0);
 
@@ -143,6 +148,7 @@ function treeMode() {
         }
       }
 
+      pipeline.setFeatureOptions('lastTreeMode', result);
       return result;
     }
 

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

@@ -92,6 +92,11 @@ var TablePipeline = /*#__PURE__*/function () {
         return this._snapshots[name].dataSource;
       }
     }
+  }, {
+    key: "isSameInputDataSource",
+    value: function isSameInputDataSource() {
+      return this._isSameInputDataSource;
+    }
   }, {
     key: "getColumns",
     value: function getColumns(name) {
@@ -143,9 +148,12 @@ 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 = (0, _map.default)(_context = _input.columns).call(_context, function (col) {
         return (0, _extends3.default)((0, _extends3.default)({}, col), {
           key: _this.guid()