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

package/lib/table/base/colgroup.js

@@ -1,16 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Colgroup = Colgroup;
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _react = _interopRequireDefault(require("react"));
-
 function Colgroup(_ref) {
   var descriptors = _ref.descriptors;
   return /*#__PURE__*/_react.default.createElement("colgroup", null, (0, _map.default)(descriptors).call(descriptors, function (descriptor) {
@@ -22,7 +18,6 @@ function Colgroup(_ref) {
         }
       });
     }
-
     return /*#__PURE__*/_react.default.createElement("col", {
       key: descriptor.colIndex,
       style: {

package/lib/table/base/empty.js

@@ -1,30 +1,18 @@
 "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.EmptyHtmlTable = EmptyHtmlTable;
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _colgroup = require("./colgroup");
-
 var _styles = require("./styles");
-
-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); }
 var DefaultEmptyContent = /*#__PURE__*/_react.default.memo(function () {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("img", {
     alt: "empty-image",
@@ -34,13 +22,12 @@ var DefaultEmptyContent = /*#__PURE__*/_react.default.memo(function () {
     className: "empty-tips"
   }, "\u6CA1\u6709\u7B26\u5408\u67E5\u8BE2\u6761\u4EF6\u7684\u6570\u636E", /*#__PURE__*/_react.default.createElement("br", null), "\u8BF7\u4FEE\u6539\u6761\u4EF6\u540E\u91CD\u65B0\u67E5\u8BE2"));
 });
-
 function EmptyHtmlTable(_ref) {
   var descriptors = _ref.descriptors,
-      isLoading = _ref.isLoading,
-      emptyCellHeight = _ref.emptyCellHeight,
-      _ref$EmptyContent = _ref.EmptyContent,
-      EmptyContent = _ref$EmptyContent === void 0 ? DefaultEmptyContent : _ref$EmptyContent;
+    isLoading = _ref.isLoading,
+    emptyCellHeight = _ref.emptyCellHeight,
+    _ref$EmptyContent = _ref.EmptyContent,
+    EmptyContent = _ref$EmptyContent === void 0 ? DefaultEmptyContent : _ref$EmptyContent;
   var show = !isLoading;
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("table", {
     key: "table"
@@ -55,8 +42,8 @@ function EmptyHtmlTable(_ref) {
     style: {
       height: emptyCellHeight !== null && emptyCellHeight !== void 0 ? emptyCellHeight : 200
     }
-  })))), show && /*#__PURE__*/_react.default.createElement("div", {
+  })))), show && (/*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.emptyWrapper,
     key: "empty"
-  }, /*#__PURE__*/_react.default.createElement(EmptyContent, null)));
+  }, /*#__PURE__*/_react.default.createElement(EmptyContent, null))));
 }

package/lib/table/base/header.js

@@ -1,76 +1,48 @@
 "use strict";
 
 var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
 var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
-
 var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
-
 var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = TableHeader;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
-
 var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _utils = require("../utils");
-
 var _styles = require("./styles");
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { var _context6; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context6 = Object.prototype.toString.call(o)).call(_context6, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol && _getIteratorMethod(r) || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { var _context6; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context6 = {}.toString.call(r)).call(_context6, 8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function range(n) {
   var array = [];
-
   for (var i = 0; i < n; i++) {
     array.push(i);
   }
-
   return array;
 }
 /** 根据当前横向虚拟滚动 对 nested.center 进行过滤，结果只保留当前视野内可见的那些列配置 */
-
-
 function filterNestedCenter(centerNested, hoz, leftFlatCount) {
   return dfs(centerNested, leftFlatCount).filtered;
-
   function dfs(cols, startColIndex) {
     var leafCount = 0;
     var filtered = [];
-
     var _iterator = _createForOfIteratorHelper(cols),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var col = _step.value;
         var colIndex = startColIndex + leafCount;
-
         if ((0, _utils.isLeafNode)(col)) {
           leafCount += 1;
-
           if (leftFlatCount + hoz.leftIndex <= colIndex && colIndex < leftFlatCount + hoz.rightIndex) {
             filtered.push({
               colIndex: colIndex,
@@ -80,7 +52,6 @@ function filterNestedCenter(centerNested, hoz, leftFlatCount) {
         } else {
           var dfsRes = dfs(col.children, colIndex);
           leafCount += dfsRes.leafCount;
-
           if (dfsRes.filtered.length > 0) {
             filtered.push({
               colIndex: colIndex,
@@ -95,7 +66,6 @@ function filterNestedCenter(centerNested, hoz, leftFlatCount) {
     } finally {
       _iterator.f();
     }
-
     return {
       filtered: filtered,
       leafCount: leafCount
@@ -103,28 +73,22 @@ function filterNestedCenter(centerNested, hoz, leftFlatCount) {
   }
 }
 /** 根据输入的 nested 列配置，算出相应的 leveled & flat 配置方便渲染 */
-
-
 function calculateLeveledAndFlat(inputNested, rowCount) {
   var leveled = [];
-
   for (var depth = 0; depth < rowCount; depth++) {
     leveled.push([]);
   }
-
   var flat = [];
-  dfs(inputNested, 0);
+  dfs(inputNested, 0, false);
   return {
     flat: flat,
     leveled: leveled
   };
-
-  function dfs(input, depth) {
+  function dfs(input, depth, suppressLeveled) {
+    var _a;
     var leafCount = 0;
-
     for (var i = 0; i < input.length; i++) {
       var indexedCol = input[i];
-
       if ((0, _utils.isLeafNode)(indexedCol)) {
         leafCount += 1;
         var wrapped = {
@@ -135,13 +99,15 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
           colSpan: 1,
           isLeaf: true
         };
-        leveled[depth].push(wrapped);
+        if (!suppressLeveled) {
+          leveled[depth].push(wrapped);
+        }
         flat.push(wrapped);
       } else {
-        var dfsRes = dfs(indexedCol.children, depth + 1);
+        var mergeHeader = Boolean((_a = indexedCol.col) === null || _a === void 0 ? void 0 : _a.isHeaderMerge);
+        var dfsRes = dfs(indexedCol.children, depth + 1, suppressLeveled || mergeHeader);
         leafCount += dfsRes.leafCount;
-
-        if (dfsRes.leafCount > 0) {
+        if (dfsRes.leafCount > 0 && !suppressLeveled) {
           leveled[depth].push({
             type: 'normal',
             width: indexedCol.col.width,
@@ -153,26 +119,20 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
         }
       }
     }
-
     return {
       leafCount: leafCount
     };
   }
 }
 /** 包装列配置，附加上 colIndex 属性 */
-
-
 function attachColIndex(inputNested, colIndexOffset) {
   return dfs(inputNested, colIndexOffset).result;
-
   function dfs(input, startColIndex) {
     var result = [];
     var leafCount = 0;
-
     for (var i = 0; i < input.length; i++) {
       var col = input[i];
       var colIndex = startColIndex + leafCount;
-
       if ((0, _utils.isLeafNode)(col)) {
         leafCount += 1;
         result.push({
@@ -182,7 +142,6 @@ function attachColIndex(inputNested, colIndexOffset) {
       } else {
         var sub = dfs(col.children, colIndex);
         leafCount += sub.leafCount;
-
         if (sub.leafCount > 0) {
           result.push({
             col: col,
@@ -192,7 +151,6 @@ function attachColIndex(inputNested, colIndexOffset) {
         }
       }
     }
-
     return {
       result: result,
       leafCount: leafCount
@@ -200,17 +158,13 @@ function attachColIndex(inputNested, colIndexOffset) {
   }
 }
 /** 计算用于渲染表头的数据结构 */
-
-
 function calculateHeaderRenderInfo(_ref, rowCount) {
   var flat = (0, _flat.default)(_ref),
-      nested = _ref.nested,
-      hoz = _ref.horizontalRenderRange,
-      useVirtual = _ref.useVirtual;
-
+    nested = _ref.nested,
+    hoz = _ref.horizontalRenderRange,
+    useVirtual = _ref.useVirtual;
   if (useVirtual.header) {
     var _context, _context2;
-
     var leftPart = calculateLeveledAndFlat(attachColIndex(nested.left, 0), rowCount);
     var filtered = filterNestedCenter(nested.center, hoz, flat.left.length);
     var centerPart = calculateLeveledAndFlat(filtered, rowCount);
@@ -227,7 +181,6 @@ function calculateHeaderRenderInfo(_ref, rowCount) {
       }], (0, _toConsumableArray2.default)((0, _flat.default)(rightPart))),
       leveled: (0, _map.default)(_context2 = range(rowCount)).call(_context2, function (depth) {
         var _context3;
-
         return (0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(leftPart.leveled[depth]), [{
           type: 'blank',
           width: hoz.leftBlank,
@@ -240,33 +193,27 @@ function calculateHeaderRenderInfo(_ref, rowCount) {
       })
     };
   }
-
   return calculateLeveledAndFlat(attachColIndex(nested.full, 0), rowCount);
 }
-
 function TableHeader(_ref2) {
   var _context4, _context5;
-
   var info = _ref2.info,
-      theaderPosition = _ref2.theaderPosition,
-      _rowCount = _ref2.rowCount,
-      stickyRightOffset = _ref2.stickyRightOffset;
+    theaderPosition = _ref2.theaderPosition,
+    _rowCount = _ref2.rowCount,
+    stickyRightOffset = _ref2.stickyRightOffset;
   var nested = info.nested,
-      flat = (0, _flat.default)(info),
-      stickyLeftMap = info.stickyLeftMap,
-      stickyRightMap = info.stickyRightMap;
+    flat = (0, _flat.default)(info),
+    stickyLeftMap = info.stickyLeftMap,
+    stickyRightMap = info.stickyRightMap;
   var rowCount = _rowCount !== null && _rowCount !== void 0 ? _rowCount : (0, _utils.getTreeDepth)(nested.full) + 1;
   var headerRenderInfo = calculateHeaderRenderInfo(info, rowCount);
   var fullFlatCount = flat.full.length;
   var leftFlatCount = flat.left.length;
   var rightFlatCount = flat.right.length;
   var thead = (0, _map.default)(_context4 = headerRenderInfo.leveled).call(_context4, function (wrappedCols, level) {
-    var _cx2;
-
-    var _wrappedCols = (0, _concat.default)(wrappedCols).call(wrappedCols); // 左中右区域渲染，分组列可能单独位于一个区域，此时其他区域也需要适配分组的高度
+    var _wrappedCols = (0, _concat.default)(wrappedCols).call(wrappedCols);
+    // 左中右区域渲染，分组列可能单独位于一个区域，此时其他区域也需要适配分组的高度
     // rowspan 需要空白的列头去占位, 需要补充额外的空白列头
-
-
     if (rowCount > 1 && ['left', 'right'].indexOf(theaderPosition) > -1) {
       _wrappedCols.push({
         type: 'blank',
@@ -275,20 +222,15 @@ function TableHeader(_ref2) {
         isPlacehoder: true
       });
     }
-
     var headerCells = (0, _map.default)(_wrappedCols).call(_wrappedCols, function (wrapped, index) {
       var _a, _b, _c;
-
       if (wrapped.type === 'normal') {
-        var _cx;
-
         var colIndex = wrapped.colIndex,
-            colSpan = wrapped.colSpan,
-            isLeaf = wrapped.isLeaf,
-            col = wrapped.col;
+          colSpan = wrapped.colSpan,
+          isLeaf = wrapped.isLeaf,
+          col = wrapped.col;
         var headerCellProps = (_a = col.headerCellProps) !== null && _a !== void 0 ? _a : {};
         var positionStyle = {};
-
         if (colIndex < leftFlatCount) {
           positionStyle.position = 'sticky';
           positionStyle.left = stickyLeftMap.get(colIndex);
@@ -297,15 +239,13 @@ function TableHeader(_ref2) {
           var stickyRightIndex = colSpan > 1 ? colIndex + colSpan - 1 : colIndex;
           positionStyle.right = stickyRightMap.get(stickyRightIndex) + stickyRightOffset;
         }
-
         var justifyContent = col.align === 'right' ? 'flex-end' : col.align === 'center' ? 'center' : 'flex-start';
-
         var cell = /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({
           key: colIndex
         }, headerCellProps, {
-          className: (0, _classnames.default)(_styles.Classes.tableHeaderCell, headerCellProps.className, (_cx = {}, (0, _defineProperty2.default)(_cx, _styles.Classes.first, colIndex === 0), (0, _defineProperty2.default)(_cx, _styles.Classes.last, colIndex + colSpan === fullFlatCount), (0, _defineProperty2.default)(_cx, _styles.Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), (0, _defineProperty2.default)(_cx, _styles.Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), (0, _defineProperty2.default)(_cx, _styles.Classes.leaf, wrapped.isLeaf), _cx)),
+          className: (0, _classnames.default)(_styles.Classes.tableHeaderCell, headerCellProps.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 || theaderPosition === 'left'), _styles.Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _styles.Classes.leaf, wrapped.isLeaf || col.isHeaderMerge)),
           colSpan: colSpan,
-          rowSpan: isLeaf ? rowCount - level : undefined,
+          rowSpan: isLeaf || col.isHeaderMerge ? rowCount - level : undefined,
           style: (0, _extends2.default)((0, _extends2.default)({
             textAlign: col.align,
             verticalAlign: (_b = col.verticalAlign) !== null && _b !== void 0 ? _b : 'middle'
@@ -317,7 +257,6 @@ function TableHeader(_ref2) {
             justifyContent: justifyContent
           }
         }, (_c = col.title) !== null && _c !== void 0 ? _c : col.name));
-
         return cell;
       } else {
         if (wrapped.width > 0) {
@@ -334,7 +273,7 @@ function TableHeader(_ref2) {
     });
     return /*#__PURE__*/_react.default.createElement("tr", {
       key: level,
-      className: (0, _classnames.default)(_styles.Classes.tableHeaderRow, (_cx2 = {}, (0, _defineProperty2.default)(_cx2, _styles.Classes.first, level === 0), (0, _defineProperty2.default)(_cx2, _styles.Classes.last, level === rowCount - 1), _cx2))
+      className: (0, _classnames.default)(_styles.Classes.tableHeaderRow, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, _styles.Classes.first, level === 0), _styles.Classes.last, level === rowCount - 1))
     }, headerCells);
   });
   var colgroup = (0, _map.default)(_context5 = (0, _flat.default)(headerRenderInfo)).call(_context5, function (wrapped) {

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

@@ -1,35 +1,29 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
-
 /** 在表格的单元格的渲染过程中，先渲染的单元格的 colSpan/rowSpan 会影响到后续单元格是否被渲染
  * `SpanManager` 会在内部维护一份状态来记录最近渲染单元格的 colSpan/rowSpan，
  * 方便后续的单元格快速判断 "是否需要跳过渲染" */
-var SpanManager = /*#__PURE__*/function () {
+var SpanManager = exports.default = /*#__PURE__*/function () {
   function SpanManager() {
     (0, _classCallCheck2.default)(this, SpanManager);
     this.rects = [];
   }
-
-  (0, _createClass2.default)(SpanManager, [{
+  return (0, _createClass2.default)(SpanManager, [{
     key: "testSkip",
     value: function testSkip(rowIndex, colIndex) {
       return this.rects.some(function (_ref) {
         var left = _ref.left,
-            right = _ref.right,
-            top = _ref.top,
-            bottom = _ref.bottom;
+          right = _ref.right,
+          top = _ref.top,
+          bottom = _ref.bottom;
         return left <= colIndex && colIndex < right && top <= rowIndex && rowIndex < bottom;
       });
     }
@@ -37,7 +31,6 @@ var SpanManager = /*#__PURE__*/function () {
     key: "stripUpwards",
     value: function stripUpwards(rowIndex) {
       var _context;
-
       this.rects = (0, _filter.default)(_context = this.rects).call(_context, function (rect) {
         return rect.bottom > rowIndex;
       });
@@ -53,7 +46,4 @@ var SpanManager = /*#__PURE__*/function () {
       });
     }
   }]);
-  return SpanManager;
-}();
-
-exports.default = SpanManager;
+}();

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

@@ -1,24 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TableDOMHelper = void 0;
-
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
-
 var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
-
 var _styles = require("../styles");
-
 // 表格 DOM 结构
 // div.art-table-wrapper
 // └── div.art-loading-wrapper
@@ -56,47 +48,37 @@ var _styles = require("../styles");
 // 在「可能存在嵌套表格」的情况下，我们可以采用以下的方式来避免「querySelector 不小心获取到了的嵌套表格上的元素」：
 //  artTable.querySelector('.art-lock-shadow-mask .art-left-lock-shadow')
 // 表格 DOM 结构辅助工具
-var TableDOMHelper = /*#__PURE__*/function () {
+var TableDOMHelper = exports.TableDOMHelper = /*#__PURE__*/function () {
   function TableDOMHelper(artTableWrapper) {
     var _this = this,
-        _context2,
-        _context3;
-
+      _context2,
+      _context3;
     (0, _classCallCheck2.default)(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) {
+      var _getParentNode = function getParentNode(ele, target) {
         if (ele.parentNode.nodeName === target) {
           return ele.parentNode;
         }
-
-        return getParentNode(ele.parentNode, target);
+        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');
+      var curRow = _getParentNode(curCell, 'TR');
       var curRowSpan = parseInt(e.currentTarget.getAttribute('rowspan')) || 1;
-      var rows = (_a = getParentNode(curCell, 'TABLE')) === null || _a === void 0 ? void 0 : _a.rows;
+      var rows = (_a = _getParentNode(curCell, 'TABLE')) === null || _a === void 0 ? void 0 : _a.rows;
       return (0, _slice.default)(_context = (0, _from.default)(rows)).call(_context, curRow.rowIndex, curRow.rowIndex + curRowSpan);
     };
-
     this.artTableWrapper = artTableWrapper;
     this.artTable = artTableWrapper.querySelector(".".concat(_styles.Classes.artTable));
     this.tableHeader = this.artTable.querySelector(".".concat(_styles.Classes.tableHeader));
@@ -109,11 +91,9 @@ var TableDOMHelper = /*#__PURE__*/function () {
     var stickyScrollSelector = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = ".".concat(_styles.Classes.artTable, " + .")).call(_context3, _styles.Classes.horizontalStickyScrollContainer, " .")).call(_context2, _styles.Classes.stickyScroll);
     var stickyScrolls = artTableWrapper.querySelectorAll(stickyScrollSelector);
     this.stickyScroll = stickyScrolls[stickyScrolls.length - 1]; // 当嵌套多层表格时，需要查找最后一个，否则会查找到父表格内嵌套的子表格的
-
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(_styles.Classes.stickyScrollItem));
   }
-
-  (0, _createClass2.default)(TableDOMHelper, [{
+  return (0, _createClass2.default)(TableDOMHelper, [{
     key: "getVirtualTop",
     value: function getVirtualTop() {
       return this.tableBody.querySelector(".".concat(_styles.Classes.virtualBlank, ".top"));
@@ -122,7 +102,6 @@ var TableDOMHelper = /*#__PURE__*/function () {
     key: "getTableRows",
     value: function getTableRows() {
       var _context4;
-
       var tbody = this.artTable.querySelector((0, _concat.default)(_context4 = ".".concat(_styles.Classes.tableBody, " .")).call(_context4, _styles.Classes.virtual, " table tbody"));
       return tbody.childNodes;
     }
@@ -130,14 +109,12 @@ var TableDOMHelper = /*#__PURE__*/function () {
     key: "getTableBodyHtmlTable",
     value: function getTableBodyHtmlTable() {
       var _context5;
-
       return this.artTable.querySelector((0, _concat.default)(_context5 = ".".concat(_styles.Classes.tableBody, " .")).call(_context5, _styles.Classes.virtual, " table"));
     }
   }, {
     key: "getLeftLockShadow",
     value: function getLeftLockShadow() {
       var _context6;
-
       var selector = (0, _concat.default)(_context6 = ".".concat(_styles.Classes.lockShadowMask, " .")).call(_context6, _styles.Classes.leftLockShadow);
       var allLeftLockShadow = this.artTable.querySelectorAll(selector);
       return allLeftLockShadow[allLeftLockShadow.length - 1]; // 当table-body、table-footer嵌套多层表格时，需要查找最后一个，否则会查找到嵌套表格的
@@ -146,7 +123,6 @@ var TableDOMHelper = /*#__PURE__*/function () {
     key: "getRightLockShadow",
     value: function getRightLockShadow() {
       var _context7;
-
       var selector = (0, _concat.default)(_context7 = ".".concat(_styles.Classes.lockShadowMask, " .")).call(_context7, _styles.Classes.rightLockShadow);
       var allRightLockShadow = this.artTable.querySelectorAll(selector);
       return allRightLockShadow[allRightLockShadow.length - 1]; // 当table-body、table-footer嵌套多层表格时，需要查找最后一个，否则会查找到嵌套表格的
@@ -160,7 +136,6 @@ var TableDOMHelper = /*#__PURE__*/function () {
     key: "getRowTop",
     value: function getRowTop(rowIndex) {
       var _context8, _context9;
-
       if (rowIndex === 0) return 0;
       var selector = (0, _concat.default)(_context8 = (0, _concat.default)(_context9 = ".".concat(_styles.Classes.tableBody, " .")).call(_context9, _styles.Classes.tableRow, "[data-rowindex=\"")).call(_context8, rowIndex, "\"]");
       var row = this.artTable.querySelector(selector);
@@ -169,7 +144,4 @@ var TableDOMHelper = /*#__PURE__*/function () {
       return rowOffsetTop + tableOffsetTop;
     }
   }]);
-  return TableDOMHelper;
-}();
-
-exports.TableDOMHelper = TableDOMHelper;
+}();

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

@@ -1,9 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 var _SpanManager = _interopRequireDefault(require("../SpanManager"));
-
 var NAME = 'SpanManager';
 describe("".concat(NAME), function () {
   var spanManager = new _SpanManager.default();
@@ -13,8 +11,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 () {