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

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

@@ -1,22 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _styles = require("../../styles");
-
 var _TableDOMUtils = require("../TableDOMUtils");
-
 var NAME = 'TableDOMUtils';
 describe("".concat(NAME), function () {
   var tableDOMHelper;
   var container;
   beforeAll(function () {
-    var _context, _context2, _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17;
-
+    var _context, _context2, _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context0, _context1, _context10, _context11, _context12, _context13, _context14, _context15;
     container = document.createElement('div');
-    container.innerHTML = (0, _concat.default)(_context = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = (0, _concat.default)(_context4 = (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = (0, _concat.default)(_context7 = (0, _concat.default)(_context8 = (0, _concat.default)(_context9 = (0, _concat.default)(_context10 = (0, _concat.default)(_context11 = (0, _concat.default)(_context12 = (0, _concat.default)(_context13 = (0, _concat.default)(_context14 = (0, _concat.default)(_context15 = (0, _concat.default)(_context16 = (0, _concat.default)(_context17 = "<div class='".concat(_styles.Classes.artTableWrapper, "'>\n          <div class='")).call(_context17, _styles.Classes.loadingWrapper, "'>\n              <div class='")).call(_context16, _styles.Classes.loadingIndicatorWrapper, "'>\n                <div class='")).call(_context15, _styles.Classes.loadingIndicator, "'></div>\n              </div>     \n              <div class='")).call(_context14, _styles.Classes.loadingContentWrapper, "'>\n                <div class='")).call(_context13, _styles.Classes.artTable, "'>\n                  <div class='")).call(_context12, _styles.Classes.tableHeader, "'>\n                    \n                  </div>\n                  <div class='")).call(_context11, _styles.Classes.tableBody, "'>\n                    <div class='")).call(_context10, _styles.Classes.virtual, "'>\n                      <div class='")).call(_context9, _styles.Classes.virtualBlank, " top'></div>\n                      <table></table>\n                      <div class='")).call(_context8, _styles.Classes.virtualBlank, " bottom'></div>\n                    </div>                   \n                  </div>\n                  <div class='")).call(_context7, _styles.Classes.tableFooter, "'>\n                  </div>\n                  <div class='")).call(_context6, _styles.Classes.lockShadowMask, "'>\n                    <div class='")).call(_context5, _styles.Classes.leftLockShadow, "'></div>\n                  </div>\n                  <div class='")).call(_context4, _styles.Classes.lockShadowMask, "'>\n                    <div class='")).call(_context3, _styles.Classes.rightLockShadow, "'></div>\n                  </div>\n                </div>\n                <div class='")).call(_context2, _styles.Classes.stickyScroll, "'>\n                  <div class='")).call(_context, _styles.Classes.stickyScrollItem, "'></div>\n                </div>\n              </div>    \n          </div>        \n      </div>");
+    container.innerHTML = (0, _concat.default)(_context = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = (0, _concat.default)(_context4 = (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = (0, _concat.default)(_context7 = (0, _concat.default)(_context8 = (0, _concat.default)(_context9 = (0, _concat.default)(_context0 = (0, _concat.default)(_context1 = (0, _concat.default)(_context10 = (0, _concat.default)(_context11 = (0, _concat.default)(_context12 = (0, _concat.default)(_context13 = (0, _concat.default)(_context14 = (0, _concat.default)(_context15 = "<div class='".concat(_styles.Classes.artTableWrapper, "'>\n          <div class='")).call(_context15, _styles.Classes.loadingWrapper, "'>\n              <div class='")).call(_context14, _styles.Classes.loadingIndicatorWrapper, "'>\n                <div class='")).call(_context13, _styles.Classes.loadingIndicator, "'></div>\n              </div>     \n              <div class='")).call(_context12, _styles.Classes.loadingContentWrapper, "'>\n                <div class='")).call(_context11, _styles.Classes.artTable, "'>\n                  <div class='")).call(_context10, _styles.Classes.tableHeader, "'>\n                    \n                  </div>\n                  <div class='")).call(_context1, _styles.Classes.tableBody, "'>\n                    <div class='")).call(_context0, _styles.Classes.virtual, "'>\n                      <div class='")).call(_context9, _styles.Classes.virtualBlank, " top'></div>\n                      <table></table>\n                      <div class='")).call(_context8, _styles.Classes.virtualBlank, " bottom'></div>\n                    </div>                   \n                  </div>\n                  <div class='")).call(_context7, _styles.Classes.tableFooter, "'>\n                  </div>\n                  <div class='")).call(_context6, _styles.Classes.lockShadowMask, "'>\n                    <div class='")).call(_context5, _styles.Classes.leftLockShadow, "'></div>\n                  </div>\n                  <div class='")).call(_context4, _styles.Classes.lockShadowMask, "'>\n                    <div class='")).call(_context3, _styles.Classes.rightLockShadow, "'></div>\n                  </div>\n                </div>\n                <div class='")).call(_context2, _styles.Classes.stickyScroll, "'>\n                  <div class='")).call(_context, _styles.Classes.stickyScrollItem, "'></div>\n                </div>\n              </div>    \n          </div>        \n      </div>");
     tableDOMHelper = new _TableDOMUtils.TableDOMHelper(container.querySelector(".".concat(_styles.Classes.artTableWrapper)));
   });
   afterAll(function () {

package/lib/table/base/helpers/__test__/rowHeightManager.test.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _rowHeightManager = require("../rowHeightManager");
-
 var NAME = 'rowHeightManager';
 describe("".concat(NAME), function () {
   it('getFullRenderRange', function () {

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

@@ -1,90 +1,59 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getRichVisibleRectsStream = getRichVisibleRectsStream;
-
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
-
 var _getNodeName = _interopRequireDefault(require("@popperjs/core/lib/dom-utils/getNodeName"));
-
 var _getOffsetParent = _interopRequireDefault(require("@popperjs/core/lib/dom-utils/getOffsetParent"));
-
 var _getParentNode = _interopRequireDefault(require("@popperjs/core/lib/dom-utils/getParentNode"));
-
 var _getWindow = _interopRequireDefault(require("@popperjs/core/lib/dom-utils/getWindow"));
-
 var _getWindowScroll = _interopRequireDefault(require("@popperjs/core/lib/dom-utils/getWindowScroll"));
-
 var _instanceOf = require("@popperjs/core/lib/dom-utils/instanceOf");
-
 var _isScrollParent = _interopRequireDefault(require("@popperjs/core/lib/dom-utils/isScrollParent"));
-
 var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-polyfill"));
-
 var _rxjs = require("rxjs");
-
 var op = _interopRequireWildcard(require("rxjs/operators"));
-
 var _utils = require("../utils");
-
-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; }
-
+function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function isWindow(arg) {
   return arg.toString() === '[object Window]' || arg.toString() === '[object global]';
 }
-
 function isBody(arg) {
   return (0, _getNodeName.default)(arg) === 'body';
 }
-
 function isHtml(arg) {
   return (0, _getNodeName.default)(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 += (0, _getWindowScroll.default)(elem)[scrollOffsetKey];
   }
-
   return result;
 }
 /**
  * 获取 target 相对于 base 的布局大小和相对位置。
  * 注意该方法会考虑滚动所带来的影响
  */
-
-
 function getRelativeLayoutRect(base, target) {
   if (isWindow(target) || isHtmlOrBody(target)) {
     return {
@@ -94,27 +63,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 = (0, _getOffsetParent.default)(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,
@@ -122,51 +86,40 @@ function getRelativeLayoutRect(base, target) {
     right: deltaX + target.offsetWidth
   };
 }
-
 function findCommonOffsetAncestor(target, scrollParent) {
   if (isWindow(scrollParent)) {
     return scrollParent;
   }
-
   var offsetParents = listOffsetParents(target);
-
   if ((0, _includes.default)(offsetParents).call(offsetParents, scrollParent)) {
     return scrollParent;
   }
-
   return (0, _getOffsetParent.default)(scrollParent);
-} // 列出 target 元素上层的所有 offset parents
-
-
+}
+// 列出 target 元素上层的所有 offset parents
 function listOffsetParents(target) {
   var result = [];
   var elem = target;
-
   while (true) {
     if (isWindow(elem)) {
       break;
     }
-
     elem = (0, _getOffsetParent.default)(elem);
     result.push(elem);
   }
-
   return result;
 }
-
 function fromScrollEvent(element) {
   return (0, _rxjs.fromEvent)(element, 'scroll', {
     passive: true
   });
 }
-
 function fromResizeEvent(element) {
   if (isWindow(element)) {
     return (0, _rxjs.fromEvent)(element, 'resize', {
       passive: true
     });
   }
-
   return new _rxjs.Observable(function (subscriber) {
     var resizeObserver = new _resizeObserverPolyfill.default(function (entries) {
       subscriber.next(entries);
@@ -177,30 +130,26 @@ function fromResizeEvent(element) {
     };
   });
 }
-
 function getScrollParent(elem) {
   var _context;
-
   if ((0, _includes.default)(_context = ['html', 'body', '#document']).call(_context, (0, _getNodeName.default)(elem))) {
     return (0, _getWindow.default)(elem);
   }
-
   if ((0, _instanceOf.isHTMLElement)(elem) && (0, _isScrollParent.default)(elem)) {
     return elem;
   }
-
   return getScrollParent((0, _getParentNode.default)(elem));
-} // 获取 target 相对于「它的滚动父元素」的可见部分的大小与位置
-
-
+}
+// 获取 target 相对于「它的滚动父元素」的可见部分的大小与位置
 function getRichVisibleRectsStream(target, structureMayChange$, virtualDebugLabel) {
-  return structureMayChange$.pipe(op.mapTo(target), op.distinctUntilChanged(_utils.shallowEqual), // 当target没有发生变化时，无需重新查找
+  return structureMayChange$.pipe(op.mapTo(target), op.distinctUntilChanged(_utils.shallowEqual),
+  // 当target没有发生变化时，无需重新查找
   op.startWith('init'), op.map(function () {
     // target 的第一个滚动父元素，我们认为这就是虚拟滚动发生的地方
     // 即虚拟滚动不考虑「更上层元素发生滚动」的情况
     // 直接从父元素开始查找，防止自身设置overflow属性导致是同一个元素
-    var scrollParent = getScrollParent((0, _getParentNode.default)(target)); // target 和 scrollParent 的共同 offset 祖先，作为布局尺寸计算时的参照元素
-
+    var scrollParent = getScrollParent((0, _getParentNode.default)(target));
+    // target 和 scrollParent 的共同 offset 祖先，作为布局尺寸计算时的参照元素
     var commonOffsetAncestor = findCommonOffsetAncestor(target, scrollParent);
     return {
       scrollParent: scrollParent,
@@ -212,7 +161,7 @@ function getRichVisibleRectsStream(target, structureMayChange$, virtualDebugLabe
     }
   }), op.switchMap(function (_ref) {
     var scrollParent = _ref.scrollParent,
-        commonOffsetAncestor = _ref.commonOffsetAncestor;
+      commonOffsetAncestor = _ref.commonOffsetAncestor;
     var events$ = (0, _rxjs.merge)(fromScrollEvent(scrollParent), fromResizeEvent(scrollParent), fromResizeEvent(target));
     return events$.pipe(op.map(function (event) {
       return {
@@ -222,8 +171,8 @@ function getRichVisibleRectsStream(target, structureMayChange$, virtualDebugLabe
       };
     }), 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/lib/table/base/helpers/rowHeightManager.js

@@ -1,19 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getFullRenderRange = getFullRenderRange;
 exports.makeRowHeightManager = makeRowHeightManager;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _fill = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/fill"));
-
 var _utils = require("../utils");
-
 function getFullRenderRange(rowCount) {
   return {
     topIndex: 0,
@@ -22,17 +17,13 @@ function getFullRenderRange(rowCount) {
     bottomBlank: 0
   };
 }
-
 function makeRowHeightManager(initRowCount, estimatedRowHeight) {
   var _context;
-
   var cache = (0, _fill.default)(_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) {
@@ -46,7 +37,6 @@ function makeRowHeightManager(initRowCount, estimatedRowHeight) {
       // 表格与 viewport 相交
       return getRenderRangeWhenInView();
     }
-
     function getRenderRangeWhenBelowView() {
       var start = {
         topIndex: 0,
@@ -55,22 +45,18 @@ function makeRowHeightManager(initRowCount, estimatedRowHeight) {
       var end = getEnd(0, start);
       return (0, _extends2.default)((0, _extends2.default)({}, start), end);
     }
-
     function getRenderRangeWhenAboveView() {
       var totalSize = getEstimatedTotalSize(rowCount);
       var start = getStart(totalSize);
       var end = getEnd(totalSize, start);
       return (0, _extends2.default)((0, _extends2.default)({}, start), end);
     }
-
     function getRenderRangeWhenInView() {
       var start = getStart(offset);
       var end = getEnd(offset + maxRenderHeight, start);
       return (0, _extends2.default)((0, _extends2.default)({}, start), end);
     }
     /** 获取虚拟滚动在 开始位置上的信息 */
-
-
     function getStart(offset) {
       if (cache.length === 0) {
         return {
@@ -78,73 +64,56 @@ 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 < _utils.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 < _utils.OVERSCAN_SIZE) {
         overscanSize += cache[bottomIndex + overscanCount];
         overscanCount += 1;
       }
-
       return {
         bottomIndex: bottomIndex + overscanCount,
         bottomBlank: bottomBlank - overscanSize
       };
     }
-
     function getEstimatedTotalSize(rowCount) {
       return (0, _utils.sum)(cache) + (rowCount - cache.length) * estimatedRowHeight;
     }
-
     function setRowCount(count) {
       // 将 cache 的长度设置为 count
       if (count < cache.length) {
@@ -156,11 +125,9 @@ function makeRowHeightManager(initRowCount, estimatedRowHeight) {
       }
     }
   }
-
   function updateRow(index, offset, size) {
     cache[index] = size;
   }
-
   return {
     getRenderRange: getRenderRange,
     updateRow: updateRow,

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

@@ -1,45 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.HtmlTable = HtmlTable;
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _internals = require("../internals");
-
 var _colgroup = require("./colgroup");
-
 var _SpanManager = _interopRequireDefault(require("./helpers/SpanManager"));
-
 var _styles = require("./styles");
-
 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 = (0, _flat.default)(hozInfo),
-      hoz = hozInfo.horizontalRenderRange;
+    hoz = hozInfo.horizontalRenderRange;
   var spanManager = new _SpanManager.default();
   var fullFlatCount = flat.full.length;
   var leftFlatCount = flat.left.length;
@@ -47,18 +34,16 @@ function HtmlTable(_ref) {
   return /*#__PURE__*/_react.default.createElement("table", null, /*#__PURE__*/_react.default.createElement(_colgroup.Colgroup, {
     descriptors: hozInfo.visible
   }), /*#__PURE__*/_react.default.createElement(tbodyHtmlTag, null, (0, _map.default)(data).call(data, renderRow)));
-
   function renderRow(record, i) {
-    var _cx, _context;
-
+    var _context;
     var rowIndex = verInfo.offset + i;
     spanManager.stripUpwards(rowIndex);
     var rowProps = getRowProps(record, rowIndex);
-    var rowClass = (0, _classnames.default)(_styles.Classes.tableRow, (_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.first, rowIndex === verInfo.first), (0, _defineProperty2.default)(_cx, _styles.Classes.last, rowIndex === verInfo.last), (0, _defineProperty2.default)(_cx, _styles.Classes.even, rowIndex % 2 === 0), (0, _defineProperty2.default)(_cx, _styles.Classes.odd, rowIndex % 2 === 1), _cx), rowProps === null || rowProps === void 0 ? void 0 : rowProps.className);
-    var visibleColumnDescriptor = (0, _concat.default)(_context = hozInfo.visible).call(_context); // 左中右区域渲染，存在融合单元格时需要适配rowspan属性
+    var rowClass = (0, _classnames.default)(_styles.Classes.tableRow, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _styles.Classes.first, rowIndex === verInfo.first), _styles.Classes.last, rowIndex === verInfo.last), _styles.Classes.even, rowIndex % 2 === 0), _styles.Classes.odd, rowIndex % 2 === 1), rowProps === null || rowProps === void 0 ? void 0 : rowProps.className);
+    var visibleColumnDescriptor = (0, _concat.default)(_context = hozInfo.visible).call(_context);
+    // 左中右区域渲染，存在融合单元格时需要适配rowspan属性
     // 如果固定的列均存在融合单元格，需空白一列做占位,否则融合的单元格不会渲染，导致显示异常
     // 这里无法区分是否存在融合列，默认左右固定区域均添加占位空白列
-
     if (['left', 'right'].indexOf(tbodyPosition) > -1) {
       visibleColumnDescriptor.push({
         type: 'blank',
@@ -67,7 +52,6 @@ function HtmlTable(_ref) {
         isPlacehoder: true
       });
     }
-
     return /*#__PURE__*/_react.default.createElement("tr", (0, _extends2.default)({}, rowProps, {
       className: rowClass,
       key: (rowProps === null || rowProps === void 0 ? void 0 : rowProps['data-row-detail-key']) ? rowProps['data-row-detail-key'] : _internals.internals.safeGetRowKey(primaryKey, record, rowIndex),
@@ -82,32 +66,22 @@ 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.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;
@@ -116,26 +90,21 @@ 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);
@@ -143,11 +112,10 @@ function HtmlTable(_ref) {
       positionStyle.position = 'sticky';
       positionStyle.right = hozInfo.stickyRightMap.get(colIndex) + (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
     }
-
     return /*#__PURE__*/_react.default.createElement('td', (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({
       key: colIndex
     }, cellProps), {
-      className: (0, _classnames.default)(_styles.Classes.tableCell, cellProps.className, (_cx2 = {}, (0, _defineProperty2.default)(_cx2, _styles.Classes.first, colIndex === 0), (0, _defineProperty2.default)(_cx2, _styles.Classes.last, colIndex + colSpan === fullFlatCount), (0, _defineProperty2.default)(_cx2, _styles.Classes.lockLeft, colIndex < leftFlatCount || tbodyPosition === 'left'), (0, _defineProperty2.default)(_cx2, _styles.Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount), (0, _defineProperty2.default)(_cx2, _styles.Classes.rowSpan, rowSpan > 1), _cx2))
+      className: (0, _classnames.default)(_styles.Classes.tableCell, cellProps.className, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _styles.Classes.first, colIndex === 0), _styles.Classes.last, colIndex + colSpan === fullFlatCount), _styles.Classes.lockLeft, colIndex < leftFlatCount || tbodyPosition === 'left'), _styles.Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount), _styles.Classes.rowSpan, rowSpan > 1))
     }), hasSpan ? {
       colSpan: colSpan,
       rowSpan: rowSpan

package/lib/table/base/index.js

@@ -15,7 +15,5 @@ Object.defineProperty(exports, "Table", {
     return _table.BaseTable;
   }
 });
-
 var _table = require("./table");
-
 var _styles = require("./styles");

package/lib/table/base/loading.js

@@ -1,16 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Loading;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _styles = require("./styles");
-
 var DefaultLoadingIcon = /*#__PURE__*/_react.default.memo(function () {
   return /*#__PURE__*/_react.default.createElement("svg", {
     style: {
@@ -39,10 +35,9 @@ var DefaultLoadingIcon = /*#__PURE__*/_react.default.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.default.createElement("div", {
     className: _styles.Classes.loadingContentWrapper,
     style: {
@@ -50,21 +45,20 @@ function DefaultLoadingContentWrapper(_ref) {
     }
   }, children);
 }
-
 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.default.createElement("div", {
     className: _styles.Classes.loadingWrapper
-  }, visible && /*#__PURE__*/_react.default.createElement("div", {
+  }, visible && (/*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.loadingIndicatorWrapper
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.loadingIndicator
-  }, /*#__PURE__*/_react.default.createElement(LoadingIcon, null))), /*#__PURE__*/_react.default.createElement(LoadingContentWrapper, {
+  }, /*#__PURE__*/_react.default.createElement(LoadingIcon, null)))), /*#__PURE__*/_react.default.createElement(LoadingContentWrapper, {
     visible: visible,
     children: children
   }));