@kdcloudjs/table 1.1.6 → 1.2.0-canary.2

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

@@ -7,15 +7,12 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getCellRangeId = getCellRangeId;
 exports.lastClickCellKey = void 0;
 exports.rangeSelection = rangeSelection;
 exports.rangeSelectionKey = void 0;
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 
@@ -23,6 +20,14 @@ var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stab
 
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
+
 var _utils = require("../../utils");
 
 var _others = require("../../utils/others");
@@ -39,10 +44,11 @@ var rangeSelectionKey = 'rangeSelection';
 exports.rangeSelectionKey = rangeSelectionKey;
 var lastClickCellKey = 'lastClickCell';
 exports.lastClickCellKey = lastClickCellKey;
+var startSelectedCellRangesKey = 'startSelectedCellRanges';
+var SCROLL_OFFSET = 30;
 
 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;
     var artTable = pipeline.ref.current.domHelper && pipeline.ref.current.domHelper.artTable;
@@ -54,14 +60,18 @@ function rangeSelection(opts) {
     var columns = pipeline.getColumns();
     var dataSource = pipeline.getDataSource();
 
-    var rangeSelectedChange = function rangeSelectedChange(rangeSelection) {
+    var rangeSelectedChange = function rangeSelectedChange(rangeSelection, isFinished) {
       var _a;
 
+      if (isFinished) {
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, rangeSelection);
+      }
+
       pipeline.setStateAtKey(rangeSelectionKey, rangeSelection);
-      (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection);
+      (_a = opts === null || opts === void 0 ? void 0 : opts.rangeSelectedChange) === null || _a === void 0 ? void 0 : _a.call(opts, rangeSelection, isFinished);
     };
 
-    var setRangeSelection = function setRangeSelection(startDragCell, draggingCell) {
+    var setRangeSelection = function setRangeSelection(startDragCell, draggingCell, isFinished) {
       if (!startDragCell || !draggingCell) return;
       var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
 
@@ -70,21 +80,31 @@ function rangeSelection(opts) {
           endRow = _getRangeSelectionRow.endRow,
           footerRowRange = _getRangeSelectionRow.footerRowRange;
 
-      var rangeSelection = {
+      var cellRange = {
         startRow: startRow,
         endRow: endRow,
         columns: rangeColumns,
         startColumn: startDragCell.column,
         footerRowRange: footerRowRange
       };
+      var cellRanges = pipeline.getFeatureOptions(startSelectedCellRangesKey) ? (0, _toConsumableArray2.default)(pipeline.getFeatureOptions(startSelectedCellRangesKey)) : [];
+
+      if (isCellRangeSingleCell([cellRange])) {
+        var singleCellRangeId = getCellRangeId(cellRange);
+        cellRanges = (0, _filter.default)(cellRanges).call(cellRanges, function (item) {
+          return getCellRangeId(item) !== singleCellRangeId;
+        });
+      }
+
+      cellRanges.push(cellRange);
 
-      if (isCellRangeSingleCell(rangeSelection)) {
+      if (isCellRangeSingleCell(cellRanges)) {
         artTable.classList.remove((0, _classnames.default)(_styles.Classes.rangeSelection));
       } else {
         artTable.classList.add((0, _classnames.default)(_styles.Classes.rangeSelection));
       }
 
-      rangeSelectedChange(rangeSelection);
+      rangeSelectedChange(cellRanges, isFinished);
     };
 
     var shiftKeySelect = function shiftKeySelect(event) {
@@ -92,76 +112,110 @@ function rangeSelection(opts) {
       var clickCell = getTargetCell(target, columns);
 
       if (clickCell) {
-        if (event.shiftKey) {
-          var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
-
-          if (_lastClickCell) {
-            setRangeSelection(_lastClickCell, clickCell);
-          } else {
-            // 第一次进来就按住shift键，这时候要记住点击的单元格
-            pipeline.setFeatureOptions(lastClickCellKey, clickCell);
-          }
+        var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
+
+        if (_lastClickCell) {
+          setRangeSelection(_lastClickCell, clickCell, true);
         } else {
+          // 第一次进来就按住shift键，这时候要记住点击的单元格
           pipeline.setFeatureOptions(lastClickCellKey, clickCell);
-          setRangeSelection(clickCell, clickCell);
         }
       }
     };
 
-    var onMouseDown = function onMouseDown(mouseDownEvent) {
-      if (mouseDownEvent.button !== 0 || !((0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
-      // shift + 点击选中
-
-      shiftKeySelect(mouseDownEvent);
-      if (mouseDownEvent.shiftKey) return;
-      var target = mouseDownEvent.target;
-      var startDragCell = getTargetCell(target, columns);
-      var mousemove$ = (0, _rxjs.fromEvent)(window, 'mousemove');
-      var mouseup$ = (0, _rxjs.fromEvent)(window, 'mouseup');
+    var updateScrollPosition = function updateScrollPosition(client) {
+      var clientX = client.clientX,
+          clientY = client.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
+      var left = tableBodyClientRect.left,
+          top = tableBodyClientRect.top,
+          height = tableBodyClientRect.height,
+          width = tableBodyClientRect.width;
 
-      var updateScrollPosition = function updateScrollPosition(client) {
-        var clientX = client.clientX,
-            clientY = client.clientY;
-        var left = tableBodyClientRect.left,
-            top = tableBodyClientRect.top,
-            height = tableBodyClientRect.height,
-            width = tableBodyClientRect.width;
+      if (clientX + SCROLL_OFFSET >= left + width) {
+        pipeline.ref.current.domHelper.virtual.scrollLeft += SCROLL_OFFSET;
+      }
 
-        if (clientX + SCROLL_SIZE >= left + width) {
-          pipeline.ref.current.domHelper.virtual.scrollLeft += SCROLL_SIZE;
-        }
+      if (clientX - SCROLL_OFFSET <= left) {
+        pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_OFFSET;
+      }
 
-        if (clientX - SCROLL_SIZE <= left) {
-          pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_SIZE;
-        }
+      if (clientY + SCROLL_OFFSET >= top + height) {
+        pipeline.ref.current.domHelper.tableBody.scrollTop += SCROLL_OFFSET;
+      }
 
-        if (clientY + SCROLL_SIZE >= top + height) {
-          pipeline.ref.current.domHelper.tableBody.scrollTop += SCROLL_SIZE;
-        }
+      if (clientY + SCROLL_OFFSET <= top) {
+        pipeline.ref.current.domHelper.tableBody.scrollTop -= SCROLL_OFFSET;
+      }
+    };
 
-        if (clientY + SCROLL_SIZE <= top) {
-          pipeline.ref.current.domHelper.tableBody.scrollTop -= SCROLL_SIZE;
-        }
-      };
+    var setStartSelectedCellRanges = function setStartSelectedCellRanges(isCtrlKey, isShiftKey) {
+      if (opts === null || opts === void 0 ? void 0 : opts.suppressMultiRangeSelection) {
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, []);
+        return;
+      } // ctrl 和shift 同时按时，优先生效shift
+      // 没有点击ctrl 或者shift时，每次点击开始时都清空选中范围
+
+
+      if (!isCtrlKey && !isShiftKey) {
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, []);
+      } // shift 点击框选，要保留之前的选中结果。最新的框选范围覆盖最后一次的框选范围
+
+
+      if (isShiftKey) {
+        var _startDragCellRanges = pipeline.getFeatureOptions(startSelectedCellRangesKey) ? (0, _toConsumableArray2.default)(pipeline.getFeatureOptions(startSelectedCellRangesKey)) : [];
+
+        _startDragCellRanges.pop();
+
+        pipeline.setFeatureOptions(startSelectedCellRangesKey, _startDragCellRanges);
+      }
+    };
 
+    var onMouseDown = function onMouseDown(mouseDownEvent) {
+      if (mouseDownEvent.button !== 0 || !((0, _utils.isElementInEventPath)(tableBody, mouseDownEvent.nativeEvent) || (0, _utils.isElementInEventPath)(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
+
+      var isCtrlKey = mouseDownEvent.ctrlKey || mouseDownEvent.metaKey;
+      var isShiftKey = mouseDownEvent.shiftKey;
+      var target = mouseDownEvent.target; // 每次点击时先确认初始生效的框选范围
+
+      setStartSelectedCellRanges(isCtrlKey, isShiftKey);
+
+      if (isShiftKey) {
+        shiftKeySelect(mouseDownEvent);
+        return;
+      }
+
+      var startDragCell = getTargetCell(target, columns);
+      pipeline.setFeatureOptions(lastClickCellKey, startDragCell);
+      var draggingCell = startDragCell;
+      var mousemove$ = (0, _rxjs.fromEvent)(window, 'mousemove');
+      var mouseup$ = (0, _rxjs.fromEvent)(window, 'mouseup');
       var rangeSelected$ = mousemove$.pipe((0, _mapInstanceProperty(_operators))(function (mouseMoveEvent) {
         var target = mouseMoveEvent.target || mouseMoveEvent.srcElement;
-        var draggingCell = getTargetCell(target, columns);
+        draggingCell = getTargetCell(target, columns);
         var client = {
           clientX: mouseMoveEvent.clientX,
           clientY: mouseMoveEvent.clientY
         };
-        updateScrollPosition(client);
+
+        if (!(draggingCell === null || draggingCell === void 0 ? void 0 : draggingCell.isFooterCell)) {
+          updateScrollPosition(client);
+        }
+
         return {
           startDragCell: startDragCell,
           draggingCell: draggingCell
         };
       }), (0, _operators.takeUntil)(mouseup$));
-      rangeSelected$.subscribe(function (_ref) {
-        var startDragCell = _ref.startDragCell,
-            draggingCell = _ref.draggingCell;
-        setRangeSelection(startDragCell, draggingCell);
+      rangeSelected$.subscribe({
+        next: function next(_ref) {
+          var startDragCell = _ref.startDragCell,
+              draggingCell = _ref.draggingCell;
+          setRangeSelection(startDragCell, draggingCell, false);
+        },
+        complete: function complete() {
+          setRangeSelection(startDragCell, draggingCell, true);
+        }
       });
     };
 
@@ -175,7 +229,7 @@ function rangeSelection(opts) {
         if (columns.length && rowLen && !getElementEditable(e.target)) {
           opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
           artTable.classList.add((0, _classnames.default)(_styles.Classes.rangeSelection));
-          rangeSelectedChange({
+          rangeSelectedChange([{
             startRow: 0,
             endRow: rowLen - 1,
             columns: (0, _utils.collectNodes)(columns, 'leaf-only'),
@@ -184,7 +238,7 @@ function rangeSelection(opts) {
               startRow: 0,
               endRow: footerDataSource.length - 1
             } : null
-          });
+          }], true);
         }
       }
     };
@@ -197,41 +251,21 @@ function rangeSelection(opts) {
     }); // todo: 后面可以把mousedown放到一个流里面
 
     return pipeline.mapColumns((0, _utils.makeRecursiveMapper)(function (col) {
-      var _context;
-
-      var rangeSelection = pipeline.getStateAtKey(rangeSelectionKey);
-      if (!rangeSelection || (0, _findIndex.default)(_context = rangeSelection.columns).call(_context, function (selectedCol) {
-        return selectedCol.code === col.code;
-      }) === -1) return col;
+      var cellRanges = pipeline.getStateAtKey(rangeSelectionKey) || [];
       var prevGetCellProps = col.getCellProps;
       return (0, _extends2.default)((0, _extends2.default)({}, col), {
         getCellProps: function getCellProps(value, record, rowIndex) {
-          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;
-
-          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 isFooterCell = record[pipeline.getFeatureOptions('footerRowMetaKey')];
+          if (!cellRanges.some(function (cellRange) {
+            return isCellInRange(cellRange, rowIndex, col, isFooterCell);
+          })) return prevCellProps;
+          var className = getCellRangesClassName(cellRanges, {
+            isFooterCell: isFooterCell,
+            rowIndex: rowIndex,
+            col: col,
+            record: record
+          });
           return (0, _utils.mergeCellProps)(prevCellProps, {
             className: className
           });
@@ -258,7 +292,7 @@ function getTargetCell(target, columns) {
             rowSpan: parseInt(target.getAttribute('rowspan') || 1),
             code: columnCode,
             column: column,
-            isInFooter: isEleInFooter(target)
+            isFooterCell: isEleInFooter(target)
           }
         };
       }();
@@ -273,7 +307,7 @@ function getTargetCell(target, columns) {
 }
 
 function isSameCell(cell1, cell2) {
-  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isInFooter === cell2.isInFooter;
+  return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isFooterCell === cell2.isFooterCell;
 }
 
 function isEleInFooter(target) {
@@ -314,10 +348,10 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
       _endRow = _getCellRangeRow.endRow; // 两个单元格都在表体
 
 
-  if (!startCell.isInFooter && !endCell.isInFooter) {
+  if (!startCell.isFooterCell && !endCell.isFooterCell) {
     startRow = _startRow;
     endRow = _endRow;
-  } else if (startCell.isInFooter && endCell.isInFooter) {
+  } else if (startCell.isFooterCell && endCell.isFooterCell) {
     // 两个单元格都在表底
     footerRowRange = {
       startRow: _startRow,
@@ -325,7 +359,7 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
     };
   } else {
     // 一个单元格在表体，一个在表底
-    if (startCell.isInFooter) {
+    if (startCell.isFooterCell) {
       startRow = dataSource.length - 1;
       endRow = endCell.rowIndex;
       footerRowRange = {
@@ -348,6 +382,13 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
     footerRowRange: footerRowRange
   };
 }
+/**
+ * 获取框选范围的起始结束行
+ * @param startCell 起始单元格
+ * @param endCell 结束单元格
+ * @returns
+ */
+
 
 function getCellRangeRow(startCell, endCell) {
   if (isSameCell(startCell, endCell)) {
@@ -365,12 +406,20 @@ function getCellRangeRow(startCell, endCell) {
     endRow: endRow
   };
 }
-
-function isCellRangeSingleCell(rangeSelection) {
-  var startRow = rangeSelection.startRow,
-      endRow = rangeSelection.endRow,
-      columns = rangeSelection.columns,
-      footerRowRange = rangeSelection.footerRowRange;
+/**
+ * 框选范围是否只包含单个单元格
+ * @param cellRanges
+ * @returns
+ */
+
+
+function isCellRangeSingleCell(cellRanges) {
+  if (cellRanges.length !== 1) return false;
+  var _cellRanges$ = cellRanges[0],
+      startRow = _cellRanges$.startRow,
+      endRow = _cellRanges$.endRow,
+      columns = _cellRanges$.columns,
+      footerRowRange = _cellRanges$.footerRowRange;
   var isBodySingleCell = !footerRowRange && startRow === endRow && columns.length === 1;
   var isFooterSingleCell = startRow === -1 && footerRowRange.startRow === footerRowRange.endRow && columns.length === 1;
   return isBodySingleCell || isFooterSingleCell;
@@ -398,12 +447,141 @@ function getFooterRowIndex(footerRowRange) {
 }
 
 function getElementEditable(target) {
-  var _context2;
+  var _context;
 
   if (!target) return;
 
-  if ((0, _includes.default)(_context2 = ['input', 'textarea']).call(_context2, target.tagName.toLowerCase())) {
+  if ((0, _includes.default)(_context = ['input', 'textarea']).call(_context, target.tagName.toLowerCase())) {
     if (target.type === 'checkbox') return;
     return !target.disabled && !target.readOnly;
   }
+}
+/**
+ * 判断单元格是否在框选范围内
+ * @param cellRange
+ * @param rowIndex
+ * @param col
+ * @param isFooterCell
+ * @returns
+ */
+
+
+function isCellInRange(cellRange, rowIndex, col, isFooterCell) {
+  var startRow = cellRange.startRow,
+      endRow = cellRange.endRow,
+      columns = cellRange.columns,
+      footerRowRange = cellRange.footerRowRange;
+  var isColInRanges = (0, _findIndex.default)(columns).call(columns, function (item) {
+    return item.code === col.code;
+  }) !== -1;
+  if (!isColInRanges) return false;
+
+  var _getRowIndex = getRowIndex(startRow, endRow),
+      startRowIndex = _getRowIndex.startRowIndex,
+      endRowIndex = _getRowIndex.endRowIndex;
+
+  var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
+      footerStartRowIndex = _getFooterRowIndex.startRowIndex,
+      footerEndRowIndex = _getFooterRowIndex.endRowIndex;
+
+  var bodyMatch = !isFooterCell && rowIndex >= startRowIndex && rowIndex <= endRowIndex;
+  var footerMatch = isFooterCell && footerRowRange && rowIndex >= footerStartRowIndex && rowIndex <= footerEndRowIndex;
+  var isRowInRange = footerMatch || bodyMatch;
+  return isRowInRange;
+}
+/**
+ * 获取框选范围唯一标识
+ * @param {*} cellRange
+ * @returns
+ */
+
+
+function getCellRangeId(cellRange) {
+  var startRow = cellRange.startRow,
+      endRow = cellRange.endRow,
+      footerRowRange = cellRange.footerRowRange,
+      columns = cellRange.columns;
+
+  var _getRowIndex2 = getRowIndex(startRow, endRow),
+      startRowIndex = _getRowIndex2.startRowIndex,
+      endRowIndex = _getRowIndex2.endRowIndex;
+
+  var _getFooterRowIndex2 = getFooterRowIndex(footerRowRange),
+      footerStartRowIndex = _getFooterRowIndex2.startRowIndex,
+      footerEndRowIndex = _getFooterRowIndex2.endRowIndex;
+
+  var firstColId = columns[0].code;
+  var endColId = columns[columns.length - 1].code;
+  return startRowIndex + '_' + endRowIndex + '_' + footerStartRowIndex + '_' + footerEndRowIndex + '_' + firstColId + '_' + endColId;
+}
+/**
+ * 获取框选范围中单元格的样式
+ * @param cellRanges
+ * @param param1
+ * @returns
+ */
+
+
+function getCellRangesClassName(cellRanges, _ref2) {
+  var _cx;
+
+  var isFooterCell = _ref2.isFooterCell,
+      rowIndex = _ref2.rowIndex,
+      col = _ref2.col,
+      record = _ref2.record;
+
+  var _getMatchBorderStyle = getMatchBorderStyle(cellRanges, {
+    isFooterCell: isFooterCell,
+    rowIndex: rowIndex,
+    col: col,
+    record: record
+  }),
+      matchCellRangeTop = _getMatchBorderStyle.matchCellRangeTop,
+      matchCellRangeLeft = _getMatchBorderStyle.matchCellRangeLeft,
+      matchCellRangeBottom = _getMatchBorderStyle.matchCellRangeBottom,
+      matchCellRangeRight = _getMatchBorderStyle.matchCellRangeRight;
+
+  var isSingleCell = isCellRangeSingleCell(cellRanges);
+  var className = (0, _classnames.default)((_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSingleCell, isSingleCell), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeSelected, !isSingleCell), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeTop, !isSingleCell && matchCellRangeTop), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeLeft, !isSingleCell && matchCellRangeLeft), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeBottom, !isSingleCell && matchCellRangeBottom), (0, _defineProperty2.default)(_cx, _styles.Classes.tableCellRangeRight, !isSingleCell && matchCellRangeRight), _cx));
+  return className;
+}
+
+function getMatchBorderStyle(cellRanges, _ref3) {
+  var isFooterCell = _ref3.isFooterCell,
+      rowIndex = _ref3.rowIndex,
+      col = _ref3.col,
+      record = _ref3.record;
+  return cellRanges.reduce(function (obj, cellRange) {
+    if (!isCellInRange(cellRange, rowIndex, col, isFooterCell)) return obj;
+    var startRow = cellRange.startRow,
+        endRow = cellRange.endRow,
+        columns = cellRange.columns,
+        footerRowRange = cellRange.footerRowRange;
+
+    var _getRowIndex3 = getRowIndex(startRow, endRow),
+        startRowIndex = _getRowIndex3.startRowIndex,
+        endRowIndex = _getRowIndex3.endRowIndex;
+
+    var _getFooterRowIndex3 = getFooterRowIndex(footerRowRange),
+        footerStartRowIndex = _getFooterRowIndex3.startRowIndex,
+        footerEndRowIndex = _getFooterRowIndex3.endRowIndex;
+
+    var startCol = columns[0];
+    var endCol = columns[columns.length - 1];
+    var matchCellRangeTop = isFooterCell ? startRowIndex !== -1 ? false : rowIndex === footerStartRowIndex : rowIndex === startRowIndex;
+    var matchCellRangeLeft = col.code === startCol.code;
+    var matchCellRangeBottom = isFooterCell ? rowIndex === footerEndRowIndex : footerRowRange ? false : rowIndex === endRowIndex;
+    var matchCellRangeRight = col.code === endCol.code; // 如果样式已经匹配上了，就不需要再取计算的样式
+
+    obj.matchCellRangeTop = obj.matchCellRangeTop || matchCellRangeTop;
+    obj.matchCellRangeLeft = obj.matchCellRangeLeft || matchCellRangeLeft;
+    obj.matchCellRangeBottom = obj.matchCellRangeBottom || matchCellRangeBottom;
+    obj.matchCellRangeRight = obj.matchCellRangeRight || matchCellRangeRight;
+    return obj;
+  }, {
+    matchCellRangeTop: false,
+    matchCellRangeLeft: false,
+    matchCellRangeBottom: false,
+    matchCellRangeRight: false
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/table",
-  "version": "1.1.6",
+  "version": "1.2.0-canary.2",
   "description": "金蝶 react table 组件",
   "title": "table",
   "keywords": [
@@ -54,8 +54,8 @@
     "test:update": "jest --config .jest.js --cache=false -u",
     "test:ci": "jest --config .jest.js  --coverage --ci --update-snapshot",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --skip-unstable",
-    "pub": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
-    "pub:beta": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=beta",
+    "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
+    "pub:canary": "npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=canary",
     "new": "node scripts/create-component.js",
     "kd-ui": "npm install @kingdee-ui/kui --registry http://npm.kingdee.com/"
   },