@kdcloudjs/table 1.2.0-canary.6 → 1.2.0-canary.6-hotfix.2

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

@@ -3,7 +3,8 @@ import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import { Classes } from '../styles'; // 表格 DOM 结构
+import { Classes } from '../styles';
+// 表格 DOM 结构
 // div.art-table-wrapper
 // └── div.art-loading-wrapper
 //     ├── div.art-loading-indicator-wrapper
@@ -40,39 +41,29 @@ import { Classes } from '../styles'; // 表格 DOM 结构
 // 在「可能存在嵌套表格」的情况下，我们可以采用以下的方式来避免「querySelector 不小心获取到了的嵌套表格上的元素」：
 //  artTable.querySelector('.art-lock-shadow-mask .art-left-lock-shadow')
 // 表格 DOM 结构辅助工具
-
 export var TableDOMHelper = /*#__PURE__*/function () {
   function TableDOMHelper(artTableWrapper) {
     var _this = this,
-        _context2;
-
+      _context2;
     _classCallCheck(this, TableDOMHelper);
-
     this.getRowNodeListByEvent = function (e) {
       var nodeList = null;
       var rowIndex = e.currentTarget.dataset.rowindex;
-
       if (rowIndex !== undefined) {
         var targetParent = _this.tableBody.contains(e.currentTarget) ? _this.tableBody : _this.tableFooter;
         nodeList = targetParent.querySelectorAll("tr[data-rowindex=\"".concat(rowIndex, "\"]"));
       }
-
       return nodeList;
     };
-
     this.getInRangeRowByCellEvent = function (e) {
       var _context;
-
       var _a;
-
       var getParentNode = function getParentNode(ele, target) {
         if (ele.parentNode.nodeName === target) {
           return ele.parentNode;
         }
-
         return getParentNode(ele.parentNode, target);
       };
-
       e = e instanceof Array ? e[0] : e;
       var curCell = e === null || e === void 0 ? void 0 : e.currentTarget;
       var curRow = getParentNode(curCell, 'TR');
@@ -80,7 +71,6 @@ export var TableDOMHelper = /*#__PURE__*/function () {
       var rows = (_a = getParentNode(curCell, 'TABLE')) === null || _a === void 0 ? void 0 : _a.rows;
       return _sliceInstanceProperty(_context = _Array$from(rows)).call(_context, curRow.rowIndex, curRow.rowIndex + curRowSpan);
     };
-
     this.artTableWrapper = artTableWrapper;
     this.artTable = artTableWrapper.querySelector(".".concat(Classes.artTable));
     this.tableHeader = this.artTable.querySelector(".".concat(Classes.tableHeader));
@@ -90,13 +80,10 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     this.tableElement = this.artTable.querySelector(".".concat(Classes.tableBody, " table"));
     this.tableFooter = this.artTable.querySelector(".".concat(Classes.tableFooter));
     this.tableFooterMain = this.artTable.querySelector(".".concat(Classes.tableFooterMain));
-
     var stickyScrollSelector = _concatInstanceProperty(_context2 = ".".concat(Classes.artTable, " + .")).call(_context2, Classes.stickyScroll);
-
     this.stickyScroll = artTableWrapper.querySelector(stickyScrollSelector);
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(Classes.stickyScrollItem));
   }
-
   _createClass(TableDOMHelper, [{
     key: "getVirtualTop",
     value: function getVirtualTop() {
@@ -106,7 +93,6 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     key: "getTableRows",
     value: function getTableRows() {
       var _context3;
-
       var tbody = this.artTable.querySelector(_concatInstanceProperty(_context3 = ".".concat(Classes.tableBody, " .")).call(_context3, Classes.virtual, " table tbody"));
       return tbody.childNodes;
     }
@@ -114,16 +100,13 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     key: "getTableBodyHtmlTable",
     value: function getTableBodyHtmlTable() {
       var _context4;
-
       return this.artTable.querySelector(_concatInstanceProperty(_context4 = ".".concat(Classes.tableBody, " .")).call(_context4, Classes.virtual, " table"));
     }
   }, {
     key: "getLeftLockShadow",
     value: function getLeftLockShadow() {
       var _context5;
-
       var selector = _concatInstanceProperty(_context5 = ".".concat(Classes.lockShadowMask, " .")).call(_context5, Classes.leftLockShadow);
-
       var allLeftLockShadow = this.artTable.querySelectorAll(selector);
       return allLeftLockShadow[allLeftLockShadow.length - 1]; // 当table-body、table-footer嵌套多层表格时，需要查找最后一个，否则会查找到嵌套表格的
     }
@@ -131,9 +114,7 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     key: "getRightLockShadow",
     value: function getRightLockShadow() {
       var _context6;
-
       var selector = _concatInstanceProperty(_context6 = ".".concat(Classes.lockShadowMask, " .")).call(_context6, Classes.rightLockShadow);
-
       var allRightLockShadow = this.artTable.querySelectorAll(selector);
       return allRightLockShadow[allRightLockShadow.length - 1]; // 当table-body、table-footer嵌套多层表格时，需要查找最后一个，否则会查找到嵌套表格的
     }
@@ -146,17 +127,13 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     key: "getRowTop",
     value: function getRowTop(rowIndex) {
       var _context7, _context8;
-
       if (rowIndex === 0) return 0;
-
       var selector = _concatInstanceProperty(_context7 = _concatInstanceProperty(_context8 = ".".concat(Classes.tableBody, " .")).call(_context8, Classes.tableRow, "[data-rowindex=\"")).call(_context7, rowIndex, "\"]");
-
       var row = this.artTable.querySelector(selector);
       var rowOffsetTop = row && row.offsetTop || 0;
       var tableOffsetTop = this.tableElement.offsetTop || 0;
       return rowOffsetTop + tableOffsetTop;
     }
   }]);
-
   return TableDOMHelper;
 }();

package/es/table/base/helpers/__test__/SpanManager.test.js

@@ -8,8 +8,8 @@ describe("".concat(NAME), function () {
   });
   it('test skip', function () {
     // 第二行，第一列跳过渲染
-    expect(spanManager.testSkip(1, 0)).toBe(true); // 第四行，第一列不跳过渲染
-
+    expect(spanManager.testSkip(1, 0)).toBe(true);
+    // 第四行，第一列不跳过渲染
     expect(spanManager.testSkip(3, 0)).toBe(false);
   });
   it('strip upwards span info', function () {

package/es/table/base/helpers/__test__/TableDOMUtils.test.js

@@ -7,7 +7,6 @@ describe("".concat(NAME), function () {
   var container;
   beforeAll(function () {
     var _context, _context2, _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17;
-
     container = document.createElement('div');
     container.innerHTML = _concatInstanceProperty(_context = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = _concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = _concatInstanceProperty(_context7 = _concatInstanceProperty(_context8 = _concatInstanceProperty(_context9 = _concatInstanceProperty(_context10 = _concatInstanceProperty(_context11 = _concatInstanceProperty(_context12 = _concatInstanceProperty(_context13 = _concatInstanceProperty(_context14 = _concatInstanceProperty(_context15 = _concatInstanceProperty(_context16 = _concatInstanceProperty(_context17 = "<div class='".concat(Classes.artTableWrapper, "'>\n          <div class='")).call(_context17, Classes.loadingWrapper, "'>\n              <div class='")).call(_context16, Classes.loadingIndicatorWrapper, "'>\n                <div class='")).call(_context15, Classes.loadingIndicator, "'></div>\n              </div>     \n              <div class='")).call(_context14, Classes.loadingContentWrapper, "'>\n                <div class='")).call(_context13, Classes.artTable, "'>\n                  <div class='")).call(_context12, Classes.tableHeader, "'>\n                    \n                  </div>\n                  <div class='")).call(_context11, Classes.tableBody, "'>\n                    <div class='")).call(_context10, Classes.virtual, "'>\n                      <div class='")).call(_context9, Classes.virtualBlank, " top'></div>\n                      <table></table>\n                      <div class='")).call(_context8, Classes.virtualBlank, " bottom'></div>\n                    </div>                   \n                  </div>\n                  <div class='")).call(_context7, Classes.tableFooter, "'>\n                  </div>\n                  <div class='")).call(_context6, Classes.lockShadowMask, "'>\n                    <div class='")).call(_context5, Classes.leftLockShadow, "'></div>\n                  </div>\n                  <div class='")).call(_context4, Classes.lockShadowMask, "'>\n                    <div class='")).call(_context3, Classes.rightLockShadow, "'></div>\n                  </div>\n                </div>\n                <div class='")).call(_context2, Classes.stickyScroll, "'>\n                  <div class='")).call(_context, Classes.stickyScrollItem, "'></div>\n                </div>\n              </div>    \n          </div>        \n      </div>");
     tableDOMHelper = new TableDOMHelper(container.querySelector(".".concat(Classes.artTableWrapper)));

package/es/table/base/helpers/getRichVisibleRectsStream.js

@@ -10,51 +10,39 @@ import ResizeObserver from 'resize-observer-polyfill';
 import { fromEvent, merge, Observable } from 'rxjs';
 import * as op from 'rxjs/operators';
 import { shallowEqual } from '../utils';
-
 function isWindow(arg) {
   return arg.toString() === '[object Window]' || arg.toString() === '[object global]';
 }
-
 function isBody(arg) {
   return getNodeName(arg) === 'body';
 }
-
 function isHtml(arg) {
   return getNodeName(arg) === 'html';
 }
-
 function isHtmlOrBody(arg) {
   return isHtml(arg) || isBody(arg);
-} // 计算从 start（子元素）到 stop（祖先元素）之间所有元素的 scrollTop 或 scrollLeft 的和
+}
+// 计算从 start（子元素）到 stop（祖先元素）之间所有元素的 scrollTop 或 scrollLeft 的和
 // 注意 start 和 stop 都是 INCLUSIVE 的，即两者的 scrollTop 或 scrollLeft 都会统计在内
-
-
 function accumulateScrollOffset(start, stop, scrollOffsetKey) {
   var result = 0;
   var elem = start;
-
   while (elem != null) {
     result += elem[scrollOffsetKey];
-
     if (elem === stop || isWindow(stop) && isHtmlOrBody(elem)) {
       break;
     }
-
     elem = elem.parentElement;
   }
-
   if (isWindow(stop)) {
     result += getWindowScroll(elem)[scrollOffsetKey];
   }
-
   return result;
 }
 /**
  * 获取 target 相对于 base 的布局大小和相对位置。
  * 注意该方法会考虑滚动所带来的影响
  */
-
-
 function getRelativeLayoutRect(base, target) {
   if (isWindow(target) || isHtmlOrBody(target)) {
     return {
@@ -64,27 +52,22 @@ function getRelativeLayoutRect(base, target) {
       bottom: window.innerHeight
     };
   }
-
   var deltaX = 0;
   var deltaY = 0;
   var elem = target;
-
   while (elem != null && elem != base) {
     deltaY += elem.offsetTop;
     deltaX += elem.offsetLeft;
     var offsetParent = getOffsetParent(elem);
     deltaY -= accumulateScrollOffset(elem.parentElement, offsetParent, 'scrollTop');
     deltaX -= accumulateScrollOffset(elem.parentElement, offsetParent, 'scrollLeft');
-
     if (isWindow(offsetParent)) {
       break;
     }
-
     deltaY += offsetParent.clientTop;
     deltaX += offsetParent.clientLeft;
     elem = offsetParent;
   }
-
   return {
     top: deltaY,
     bottom: deltaY + target.offsetHeight,
@@ -92,51 +75,40 @@ function getRelativeLayoutRect(base, target) {
     right: deltaX + target.offsetWidth
   };
 }
-
 function findCommonOffsetAncestor(target, scrollParent) {
   if (isWindow(scrollParent)) {
     return scrollParent;
   }
-
   var offsetParents = listOffsetParents(target);
-
   if (_includesInstanceProperty(offsetParents).call(offsetParents, scrollParent)) {
     return scrollParent;
   }
-
   return getOffsetParent(scrollParent);
-} // 列出 target 元素上层的所有 offset parents
-
-
+}
+// 列出 target 元素上层的所有 offset parents
 function listOffsetParents(target) {
   var result = [];
   var elem = target;
-
   while (true) {
     if (isWindow(elem)) {
       break;
     }
-
     elem = getOffsetParent(elem);
     result.push(elem);
   }
-
   return result;
 }
-
 function fromScrollEvent(element) {
   return fromEvent(element, 'scroll', {
     passive: true
   });
 }
-
 function fromResizeEvent(element) {
   if (isWindow(element)) {
     return fromEvent(element, 'resize', {
       passive: true
     });
   }
-
   return new Observable(function (subscriber) {
     var resizeObserver = new ResizeObserver(function (entries) {
       subscriber.next(entries);
@@ -147,29 +119,24 @@ function fromResizeEvent(element) {
     };
   });
 }
-
 function getScrollParent(elem) {
   var _context;
-
   if (_includesInstanceProperty(_context = ['html', 'body', '#document']).call(_context, getNodeName(elem))) {
     return getWindow(elem);
   }
-
   if (isHTMLElement(elem) && isScrollParent(elem)) {
     return elem;
   }
-
   return getScrollParent(getParentNode(elem));
-} // 获取 target 相对于「它的滚动父元素」的可见部分的大小与位置
-
-
+}
+// 获取 target 相对于「它的滚动父元素」的可见部分的大小与位置
 export function getRichVisibleRectsStream(target, structureMayChange$, virtualDebugLabel) {
   return structureMayChange$.pipe(op.startWith('init'), op.map(function () {
     // target 的第一个滚动父元素，我们认为这就是虚拟滚动发生的地方
     // 即虚拟滚动不考虑「更上层元素发生滚动」的情况
     // 直接从父元素开始查找，防止自身设置overflow属性导致是同一个元素
-    var scrollParent = getScrollParent(getParentNode(target)); // target 和 scrollParent 的共同 offset 祖先，作为布局尺寸计算时的参照元素
-
+    var scrollParent = getScrollParent(getParentNode(target));
+    // target 和 scrollParent 的共同 offset 祖先，作为布局尺寸计算时的参照元素
     var commonOffsetAncestor = findCommonOffsetAncestor(target, scrollParent);
     return {
       scrollParent: scrollParent,
@@ -181,7 +148,7 @@ export function getRichVisibleRectsStream(target, structureMayChange$, virtualDe
     }
   }), op.switchMap(function (_ref) {
     var scrollParent = _ref.scrollParent,
-        commonOffsetAncestor = _ref.commonOffsetAncestor;
+      commonOffsetAncestor = _ref.commonOffsetAncestor;
     var events$ = merge(fromScrollEvent(scrollParent), fromResizeEvent(scrollParent), fromResizeEvent(target));
     return events$.pipe(op.map(function (event) {
       return {
@@ -191,8 +158,8 @@ export function getRichVisibleRectsStream(target, structureMayChange$, virtualDe
       };
     }), op.map(function (_ref2) {
       var event = _ref2.event,
-          scrollParentRect = _ref2.scrollParentRect,
-          targetRect = _ref2.targetRect;
+        scrollParentRect = _ref2.scrollParentRect,
+        targetRect = _ref2.targetRect;
       return {
         event: event,
         targetRect: targetRect,

package/es/table/base/helpers/rowHeightManager.js

@@ -11,14 +11,11 @@ export function getFullRenderRange(rowCount) {
 }
 export function makeRowHeightManager(initRowCount, estimatedRowHeight) {
   var _context;
-
   var cache = _fillInstanceProperty(_context = new Array(initRowCount)).call(_context, estimatedRowHeight);
-
   function getRenderRange(offset, maxRenderHeight, rowCount) {
     if (cache.length !== rowCount) {
       setRowCount(rowCount);
     }
-
     if (maxRenderHeight <= 0) {
       // maxRenderHeight <= 0 说明表格目前在 viewport 之外
       if (offset <= 0) {
@@ -32,7 +29,6 @@ export function makeRowHeightManager(initRowCount, estimatedRowHeight) {
       // 表格与 viewport 相交
       return getRenderRangeWhenInView();
     }
-
     function getRenderRangeWhenBelowView() {
       var start = {
         topIndex: 0,
@@ -41,22 +37,18 @@ export function makeRowHeightManager(initRowCount, estimatedRowHeight) {
       var end = getEnd(0, start);
       return _extends(_extends({}, start), end);
     }
-
     function getRenderRangeWhenAboveView() {
       var totalSize = getEstimatedTotalSize(rowCount);
       var start = getStart(totalSize);
       var end = getEnd(totalSize, start);
       return _extends(_extends({}, start), end);
     }
-
     function getRenderRangeWhenInView() {
       var start = getStart(offset);
       var end = getEnd(offset + maxRenderHeight, start);
       return _extends(_extends({}, start), end);
     }
     /** 获取虚拟滚动在 开始位置上的信息 */
-
-
     function getStart(offset) {
       if (cache.length === 0) {
         return {
@@ -64,73 +56,56 @@ export function makeRowHeightManager(initRowCount, estimatedRowHeight) {
           topBlank: 0
         };
       }
-
       var topIndex = 0;
       var topBlank = 0;
-
       while (topIndex < cache.length) {
         var h = cache[topIndex];
-
         if (topBlank + h >= offset) {
           break;
         }
-
         topBlank += h;
         topIndex += 1;
       }
-
       return overscanUpwards(topIndex, topBlank);
     }
-
     function overscanUpwards(topIndex, topBlank) {
       var overscanSize = 0;
       var overscanCount = 0;
-
       while (overscanCount < topIndex && overscanSize < OVERSCAN_SIZE) {
         overscanCount += 1;
         overscanSize += cache[topIndex - overscanCount];
       }
-
       return {
         topIndex: topIndex - overscanCount,
         topBlank: topBlank - overscanSize
       };
     }
     /** 获取虚拟滚动 在结束位置上的信息 */
-
-
     function getEnd(endOffset, startInfo) {
       var bottomIndex = startInfo.topIndex;
       var offset = startInfo.topBlank;
-
       while (bottomIndex < rowCount && offset < endOffset) {
         offset += cache[bottomIndex];
         bottomIndex += 1;
       }
-
       var bottomBlank = getEstimatedTotalSize(rowCount) - offset;
       return overscanDownwards(bottomIndex, bottomBlank);
     }
-
     function overscanDownwards(bottomIndex, bottomBlank) {
       var overscanSize = 0;
       var overscanCount = 0;
-
       while (overscanCount < rowCount - bottomIndex && overscanSize < OVERSCAN_SIZE) {
         overscanSize += cache[bottomIndex + overscanCount];
         overscanCount += 1;
       }
-
       return {
         bottomIndex: bottomIndex + overscanCount,
         bottomBlank: bottomBlank - overscanSize
       };
     }
-
     function getEstimatedTotalSize(rowCount) {
       return sum(cache) + (rowCount - cache.length) * estimatedRowHeight;
     }
-
     function setRowCount(count) {
       // 将 cache 的长度设置为 count
       if (count < cache.length) {
@@ -138,16 +113,13 @@ export function makeRowHeightManager(initRowCount, estimatedRowHeight) {
       } else {
         var prevSize = cache.length;
         cache.length = count;
-
         _fillInstanceProperty(cache).call(cache, estimatedRowHeight, prevSize);
       }
     }
   }
-
   function updateRow(index, offset, size) {
     cache[index] = size;
   }
-
   return {
     getRenderRange: getRenderRange,
     updateRow: updateRow,

package/es/table/base/html-table.js

@@ -11,17 +11,15 @@ import SpanManager from './helpers/SpanManager';
 import { Classes } from './styles';
 export function HtmlTable(_ref) {
   var tbodyHtmlTag = _ref.tbodyHtmlTag,
-      getRowProps = _ref.getRowProps,
-      primaryKey = _ref.primaryKey,
-      stickyRightOffset = _ref.stickyRightOffset,
-      data = _ref.data,
-      verInfo = _ref.verticalRenderInfo,
-      hozInfo = _ref.horizontalRenderInfo,
-      tbodyPosition = _ref.tbodyPosition;
-
+    getRowProps = _ref.getRowProps,
+    primaryKey = _ref.primaryKey,
+    stickyRightOffset = _ref.stickyRightOffset,
+    data = _ref.data,
+    verInfo = _ref.verticalRenderInfo,
+    hozInfo = _ref.horizontalRenderInfo,
+    tbodyPosition = _ref.tbodyPosition;
   var flat = _flatInstanceProperty(hozInfo),
-      hoz = hozInfo.horizontalRenderRange;
-
+    hoz = hozInfo.horizontalRenderRange;
   var spanManager = new SpanManager();
   var fullFlatCount = flat.full.length;
   var leftFlatCount = flat.left.length;
@@ -29,20 +27,16 @@ export function HtmlTable(_ref) {
   return /*#__PURE__*/React.createElement("table", null, /*#__PURE__*/React.createElement(Colgroup, {
     descriptors: hozInfo.visible
   }), /*#__PURE__*/React.createElement(tbodyHtmlTag, null, _mapInstanceProperty(data).call(data, renderRow)));
-
   function renderRow(record, i) {
     var _cx, _context;
-
     var rowIndex = verInfo.offset + i;
     spanManager.stripUpwards(rowIndex);
     var rowProps = getRowProps(record, rowIndex);
     var rowClass = cx(Classes.tableRow, (_cx = {}, _defineProperty(_cx, Classes.first, rowIndex === verInfo.first), _defineProperty(_cx, Classes.last, rowIndex === verInfo.last), _defineProperty(_cx, Classes.even, rowIndex % 2 === 0), _defineProperty(_cx, Classes.odd, rowIndex % 2 === 1), _cx), rowProps === null || rowProps === void 0 ? void 0 : rowProps.className);
-
-    var visibleColumnDescriptor = _concatInstanceProperty(_context = hozInfo.visible).call(_context); // 左中右区域渲染，存在融合单元格时需要适配rowspan属性
+    var visibleColumnDescriptor = _concatInstanceProperty(_context = hozInfo.visible).call(_context);
+    // 左中右区域渲染，存在融合单元格时需要适配rowspan属性
     // 如果固定的列均存在融合单元格，需空白一列做占位,否则融合的单元格不会渲染，导致显示异常
     // 这里无法区分是否存在融合列，默认左右固定区域均添加占位空白列
-
-
     if (['left', 'right'].indexOf(tbodyPosition) > -1) {
       visibleColumnDescriptor.push({
         type: 'blank',
@@ -51,7 +45,6 @@ export function HtmlTable(_ref) {
         isPlacehoder: true
       });
     }
-
     return /*#__PURE__*/React.createElement("tr", _extends({}, rowProps, {
       className: rowClass,
       key: (rowProps === null || rowProps === void 0 ? void 0 : rowProps['data-row-detail-key']) ? rowProps['data-row-detail-key'] : internals.safeGetRowKey(primaryKey, record, rowIndex),
@@ -66,31 +59,23 @@ export function HtmlTable(_ref) {
           }
         });
       }
-
       return renderBodyCell(record, rowIndex, descriptor.col, descriptor.colIndex);
     }));
   }
-
   function renderBodyCell(record, rowIndex, column, colIndex) {
     var _cx2;
-
     var _a, _b, _c;
-
     if (spanManager.testSkip(rowIndex, colIndex)) {
       return null;
     }
-
     var value = internals.safeGetValue(column, record, rowIndex);
     var cellProps = (_b = (_a = column.getCellProps) === null || _a === void 0 ? void 0 : _a.call(column, value, record, rowIndex)) !== null && _b !== void 0 ? _b : {};
     var cellContent = value;
-
     if (column.render) {
       cellContent = column.render(value, record, rowIndex);
     }
-
     var colSpan = 1;
     var rowSpan = 1;
-
     if (column.getSpanRect) {
       var spanRect = column.getSpanRect(value, record, rowIndex);
       colSpan = spanRect == null ? 1 : spanRect.right - colIndex;
@@ -99,34 +84,28 @@ export function HtmlTable(_ref) {
       if (cellProps.colSpan != null) {
         colSpan = cellProps.colSpan;
       }
-
       if (cellProps.rowSpan != null) {
         rowSpan = cellProps.rowSpan;
       }
     }
-
     var hasSpan = colSpan > 1 || rowSpan > 1;
-
     if (hasSpan) {
       spanManager.add(rowIndex, colIndex, colSpan, rowSpan);
-    } // rowSpan/colSpan 不能过大，避免 rowSpan/colSpan 影响因虚拟滚动而未渲染的单元格
-
-
+    }
+    // rowSpan/colSpan 不能过大，避免 rowSpan/colSpan 影响因虚拟滚动而未渲染的单元格
     rowSpan = Math.min(rowSpan, verInfo.limit - rowIndex);
-    colSpan = Math.min(colSpan, hozInfo.visible.length - colIndex); // todo: 右侧有列固定的情况下colSpan计算不对，这里先限制一下
-
+    colSpan = Math.min(colSpan, hozInfo.visible.length - colIndex);
+    // todo: 右侧有列固定的情况下colSpan计算不对，这里先限制一下
     rowSpan = Math.max(rowSpan, 1);
     colSpan = Math.max(colSpan, 1);
     var positionStyle = {};
-
     if (colIndex < leftFlatCount) {
       positionStyle.position = 'sticky';
       positionStyle.left = hozInfo.stickyLeftMap.get(colIndex);
     } else if (colIndex >= fullFlatCount - rightFlatCount) {
       positionStyle.position = 'sticky';
-      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
+      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) + (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
     }
-
     return /*#__PURE__*/React.createElement('td', _extends(_extends(_extends(_extends({
       key: colIndex
     }, cellProps), {

package/es/table/base/loading.js

@@ -28,10 +28,9 @@ var DefaultLoadingIcon = /*#__PURE__*/React.memo(function () {
     values: "0 50 50;360 50 50"
   })));
 });
-
 function DefaultLoadingContentWrapper(_ref) {
   var children = _ref.children,
-      visible = _ref.visible;
+    visible = _ref.visible;
   return /*#__PURE__*/React.createElement("div", {
     className: Classes.loadingContentWrapper,
     style: {
@@ -39,14 +38,13 @@ function DefaultLoadingContentWrapper(_ref) {
     }
   }, children);
 }
-
 export default function Loading(_ref2) {
   var visible = _ref2.visible,
-      children = _ref2.children,
-      _ref2$LoadingContentW = _ref2.LoadingContentWrapper,
-      LoadingContentWrapper = _ref2$LoadingContentW === void 0 ? DefaultLoadingContentWrapper : _ref2$LoadingContentW,
-      _ref2$LoadingIcon = _ref2.LoadingIcon,
-      LoadingIcon = _ref2$LoadingIcon === void 0 ? DefaultLoadingIcon : _ref2$LoadingIcon;
+    children = _ref2.children,
+    _ref2$LoadingContentW = _ref2.LoadingContentWrapper,
+    LoadingContentWrapper = _ref2$LoadingContentW === void 0 ? DefaultLoadingContentWrapper : _ref2$LoadingContentW,
+    _ref2$LoadingIcon = _ref2.LoadingIcon,
+    LoadingIcon = _ref2$LoadingIcon === void 0 ? DefaultLoadingIcon : _ref2$LoadingIcon;
   return /*#__PURE__*/React.createElement("div", {
     className: Classes.loadingWrapper
   }, visible && /*#__PURE__*/React.createElement("div", {