@kdcloudjs/table 1.1.4-canary.1 → 1.1.4

package/lib/table/pipeline/features/filter/DefaultFilterContent.js

@@ -33,8 +33,6 @@ var _util = require("./util");
 
 var _styles = require("../../../base/styles");
 
-var _keyCode = _interopRequireDefault(require("../../../utils/keyCode"));
-
 var _templateObject;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -60,8 +58,6 @@ function DefaultFilterContent(_ref) {
       innerValue = _React$useState4[0],
       setInnerValue = _React$useState4[1];
 
-  var inputRef = (0, _react.useRef)();
-
   var handleClick = _react.default.useCallback(function (option) {
     setSelectedValue(option.key);
   }, []);
@@ -79,26 +75,10 @@ function DefaultFilterContent(_ref) {
     });
   };
 
-  var handleKeyDown = function handleKeyDown(e) {
-    if (e.keyCode === _keyCode.default.ENTER) {
-      confirm();
-    }
-  };
-
   (0, _react.useEffect)(function () {
     setSelectedValue((filterModel === null || filterModel === void 0 ? void 0 : filterModel.filterCondition) || 'contain');
     setInnerValue((filterModel === null || filterModel === void 0 ? void 0 : (0, _filter.default)(filterModel)) || '');
   }, [filterModel]);
-  (0, _react.useEffect)(function () {
-    // 兼容设置焦点后发生滚动
-    setTimeout(function () {
-      var _a;
-
-      (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus({
-        preventScroll: true
-      });
-    });
-  }, []);
   return /*#__PURE__*/_react.default.createElement(DefaultFilterContentStyle, null, /*#__PURE__*/_react.default.createElement("div", {
     className: 'filter-option-list'
   }, /*#__PURE__*/_react.default.createElement("ul", null, (0, _map.default)(_util.DEFAULT_FILTER_OPTIONS).call(_util.DEFAULT_FILTER_OPTIONS, function (option, index) {
@@ -120,9 +100,7 @@ function DefaultFilterContent(_ref) {
     value: innerValue,
     onChange: function onChange(e) {
       setInnerValue(e.target.value);
-    },
-    onKeyDown: handleKeyDown,
-    ref: inputRef
+    }
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: 'filter-footer'
   }, /*#__PURE__*/_react.default.createElement("button", {

package/lib/table/pipeline/features/filter/Filter.d.ts

@@ -6,7 +6,7 @@ interface FilterProps {
     size?: number;
     isFilterActive: boolean;
     FilterPanelContent?: FilterPanelType;
-    filterIcon?: ReactNode | ((filtered: boolean) => ReactNode);
+    filterIcon?: ReactNode;
     setFilterModel: DefaultFilterPanelProps['setFilterModel'];
     filterModel: DefaultFilterPanelProps['filterModel'];
     setFilter: CustomeFilterPanelProps['setFilter'];

package/lib/table/pipeline/features/filter/Filter.js

@@ -31,8 +31,6 @@ var _FilterPanel = _interopRequireDefault(require("./FilterPanel"));
 
 var _DefaultFilterContent = _interopRequireDefault(require("./DefaultFilterContent"));
 
-var _DefaultFilterIcon = _interopRequireDefault(require("./DefaultFilterIcon"));
-
 var _utils = require("../../../utils");
 
 var _utils2 = require("../../../base/utils");
@@ -45,7 +43,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var HEADER_ICON_OFFSET_Y = 8 + 1; // padding-top + border
+var HEADER_ICON_OFFSET_Y = 6 + 1; // padding-top + border
 
 var HEADER_ICON_OFFSET_X = 16 + 1; // padding-left+ border
 
@@ -121,6 +119,10 @@ function Filter(_ref2) {
     return setShowPanel(false);
   };
 
+  var handleMouseDown = function handleMouseDown(e) {
+    e.stopPropagation(); // 阻止触发拖拽
+  };
+
   var renderPanelContent = function renderPanelContent() {
     if (FilterPanelContent) {
       return /*#__PURE__*/_react.default.createElement(FilterPanelContent, {
@@ -140,12 +142,6 @@ function Filter(_ref2) {
   };
 
   var handleIconClick = function handleIconClick(e) {
-    // 只有当icon区域点击会触发面板展开
-    // 防止 createPortal 区域的点击触发该事件
-    if (!e.currentTarget.contains(e.target)) {
-      return;
-    }
-
     if (stopClickEventPropagation) {
       e.stopPropagation();
     }
@@ -154,20 +150,27 @@ function Filter(_ref2) {
   };
 
   var iconClassName = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, className, true), (0, _defineProperty2.default)(_cx, 'filter-panel-open', showPanel), _cx));
-  var displayFilterIcon = typeof filterIcon === 'function' ? filterIcon(isFilterActive) : filterIcon;
   return /*#__PURE__*/_react.default.createElement(FilterIconSpanStyle, {
     style: style,
     className: iconClassName,
-    onClick: handleIconClick
+    onMouseDown: handleMouseDown,
+    ref: iconRef
   }, /*#__PURE__*/_react.default.createElement("span", {
-    ref: iconRef,
-    className: _styles.Classes.filterIcon
-  }, displayFilterIcon || /*#__PURE__*/_react.default.createElement(_DefaultFilterIcon.default, {
+    className: _styles.Classes.filterIcon,
+    onClick: handleIconClick
+  }, filterIcon || /*#__PURE__*/_react.default.createElement("svg", {
     width: size,
-    height: size
-  })), showPanel && /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement(Panel, {
+    height: size,
+    viewBox: "64 64 896 896",
+    focusable: "false",
+    "data-icon": "filter",
+    fill: "currentColor",
+    "aria-hidden": "true"
+  }, /*#__PURE__*/_react.default.createElement("path", {
+    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
+  }))), showPanel && /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement(Panel, {
     ele: iconRef.current,
-    filterIcon: displayFilterIcon,
+    filterIcon: filterIcon,
     hidePanel: hidePanel,
     renderPanelContent: renderPanelContent
   }), document.body));

package/lib/table/pipeline/features/filter/FilterPanel.js

@@ -25,15 +25,13 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _utils = require("../../../utils/");
 
-var _DefaultFilterIcon = _interopRequireDefault(require("./DefaultFilterIcon"));
-
 var _templateObject;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var FilterPanelStyle = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n  max-height: 450px;\n  min-width: 160px;\n  border-radius: 2px;\n  background-color: #fff;\n  box-shadow: 0 0 5px 0 rgba(154,154,154,.5);\n  cursor: default;\n\n  .popup-header {\n    display: flex;\n    background-color: #ebedf1;\n\n    .popup-header-icon {\n      display: flex;\n      color:#666;\n      background-color: #fff;\n      padding: 8px 16px 8px 16px;\n      border-right: 1px solid transparent;\n      border-left: 1px solid transparent;\n      border-top: 1px solid transparent;\n      border-top-right-radius: 2px;\n      border-top-left-radius: 2px;\n    }\n  }\n\n  .popup-body {\n    display: flex;\n  }\n"])));
+var FilterPanelStyle = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  flex-direction: column;\n  max-height: 450px;\n  min-width: 160px;\n  border-radius: 2px;\n  background-color: #fff;\n  box-shadow: 0 0 5px 0 rgba(154,154,154,.5);\n  cursor: default;\n\n  .popup-header {\n    display: flex;\n    background-color: #ebedf1;\n\n    .popup-header-icon {\n      color:#666;\n      background-color: #fff;\n      padding: 6px 16px 6px 16px;\n      display: inline-block;\n      border-right: 1px solid transparent;\n      border-left: 1px solid transparent;\n      border-top: 1px solid transparent;\n      border-top-right-radius: 2px;\n      border-top-left-radius: 2px;\n    }\n  }\n\n  .popup-body {\n    display: flex;\n  }\n"])));
 
 var useWindowEvents = function useWindowEvents(func, evens) {
   _react.default.useEffect(function () {
@@ -75,36 +73,31 @@ function FilterPanel(_ref) {
     setPerfectPosition((0, _utils.keepWithinBounds)(document.body, ref.current, position.x, position.y, true));
     setVisible(true);
   }, [position]);
-  var hasPopupMouseEvent = (0, _react.useRef)(false);
-
-  var handleMouseEvent = function handleMouseEvent() {
-    // 当弹出的过滤面板内部发生鼠标按下、抬起事件时，标记当前事件，并在click捕获期清除标记，用来确定鼠标按下、抬起发生在过滤面板内部
-    // 利用了React.createPortal冒泡是根据React Tree的特性：
-    // https://jwwnz.medium.com/react-portals-and-event-bubbling-8df3e35ca3f1
-    hasPopupMouseEvent.current = true;
-  };
-
   useWindowEvents(function (e) {
-    !isContainPanel(e) && !hasPopupMouseEvent.current && onClose();
-    hasPopupMouseEvent.current = false;
-  }, ['click']);
+    return !isContainPanel(e) && onClose();
+  }, ['mousedown']);
   return /*#__PURE__*/_react.default.createElement(FilterPanelStyle, {
     style: (0, _extends2.default)((0, _extends2.default)({}, style), {
       left: visible ? perfectPosition.x : 0,
       top: visible ? perfectPosition.y : 0,
       opacity: visible ? 1 : 0
     }),
-    onMouseDown: handleMouseEvent,
-    onMouseUp: handleMouseEvent,
     ref: ref
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: 'popup-header'
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: 'popup-header-icon'
-  }, filterIcon || /*#__PURE__*/_react.default.createElement(_DefaultFilterIcon.default, {
-    width: 12,
-    height: 12
-  }))), /*#__PURE__*/_react.default.createElement("div", {
+  }, filterIcon || /*#__PURE__*/_react.default.createElement("svg", {
+    width: 14,
+    height: 14,
+    viewBox: "64 64 896 896",
+    focusable: "false",
+    "data-icon": "filter",
+    fill: "currentColor",
+    "aria-hidden": "true"
+  }, /*#__PURE__*/_react.default.createElement("path", {
+    d: "M349 838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3\n              31.8-32V642H349v196zm531.1-684H143.9c-24.5 0-39.8 26.7-27.5\n              48l221.3 376h348.8l221.3-376c12.1-21.3-3.2-48-27.7-48z"
+  })))), /*#__PURE__*/_react.default.createElement("div", {
     className: "popup-body"
   }, children));
 }

package/lib/table/pipeline/features/filter/util.js

@@ -22,7 +22,7 @@ var DEFAULT_FILTER_OPTIONS = [{
         data = data + '';
       }
 
-      return (0, _includes.default)(data).call(data, value[0]);
+      return (0, _includes.default)(data).call(data, value);
     };
   }
 }, {
@@ -38,7 +38,7 @@ var DEFAULT_FILTER_OPTIONS = [{
         data = data + '';
       }
 
-      return !(0, _includes.default)(data).call(data, value[0]);
+      return !(0, _includes.default)(data).call(data, value);
     };
   }
 }, {
@@ -46,7 +46,7 @@ var DEFAULT_FILTER_OPTIONS = [{
   key: 'equal',
   filter: function filter(value) {
     return function (data) {
-      return value[0] === data;
+      return value !== data;
     };
   }
 }, {
@@ -54,7 +54,7 @@ var DEFAULT_FILTER_OPTIONS = [{
   key: 'notEqual',
   filter: function filter(value) {
     return function (data) {
-      return value[0] !== data;
+      return value !== data;
     };
   }
 }, {

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

@@ -16,4 +16,3 @@ export { contextMenu, ContextMenuFeatureOptions } from './contextMenu';
 export { filter, FilterFeatureOptions } from './columnFilter';
 export { rangeSelection, RangeSelectionFeatureOptions } from './rangeSelection';
 export { mergeCellHover } from './mergeCellHover';
-export { footerDataSource, FooterDataSourceFeatureOptions, footerRowMetaSymbol } from './footerDataSource';

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

@@ -55,18 +55,6 @@ 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() {
@@ -168,6 +156,4 @@ var _columnFilter = require("./columnFilter");
 
 var _rangeSelection = require("./rangeSelection");
 
-var _mergeCellHover = require("./mergeCellHover");
-
-var _footerDataSource = require("./footerDataSource");
+var _mergeCellHover = require("./mergeCellHover");

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

@@ -61,8 +61,7 @@ function multiSelect() {
     /** 所有有效的 keys（disable 状态为 false） */
 
     var allKeys = [];
-    var flatDataSource = (0, _utils.collectNodes)(dataSource);
-    flatDataSource.forEach(function (row, rowIndex) {
+    dataSource.forEach(function (row, rowIndex) {
       var rowKey = _internals.internals.safeGetRowKey(primaryKey, row, rowIndex);
 
       fullKeySet.add(rowKey); // 在 allKeys 中排除被禁用的 key
@@ -131,10 +130,6 @@ 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 lastClickCellKey = "lastClickCell";
+export declare const lastClickCell = "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.lastClickCellKey = void 0;
+exports.lastClickCell = void 0;
 exports.rangeSelection = rangeSelection;
 exports.rangeSelectionKey = void 0;
 
@@ -35,44 +35,42 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var rangeSelectionKey = 'rangeSelection';
 exports.rangeSelectionKey = rangeSelectionKey;
-var lastClickCellKey = 'lastClickCell';
-exports.lastClickCellKey = lastClickCellKey;
+var lastClickCell = 'lastClickCell';
+exports.lastClickCell = lastClickCell;
 
 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) return;
+      if (!startDragCell || !draggingCell || isSameCell(startDragCell, draggingCell)) return;
       var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
-
-      var _getRangeSelectionRow = getRangeSelectionRowInfo(startDragCell, draggingCell, dataSource),
-          startRow = _getRangeSelectionRow.startRow,
-          endRow = _getRangeSelectionRow.endRow,
-          footerRowRange = _getRangeSelectionRow.footerRowRange;
-
+      var isTopToBottom = startDragCell.rowIndex <= draggingCell.rowIndex;
       var rangeSelection = {
-        startRow: startRow,
-        endRow: endRow,
+        startRow: isTopToBottom ? startDragCell.rowIndex : startDragCell.rowIndex + startDragCell.rowSpan - 1,
+        endRow: isTopToBottom ? draggingCell.rowIndex + draggingCell.rowSpan - 1 : draggingCell.rowIndex,
         columns: rangeColumns,
-        startColumn: startDragCell.column,
-        footerRowRange: footerRowRange
+        startColumn: startDragCell.column
       };
       rangeSelectedChange(rangeSelection);
     };
@@ -83,23 +81,23 @@ function rangeSelection(opts) {
 
       if (clickCell) {
         if (event.shiftKey) {
-          var _lastClickCell = pipeline.getStateAtKey(lastClickCellKey);
+          var _lastClickCell = pipeline.getStateAtKey(lastClickCell);
 
           if (_lastClickCell) {
             setRangeSelection(_lastClickCell, clickCell);
           } else {
             // 第一次进来就按住shift键，这时候要记住点击的单元格
-            pipeline.setStateAtKey(lastClickCellKey, clickCell);
+            pipeline.setStateAtKey(lastClickCell, clickCell);
           }
         } else {
-          pipeline.setStateAtKey(lastClickCellKey, clickCell);
-          setRangeSelection(clickCell, clickCell);
+          pipeline.setStateAtKey(lastClickCell, clickCell);
+          rangeSelectedChange(null);
         }
       }
     };
 
     var onMouseDown = function onMouseDown(mouseDownEvent) {
-      if (mouseDownEvent.button !== 0 || !((0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
+      if (mouseDownEvent.button !== 0 || !(0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent)) return; // mouseDownEvent.preventDefault()
       // shift + 点击选中
 
       shiftKeySelect(mouseDownEvent);
@@ -155,11 +153,10 @@ function rangeSelection(opts) {
     };
 
     var onKeyDown = function onKeyDown(e) {
-      if (!((0, _utils.isElementInEventPath)(tableBody, e.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, e.nativeEvent))) return;
+      if (!(0, _utils.isElementInEventPath)(tableBody, e.nativeEvent)) return;
 
       if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
         var rowLen = pipeline.getDataSource().length;
-        var footerDataSource = pipeline.getFooterDataSource() || [];
 
         if (columns.length && rowLen) {
           opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
@@ -167,11 +164,7 @@ function rangeSelection(opts) {
             startRow: 0,
             endRow: rowLen - 1,
             columns: columns,
-            startColumn: columns[0],
-            footerRowRange: footerDataSource.length > 0 ? {
-              startRow: 0,
-              endRow: footerDataSource.length - 1
-            } : null
+            startColumn: columns[0]
           });
         }
       }
@@ -180,8 +173,7 @@ function rangeSelection(opts) {
     pipeline.addTableProps({
       onMouseDown: onMouseDown,
       onKeyDown: onKeyDown,
-      tabIndex: -1,
-      className: (0, _classnames.default)([_styles.Classes.rangeSelection])
+      tabIndex: -1
     }); // todo: 后面可以把mousedown放到一个流里面
 
     return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col) {
@@ -197,29 +189,15 @@ 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,
-              footerRowRange = rangeSelection.footerRowRange;
-
-          var _getRowIndex = getRowIndex(startRow, endRow),
-              startRowIndex = _getRowIndex.startRowIndex,
-              endRowIndex = _getRowIndex.endRowIndex;
-
-          var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
-              footerStartRowIndex = _getFooterRowIndex.startRowIndex,
-              footerEndRowIndex = _getFooterRowIndex.endRowIndex;
-
+              columns = rangeSelection.columns;
+          var startIndex = startRow < endRow ? startRow : endRow;
+          var endIndex = startRow < endRow ? endRow : startRow;
           var startCol = columns[0];
           var endCol = columns[columns.length - 1];
-          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));
+          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));
           return (0, _utils.mergeCellProps)(prevCellProps, {
             className: className
           });
@@ -245,8 +223,7 @@ function getTargetCell(target, columns) {
             rowIndex: parseInt(target.getAttribute('data-rowindex')),
             rowSpan: parseInt(target.getAttribute('rowspan') || 1),
             code: columnCode,
-            column: column,
-            isInFooter: isEleInFooter(target)
+            column: column
           }
         };
       }();
@@ -261,19 +238,7 @@ function getTargetCell(target, columns) {
 }
 
 function isSameCell(cell1, cell2) {
-  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;
+  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code;
 }
 
 function getRangeColumns(startCell, endCell, columns) {
@@ -290,97 +255,4 @@ 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
-  };
 }

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

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