@kdcloudjs/table 1.2.1-canary.6 → 1.2.1-canary.7-hotfix.1

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

@@ -21,34 +21,26 @@ export function rangeSelection(opts) {
     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;
-
     if (!tableBody) {
       return pipeline;
     }
-
     var columns = pipeline.getColumns();
     var dataSource = pipeline.getDataSource();
-
     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, isFinished);
     };
-
     var setRangeSelection = function setRangeSelection(startDragCell, draggingCell, isFinished) {
       if (!startDragCell || !draggingCell) return;
       var rangeColumns = getRangeColumns(startDragCell, draggingCell, columns);
-
       var _getRangeSelectionRow = getRangeSelectionRowInfo(startDragCell, draggingCell, dataSource),
-          startRow = _getRangeSelectionRow.startRow,
-          endRow = _getRangeSelectionRow.endRow,
-          footerRowRange = _getRangeSelectionRow.footerRowRange;
-
+        startRow = _getRangeSelectionRow.startRow,
+        endRow = _getRangeSelectionRow.endRow,
+        footerRowRange = _getRangeSelectionRow.footerRowRange;
       var cellRange = {
         startRow: startRow,
         endRow: endRow,
@@ -57,32 +49,25 @@ export function rangeSelection(opts) {
         footerRowRange: footerRowRange
       };
       var cellRanges = pipeline.getFeatureOptions(startSelectedCellRangesKey) ? _toConsumableArray(pipeline.getFeatureOptions(startSelectedCellRangesKey)) : [];
-
       if (isCellRangeSingleCell([cellRange])) {
         var singleCellRangeId = getCellRangeId(cellRange);
         cellRanges = _filterInstanceProperty(cellRanges).call(cellRanges, function (item) {
           return getCellRangeId(item) !== singleCellRangeId;
         });
       }
-
       cellRanges.push(cellRange);
-
       if (isCellRangeSingleCell(cellRanges)) {
         artTable.classList.remove(cx(Classes.rangeSelection));
       } else {
         artTable.classList.add(cx(Classes.rangeSelection));
       }
-
       rangeSelectedChange(cellRanges, isFinished);
     };
-
     var shiftKeySelect = function shiftKeySelect(event) {
       var target = event.target;
       var clickCell = getTargetCell(target, columns);
-
       if (clickCell) {
         var _lastClickCell = pipeline.getFeatureOptions(lastClickCellKey);
-
         if (_lastClickCell) {
           setRangeSelection(_lastClickCell, clickCell, true);
         } else {
@@ -91,71 +76,58 @@ export function rangeSelection(opts) {
         }
       }
     };
-
     var updateScrollPosition = function updateScrollPosition(client) {
       var clientX = client.clientX,
-          clientY = client.clientY;
+        clientY = client.clientY;
       var tableBodyClientRect = tableBody.getBoundingClientRect();
       var left = tableBodyClientRect.left,
-          top = tableBodyClientRect.top,
-          height = tableBodyClientRect.height,
-          width = tableBodyClientRect.width;
-
+        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_OFFSET <= left) {
         pipeline.ref.current.domHelper.virtual.scrollLeft -= SCROLL_OFFSET;
       }
-
       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 setStartSelectedCellRanges = function setStartSelectedCellRanges(isCtrlKey, isShiftKey) {
       if (opts === null || opts === void 0 ? void 0 : opts.suppressMultiRangeSelection) {
         pipeline.setFeatureOptions(startSelectedCellRangesKey, []);
         return;
-      } // ctrl 和shift 同时按时，优先生效shift
+      }
+      // ctrl 和shift 同时按时，优先生效shift
       // 没有点击ctrl 或者shift时，每次点击开始时都清空选中范围
-
-
       if (!isCtrlKey && !isShiftKey) {
         pipeline.setFeatureOptions(startSelectedCellRangesKey, []);
-      } // shift 点击框选，要保留之前的选中结果。最新的框选范围覆盖最后一次的框选范围
-
-
+      }
+      // shift 点击框选，要保留之前的选中结果。最新的框选范围覆盖最后一次的框选范围
       if (isShiftKey) {
         var _startDragCellRanges = pipeline.getFeatureOptions(startSelectedCellRangesKey) ? _toConsumableArray(pipeline.getFeatureOptions(startSelectedCellRangesKey)) : [];
-
         _startDragCellRanges.pop();
-
         pipeline.setFeatureOptions(startSelectedCellRangesKey, _startDragCellRanges);
       }
     };
-
     var onMouseDown = function onMouseDown(mouseDownEvent) {
-      if (mouseDownEvent.button !== 0 || !(isElementInEventPath(tableBody, mouseDownEvent.nativeEvent) || isElementInEventPath(tableFooter, mouseDownEvent.nativeEvent))) return; // mouseDownEvent.preventDefault()
-
+      if (mouseDownEvent.button !== 0 || !(isElementInEventPath(tableBody, mouseDownEvent.nativeEvent) || isElementInEventPath(tableFooter, mouseDownEvent.nativeEvent))) return;
+      // mouseDownEvent.preventDefault()
       var isCtrlKey = mouseDownEvent.ctrlKey || mouseDownEvent.metaKey;
       var isShiftKey = mouseDownEvent.shiftKey;
       var target = mouseDownEvent.target;
       var startDragCell = getTargetCell(target, columns);
-      if (!startDragCell) return; // 每次点击时先确认初始生效的框选范围
-
+      if (!startDragCell) return;
+      // 每次点击时先确认初始生效的框选范围
       setStartSelectedCellRanges(isCtrlKey, isShiftKey);
-
       if (isShiftKey) {
         shiftKeySelect(mouseDownEvent);
         return;
       }
-
       pipeline.setFeatureOptions(lastClickCellKey, startDragCell);
       var draggingCell = startDragCell;
       var mousemove$ = fromEvent(window, 'mousemove');
@@ -167,11 +139,9 @@ export function rangeSelection(opts) {
           clientX: mouseMoveEvent.clientX,
           clientY: mouseMoveEvent.clientY
         };
-
         if (!(draggingCell === null || draggingCell === void 0 ? void 0 : draggingCell.isFooterCell)) {
           updateScrollPosition(client);
         }
-
         return {
           startDragCell: startDragCell,
           draggingCell: draggingCell
@@ -180,7 +150,7 @@ export function rangeSelection(opts) {
       rangeSelected$.subscribe({
         next: function next(_ref) {
           var startDragCell = _ref.startDragCell,
-              draggingCell = _ref.draggingCell;
+            draggingCell = _ref.draggingCell;
           setRangeSelection(startDragCell, draggingCell, false);
         },
         complete: function complete() {
@@ -188,14 +158,12 @@ export function rangeSelection(opts) {
         }
       });
     };
-
     var onKeyDown = function onKeyDown(e) {
       if (!(isElementInEventPath(tableBody, e.nativeEvent) || isElementInEventPath(tableFooter, e.nativeEvent))) return;
-
       if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
         var rowLen = pipeline.getDataSource().length;
-        var footerDataSource = pipeline.getFooterDataSource() || []; // 焦点位于可编辑的单元格内不做全选
-
+        var footerDataSource = pipeline.getFooterDataSource() || [];
+        // 焦点位于可编辑的单元格内不做全选
         if (columns.length && rowLen && !getElementEditable(e.target)) {
           opts.preventkDefaultOfKeyDownEvent !== false && e.preventDefault();
           artTable.classList.add(cx(Classes.rangeSelection));
@@ -212,13 +180,11 @@ export function rangeSelection(opts) {
         }
       }
     };
-
     pipeline.addTableProps({
       onMouseDown: onMouseDown,
       onKeyDown: onKeyDown,
       tabIndex: -1
     }); // todo: 后面可以把mousedown放到一个流里面
-
     return pipeline.mapColumns(makeRecursiveMapper(function (col) {
       var cellRanges = pipeline.getStateAtKey(rangeSelectionKey) || [];
       var prevGetCellProps = col.getCellProps;
@@ -243,7 +209,6 @@ export function rangeSelection(opts) {
     }));
   };
 }
-
 function getTargetCell(target, columns) {
   while (target) {
     if (target.getAttribute('data-role') === 'table-cell') {
@@ -265,60 +230,46 @@ function getTargetCell(target, columns) {
           }
         };
       }();
-
       if (_typeof(_ret) === "object") return _ret.v;
     }
-
     target = target.parentElement;
   }
-
   return null;
 }
-
 function isSameCell(cell1, cell2) {
   return cell1.rowIndex === cell2.rowIndex && cell1.code === cell2.code && cell1.isFooterCell === cell2.isFooterCell;
 }
-
 function isEleInFooter(target) {
   while (target && !target.classList.contains(Classes.artTable)) {
     if (target.classList.contains(Classes.tableFooter)) {
       return true;
     }
-
     target = target.parentElement;
   }
-
   return false;
 }
-
 function getRangeColumns(startCell, endCell, columns) {
   var flatColumns = collectNodes(columns, 'leaf-only');
-
   var startIndex = _findIndexInstanceProperty(flatColumns).call(flatColumns, function (col) {
     return col.code === startCell.code;
   });
-
   var endIndex = _findIndexInstanceProperty(flatColumns).call(flatColumns, function (col) {
     return col.code === endCell.code;
   });
-
   if (startIndex < endIndex) {
     return _sliceInstanceProperty(flatColumns).call(flatColumns, startIndex, endIndex + 1);
   } else {
     return _sliceInstanceProperty(flatColumns).call(flatColumns, endIndex, startIndex + 1);
   }
 }
-
 function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
   var footerRowRange = null;
   var startRow = -1;
   var endRow = -1;
-
   var _getCellRangeRow = getCellRangeRow(startCell, endCell),
-      _startRow = _getCellRangeRow.startRow,
-      _endRow = _getCellRangeRow.endRow; // 两个单元格都在表体
-
-
+    _startRow = _getCellRangeRow.startRow,
+    _endRow = _getCellRangeRow.endRow;
+  // 两个单元格都在表体
   if (!startCell.isFooterCell && !endCell.isFooterCell) {
     startRow = _startRow;
     endRow = _endRow;
@@ -346,7 +297,6 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
       };
     }
   }
-
   return {
     startRow: startRow,
     endRow: endRow,
@@ -359,8 +309,6 @@ function getRangeSelectionRowInfo(startCell, endCell, dataSource) {
  * @param endCell 结束单元格
  * @returns
  */
-
-
 function getCellRangeRow(startCell, endCell) {
   if (isSameCell(startCell, endCell)) {
     return {
@@ -368,7 +316,6 @@ function getCellRangeRow(startCell, endCell) {
       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;
@@ -382,20 +329,17 @@ function getCellRangeRow(startCell, endCell) {
  * @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;
+    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;
 }
-
 function getRowIndex(startRow, endRow) {
   var isReverse = startRow > endRow;
   var startRowIndex = isReverse ? endRow : startRow;
@@ -405,23 +349,18 @@ function getRowIndex(startRow, endRow) {
     endRowIndex: endRowIndex
   };
 }
-
 function getFooterRowIndex(footerRowRange) {
   if (footerRowRange) {
     return getRowIndex(footerRowRange.startRow, footerRowRange.endRow);
   }
-
   return {
     startRowIndex: -1,
     endRowIndex: -1
   };
 }
-
 function getElementEditable(target) {
   var _context;
-
   if (!target) return;
-
   if (_includesInstanceProperty(_context = ['input', 'textarea']).call(_context, target.tagName.toLowerCase())) {
     if (target.type === 'checkbox') return;
     return !target.disabled && !target.readOnly;
@@ -435,26 +374,21 @@ function getElementEditable(target) {
  * @param isFooterCell
  * @returns
  */
-
-
 function isCellInRange(cellRange, rowIndex, col, isFooterCell) {
   var startRow = cellRange.startRow,
-      endRow = cellRange.endRow,
-      columns = cellRange.columns,
-      footerRowRange = cellRange.footerRowRange;
+    endRow = cellRange.endRow,
+    columns = cellRange.columns,
+    footerRowRange = cellRange.footerRowRange;
   var isColInRanges = _findIndexInstanceProperty(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;
-
+    startRowIndex = _getRowIndex.startRowIndex,
+    endRowIndex = _getRowIndex.endRowIndex;
   var _getFooterRowIndex = getFooterRowIndex(footerRowRange),
-      footerStartRowIndex = _getFooterRowIndex.startRowIndex,
-      footerEndRowIndex = _getFooterRowIndex.endRowIndex;
-
+    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;
@@ -465,22 +399,17 @@ function isCellInRange(cellRange, rowIndex, col, isFooterCell) {
  * @param {*} cellRange
  * @returns
  */
-
-
 export function getCellRangeId(cellRange) {
   var startRow = cellRange.startRow,
-      endRow = cellRange.endRow,
-      footerRowRange = cellRange.footerRowRange,
-      columns = cellRange.columns;
-
+    endRow = cellRange.endRow,
+    footerRowRange = cellRange.footerRowRange,
+    columns = cellRange.columns;
   var _getRowIndex2 = getRowIndex(startRow, endRow),
-      startRowIndex = _getRowIndex2.startRowIndex,
-      endRowIndex = _getRowIndex2.endRowIndex;
-
+    startRowIndex = _getRowIndex2.startRowIndex,
+    endRowIndex = _getRowIndex2.endRowIndex;
   var _getFooterRowIndex2 = getFooterRowIndex(footerRowRange),
-      footerStartRowIndex = _getFooterRowIndex2.startRowIndex,
-      footerEndRowIndex = _getFooterRowIndex2.endRowIndex;
-
+    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;
@@ -491,58 +420,50 @@ export function getCellRangeId(cellRange) {
  * @param param1
  * @returns
  */
-
 function getCellRangesClassName(cellRanges, _ref2) {
   var _cx;
-
   var isFooterCell = _ref2.isFooterCell,
-      rowIndex = _ref2.rowIndex,
-      col = _ref2.col,
-      record = _ref2.record;
-
+    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;
-
+      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 = cx((_cx = {}, _defineProperty(_cx, Classes.tableCellRangeSingleCell, isSingleCell), _defineProperty(_cx, Classes.tableCellRangeSelected, !isSingleCell), _defineProperty(_cx, Classes.tableCellRangeTop, !isSingleCell && matchCellRangeTop), _defineProperty(_cx, Classes.tableCellRangeLeft, !isSingleCell && matchCellRangeLeft), _defineProperty(_cx, Classes.tableCellRangeBottom, !isSingleCell && matchCellRangeBottom), _defineProperty(_cx, Classes.tableCellRangeRight, !isSingleCell && matchCellRangeRight), _cx));
   return className;
 }
-
 function getMatchBorderStyle(cellRanges, _ref3) {
   var isFooterCell = _ref3.isFooterCell,
-      rowIndex = _ref3.rowIndex,
-      col = _ref3.col,
-      record = _ref3.record;
+    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;
-
+      endRow = cellRange.endRow,
+      columns = cellRange.columns,
+      footerRowRange = cellRange.footerRowRange;
     var _getRowIndex3 = getRowIndex(startRow, endRow),
-        startRowIndex = _getRowIndex3.startRowIndex,
-        endRowIndex = _getRowIndex3.endRowIndex;
-
+      startRowIndex = _getRowIndex3.startRowIndex,
+      endRowIndex = _getRowIndex3.endRowIndex;
     var _getFooterRowIndex3 = getFooterRowIndex(footerRowRange),
-        footerStartRowIndex = _getFooterRowIndex3.startRowIndex,
-        footerEndRowIndex = _getFooterRowIndex3.endRowIndex;
-
+      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; // 如果样式已经匹配上了，就不需要再取计算的样式
-
+    var matchCellRangeRight = col.code === endCol.code;
+    // 如果样式已经匹配上了，就不需要再取计算的样式
     obj.matchCellRangeTop = obj.matchCellRangeTop || matchCellRangeTop;
     obj.matchCellRangeLeft = obj.matchCellRangeLeft || matchCellRangeLeft;
     obj.matchCellRangeBottom = obj.matchCellRangeBottom || matchCellRangeBottom;

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

@@ -18,9 +18,7 @@ import { always, flatMap } from '../../utils/others';
 import console from '../../utils/console';
 import getTableRenderTemplate from '../../base/renderTemplates';
 import { Classes } from '../../base';
-
 var rowDetailSymbol = _Symbol('row-detail');
-
 var fallbackRenderDetail = function fallbackRenderDetail() {
   return /*#__PURE__*/React.createElement("div", {
     style: {
@@ -32,14 +30,11 @@ var fallbackRenderDetail = function fallbackRenderDetail() {
     }
   }, "\u8BBE\u7F6E ", /*#__PURE__*/React.createElement("code", null, "rowDetail.renderDetail"), " \u6765\u81EA\u5B9A\u4E49\u8BE6\u60C5\u5185\u5BB9"));
 };
-
 export function rowDetail() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return function rowDetailStep(pipeline) {
     var _context, _context2;
-
     var _a, _b, _c, _d, _e, _f, _g, _h;
-
     var stateKey = 'rowDetail';
     var rowDetailMetaKey = (_a = opts.rowDetailMetaKey) !== null && _a !== void 0 ? _a : rowDetailSymbol;
     var primaryKey = pipeline.ensurePrimaryKey('rowDetail');
@@ -54,33 +49,26 @@ export function rowDetail() {
     var openKeys = (_h = (_g = (_f = opts.openKeys) !== null && _f !== void 0 ? _f : pipeline.getStateAtKey(stateKey)) !== null && _g !== void 0 ? _g : opts.defaultOpenAll ? _mapInstanceProperty(_context = _filterInstanceProperty(_context2 = pipeline.getDataSource()).call(_context2, hasDetail)).call(_context, function (row, rowIndex) {
       return internals.safeGetRowKey(primaryKey, row, rowIndex);
     }) : opts.defaultOpenKeys) !== null && _h !== void 0 ? _h : [];
-
     var onChangeOpenKeys = function onChangeOpenKeys(nextKeys, key, action) {
       var _a;
-
       (_a = opts.onChangeOpenKeys) === null || _a === void 0 ? void 0 : _a.call(opts, nextKeys, key, action);
       pipeline.setStateAtKey(stateKey, nextKeys, {
         key: key,
         action: action
       });
     };
-
     var openKeySet = new _Set(openKeys);
-
     var toggle = function toggle(rowKey) {
       var expanded = openKeySet.has(rowKey);
-
       if (expanded) {
         onChangeOpenKeys(_filterInstanceProperty(openKeys).call(openKeys, function (key) {
           return key !== rowKey;
         }), rowKey, 'collapse');
       } else {
         var _context3;
-
         onChangeOpenKeys(_concatInstanceProperty(_context3 = []).call(_context3, _toConsumableArray(openKeys), [rowKey]), rowKey, 'expand');
       }
     };
-
     var detailPrimaryKey = typeof primaryKey === 'string' ? primaryKey : rowDetailMetaKey.toString() + 'PrimaryKey';
     return pipeline.dataSource(flatMap(pipeline.getDataSource(), function (row, rowIndex) {
       if (openKeySet.has(internals.safeGetRowKey(primaryKey, row, rowIndex))) {
@@ -96,35 +84,27 @@ export function rowDetail() {
         };
       }
     });
-
     function processColumns(columns) {
       if (columns.length === 0) {
         return columns;
       }
-
       var expandColumnIndex = 0;
-
       if (opts.expandColumnCode) {
         expandColumnIndex = _findIndexInstanceProperty(columns).call(columns, function (col) {
           return col.code === opts.expandColumnCode;
         });
-
         if (expandColumnIndex < 0) {
           console.warn('没找到可展开的列，请检查设置的展开列code');
           return columns;
         }
       }
-
       var expandCol = columns[expandColumnIndex];
-
       var tableColumns = _toConsumableArray(columns);
-
       var render = function render(value, row, rowIndex) {
         if (row[rowDetailMetaKey]) {
           // 第一列内容已经渲染
           if (expandColumnIndex !== 0) return;
           var renderRowDetail = getTableRenderTemplate('rowDetail');
-
           if (typeof renderRowDetail === 'function') {
             return renderRowDetail({
               row: row,
@@ -133,12 +113,9 @@ export function rowDetail() {
               renderDetail: renderDetail
             });
           }
-
           return renderDetail(row, rowIndex);
         }
-
         var content = internals.safeRender(expandCol, row, rowIndex);
-
         if (!hasDetail(row, rowIndex)) {
           return /*#__PURE__*/React.createElement(InlineFlexCell, {
             style: {
@@ -146,18 +123,14 @@ export function rowDetail() {
             }
           }, content);
         }
-
         var rowKey = internals.safeGetRowKey(primaryKey, row, rowIndex);
         var expanded = openKeySet.has(rowKey);
-
         var onClick = function onClick(e) {
           if (opts.stopClickEventPropagation) {
             e.stopPropagation();
           }
-
           toggle(rowKey);
         };
-
         var expandCls = expanded ? Classes.expanded : Classes.collapsed;
         var ExpandIcon = opts.expandIcon;
         return /*#__PURE__*/React.createElement(ExpansionCell, {
@@ -179,10 +152,8 @@ export function rowDetail() {
           onClick: clickArea === 'icon' ? onClick : undefined
         }), content);
       };
-
       var getCellProps = function getCellProps(value, row, rowIndex) {
         var _a;
-
         if (row[rowDetailMetaKey]) {
           return {
             style: _extends({
@@ -191,19 +162,15 @@ export function rowDetail() {
             }, opts.detailCellStyle)
           };
         }
-
         var prevProps = (_a = expandCol.getCellProps) === null || _a === void 0 ? void 0 : _a.call(expandCol, value, row, rowIndex);
-
         if (!hasDetail(row, rowIndex)) {
           return prevProps;
         }
-
         return mergeCellProps(prevProps, {
           onClick: function onClick(e) {
             if (opts.stopClickEventPropagation) {
               e.stopPropagation();
             }
-
             toggle(internals.safeGetRowKey(primaryKey, row, rowIndex));
           },
           style: {
@@ -211,15 +178,12 @@ export function rowDetail() {
           }
         });
       };
-
       var _tableColumns = _toArray(tableColumns),
-          firstCol = _tableColumns[0],
-          others = _sliceInstanceProperty(_tableColumns).call(_tableColumns, 1);
-
+        firstCol = _tableColumns[0],
+        others = _sliceInstanceProperty(_tableColumns).call(_tableColumns, 1);
       var firstColRender = function firstColRender(value, row, rowIndex) {
         if (row[rowDetailMetaKey]) {
           var renderRowDetail = getTableRenderTemplate('rowDetail');
-
           if (typeof renderRowDetail === 'function') {
             return renderRowDetail({
               row: row,
@@ -228,14 +192,11 @@ export function rowDetail() {
               renderDetail: renderDetail
             });
           }
-
           return renderDetail(row, rowIndex);
         }
-
         var content = internals.safeRender(firstCol, row, rowIndex);
         return content;
       };
-
       tableColumns[0] = _extends(_extends({}, firstCol), {
         render: firstColRender,
         getSpanRect: function getSpanRect(value, row, rowIndex) {