@kdcloudjs/table 1.2.2-canary.17 → 1.2.2-canary.19

package/es/_utils/formatUtil.js

@@ -5,9 +5,7 @@ import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/ins
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
-  for (var p in s) {
-    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  }
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
   if (s != null && typeof _Object$getOwnPropertySymbols === "function") for (var i = 0, p = _Object$getOwnPropertySymbols(s); i < p.length; i++) {
     if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
   }
@@ -107,7 +105,6 @@ export function formatNumber(num, formatParams) {
     floatNum = Math.abs(floatNum);
     numInfo.numStr = _sliceInstanceProperty(_context3 = numInfo.numStr).call(_context3, 1); // 去除第一个负号
   }
-
   var numStrArr = numInfo.numStr.split('.');
   numInfo.intStr = numStrArr[0];
   numInfo.decimalStr = numStrArr[1] || '';
@@ -180,7 +177,6 @@ export function formatEditNumber(num, _ref) {
     floatNum = Math.abs(floatNum);
     numInfo.numStr = _sliceInstanceProperty(_context4 = numInfo.numStr).call(_context4, 1); // 去除第一个负号
   }
-
   var numStrArr = numInfo.numStr.split('.');
   numInfo.intStr = numStrArr[0];
   numInfo.decimalStr = numStrArr[1] || '';

package/es/_utils/hooks.js

@@ -4,9 +4,9 @@ import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
-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 _context; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context = Object.prototype.toString.call(o)).call(_context, 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 _context; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context = {}.toString.call(r)).call(_context, 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; }
 import { useEffect, useState, useRef } from 'react';
 import ResizeObserver from 'resize-observer-polyfill';
 import devWarning from './devwarning';

package/es/_utils/usePopper.js

@@ -13,25 +13,25 @@ import devWarning from '../_utils/devwarning';
 import { useResizeObserver } from '../_utils/hooks';
 export var Placements = tuple('top', 'left', 'right', 'bottom', 'topLeft', 'topRight', 'bottomLeft', 'bottomRight', 'leftTop', 'leftBottom', 'rightTop', 'rightBottom');
 export var Triggers = tuple('hover', 'focus', 'click', 'contextMenu');
-var getOffsetPos = function getOffsetPos(el) {
+var _getOffsetPos = function getOffsetPos(el) {
   var elPos = {
     top: el.offsetTop,
     left: el.offsetLeft
   };
   if (el.offsetParent) {
-    var parentPos = getOffsetPos(el.offsetParent);
+    var parentPos = _getOffsetPos(el.offsetParent);
     elPos.top += parentPos.top;
     elPos.left += parentPos.left;
   }
   return elPos;
 };
-var getScrollDist = function getScrollDist(el) {
+var _getScrollDist = function getScrollDist(el) {
   var elScroll = {
     top: el.scrollTop,
     left: el.scrollLeft
   };
   if (el.parentElement && el.parentElement !== document.body) {
-    var parentScroll = getScrollDist(el.parentElement);
+    var parentScroll = _getScrollDist(el.parentElement);
     elScroll.top += parentScroll.top;
     elScroll.left += parentScroll.left;
   }
@@ -128,21 +128,21 @@ function usePopper(locatorElement, popperElement, props) {
     setVisible(!!props.visible);
   }, [props.visible]);
   var _useState9 = useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    evType = _useState10[0],
-    setEvType = _useState10[1];
-  var _useState11 = useState(!!props.visible || defaultVisible),
+    _useState0 = _slicedToArray(_useState9, 2),
+    evType = _useState0[0],
+    setEvType = _useState0[1];
+  var _useState1 = useState(!!props.visible || defaultVisible),
+    _useState10 = _slicedToArray(_useState1, 2),
+    canAlign = _useState10[0],
+    setCanAlign = _useState10[1];
+  var _useState11 = useState(initAlign),
     _useState12 = _slicedToArray(_useState11, 2),
-    canAlign = _useState12[0],
-    setCanAlign = _useState12[1];
-  var _useState13 = useState(initAlign),
+    align = _useState12[0],
+    setAlign = _useState12[1];
+  var _useState13 = useState(placement),
     _useState14 = _slicedToArray(_useState13, 2),
-    align = _useState14[0],
-    setAlign = _useState14[1];
-  var _useState15 = useState(placement),
-    _useState16 = _slicedToArray(_useState15, 2),
-    currentPlacement = _useState16[0],
-    setCurrentPlacement = _useState16[1];
+    currentPlacement = _useState14[0],
+    setCurrentPlacement = _useState14[1];
   var alignPopper = useCallback(function () {
     if ((locatorRef === null || locatorRef === void 0 ? void 0 : locatorRef.current) && (popperRef === null || popperRef === void 0 ? void 0 : popperRef.current) && evType) {
       var _popperRef$current$ge = popperRef.current.getBoundingClientRect(),
@@ -155,15 +155,15 @@ function usePopper(locatorElement, popperElement, props) {
         right = _locatorRef$current$g.right,
         height = _locatorRef$current$g.height,
         width = _locatorRef$current$g.width;
-      var _getOffsetPos = getOffsetPos(container),
-        containerTop = _getOffsetPos.top,
-        containerLeft = _getOffsetPos.left;
-      var _getOffsetPos2 = getOffsetPos(locatorRef.current),
-        locatorTop = _getOffsetPos2.top,
-        locatorLeft = _getOffsetPos2.left;
-      var _getScrollDist = getScrollDist(locatorRef.current),
-        scrollTop = _getScrollDist.top,
-        scrollLeft = _getScrollDist.left;
+      var _getOffsetPos2 = _getOffsetPos(container),
+        containerTop = _getOffsetPos2.top,
+        containerLeft = _getOffsetPos2.left;
+      var _getOffsetPos3 = _getOffsetPos(locatorRef.current),
+        locatorTop = _getOffsetPos3.top,
+        locatorLeft = _getOffsetPos3.left;
+      var _getScrollDist2 = _getScrollDist(locatorRef.current),
+        scrollTop = _getScrollDist2.top,
+        scrollLeft = _getScrollDist2.left;
       var locatorPos = {
         width: width,
         height: height,

package/es/locale/locale.js

@@ -2,9 +2,9 @@ import _typeof from "@babel/runtime-corejs3/helpers/typeof";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
-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 _context2; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context2 = Object.prototype.toString.call(o)).call(_context2, 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 _context2; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context2 = {}.toString.call(r)).call(_context2, 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; }
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
@@ -23,7 +23,7 @@ var LocaleCache = /*#__PURE__*/function () {
    * @param {LocaleDataType | string} localeData 语言数据集合 | 语言类型
    * @returns 设置后的语言对应的语言包
    */
-  _createClass(LocaleCache, [{
+  return _createClass(LocaleCache, [{
     key: "setLocalesData",
     value: function setLocalesData(locale, localeData) {
       var newLocaleData = localeData || this.localesData[locale];
@@ -60,7 +60,6 @@ var LocaleCache = /*#__PURE__*/function () {
       return this.localesData;
     }
   }]);
-  return LocaleCache;
 }();
 var localeCacher = new LocaleCache(_defineProperty({}, zhCNData.locale, zhCNData));
 export default localeCacher;
@@ -174,11 +173,11 @@ function formatElement(msg, variables) {
     var t = item.t,
       v = item.v;
     if (t === 0 && v !== '') {
-      elements.push( /*#__PURE__*/React.createElement("span", {
+      elements.push(/*#__PURE__*/React.createElement("span", {
         key: index
       }, v));
     } else if (t === 1) {
-      elements.push( /*#__PURE__*/React.cloneElement(variables[v], {
+      elements.push(/*#__PURE__*/React.cloneElement(variables[v], {
         key: index
       }));
     }

package/es/table/base/calculations.js

@@ -10,9 +10,9 @@ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instan
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _Map from "@babel/runtime-corejs3/core-js-stable/map";
-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 _context10; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context10 = Object.prototype.toString.call(o)).call(_context10, 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 _context0; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context0 = {}.toString.call(r)).call(_context0, 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; }
 import { collectNodes, isLeafNode, console } from '../utils';
 import { AUTO_VIRTUAL_THRESHOLD, OVERSCAN_SIZE, sum } from './utils';
 function resolveVirtualEnabled(virtualEnum, defaultValue) {

package/es/table/base/empty.js

@@ -31,8 +31,8 @@ export function EmptyHtmlTable(_ref) {
     style: {
       height: emptyCellHeight !== null && emptyCellHeight !== void 0 ? emptyCellHeight : 200
     }
-  })))), show && /*#__PURE__*/React.createElement("div", {
+  })))), show && (/*#__PURE__*/React.createElement("div", {
     className: Classes.emptyWrapper,
     key: "empty"
-  }, /*#__PURE__*/React.createElement(EmptyContent, null)));
+  }, /*#__PURE__*/React.createElement(EmptyContent, null))));
 }

package/es/table/base/globalStyleComponent.js

@@ -1,21 +1,20 @@
 import _Reflect$construct from "@babel/runtime-corejs3/core-js-stable/reflect/construct";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
-import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct) return false; if (_Reflect$construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+import _inherits from "@babel/runtime-corejs3/helpers/inherits";
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React, { PureComponent } from 'react';
 import { GlobalStyle } from './styles';
 var GlobalStyleComponent = /*#__PURE__*/function (_PureComponent) {
-  _inherits(GlobalStyleComponent, _PureComponent);
-  var _super = _createSuper(GlobalStyleComponent);
   function GlobalStyleComponent() {
     _classCallCheck(this, GlobalStyleComponent);
-    return _super.apply(this, arguments);
+    return _callSuper(this, GlobalStyleComponent, arguments);
   }
-  _createClass(GlobalStyleComponent, [{
+  _inherits(GlobalStyleComponent, _PureComponent);
+  return _createClass(GlobalStyleComponent, [{
     key: "render",
     value: function render() {
       return /*#__PURE__*/React.createElement(GlobalStyle, {
@@ -23,6 +22,5 @@ var GlobalStyleComponent = /*#__PURE__*/function (_PureComponent) {
       });
     }
   }]);
-  return GlobalStyleComponent;
 }(PureComponent);
 export { GlobalStyleComponent as default };

package/es/table/base/header.js

@@ -8,9 +8,9 @@ import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instan
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
 import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
-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; }
 import cx from 'classnames';
 import React from 'react';
 import { getTreeDepth, isLeafNode } from '../utils';
@@ -72,12 +72,13 @@ function calculateLeveledAndFlat(inputNested, rowCount) {
     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];
@@ -91,12 +92,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,
@@ -201,7 +205,6 @@ export default function TableHeader(_ref2) {
   var leftFlatCount = flat.left.length;
   var rightFlatCount = flat.right.length;
   var thead = _mapInstanceProperty(_context4 = headerRenderInfo.leveled).call(_context4, function (wrappedCols, level) {
-    var _cx2;
     var _wrappedCols = _concatInstanceProperty(wrappedCols).call(wrappedCols);
     // 左中右区域渲染，分组列可能单独位于一个区域，此时其他区域也需要适配分组的高度
     // rowspan 需要空白的列头去占位, 需要补充额外的空白列头
@@ -216,7 +219,6 @@ export default function TableHeader(_ref2) {
     var headerCells = _mapInstanceProperty(_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,
@@ -243,9 +245,9 @@ export default function TableHeader(_ref2) {
         var cell = /*#__PURE__*/React.createElement("th", _extends({
           key: colIndex
         }, headerCellProps, {
-          className: cx(Classes.tableHeaderCell, headerCellProps.className, (_cx = {}, _defineProperty(_cx, Classes.first, colIndex === 0), _defineProperty(_cx, Classes.last, colIndex + colSpan === fullFlatCount), _defineProperty(_cx, Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), _defineProperty(_cx, Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), _defineProperty(_cx, Classes.leaf, wrapped.isLeaf), _cx)),
+          className: cx(Classes.tableHeaderCell, headerCellProps.className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Classes.first, colIndex === 0), Classes.last, colIndex + colSpan === fullFlatCount), Classes.lockLeft, colIndex < leftFlatCount || theaderPosition === 'left'), Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount || theaderPosition === 'right'), Classes.leaf, wrapped.isLeaf || col.isHeaderMerge)),
           colSpan: colSpan,
-          rowSpan: isLeaf ? rowCount - level : undefined,
+          rowSpan: isLeaf || col.isHeaderMerge ? rowCount - level : undefined,
           style: _extends(_extends({
             textAlign: col.align,
             verticalAlign: (_b = col.verticalAlign) !== null && _b !== void 0 ? _b : 'middle'
@@ -273,7 +275,7 @@ export default function TableHeader(_ref2) {
     });
     return /*#__PURE__*/React.createElement("tr", {
       key: level,
-      className: cx(Classes.tableHeaderRow, (_cx2 = {}, _defineProperty(_cx2, Classes.first, level === 0), _defineProperty(_cx2, Classes.last, level === rowCount - 1), _cx2))
+      className: cx(Classes.tableHeaderRow, _defineProperty(_defineProperty({}, Classes.first, level === 0), Classes.last, level === rowCount - 1))
     }, headerCells);
   });
   var colgroup = _mapInstanceProperty(_context5 = _flatInstanceProperty(headerRenderInfo)).call(_context5, function (wrapped) {

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

@@ -31,7 +31,7 @@ export var FastScrollManager = /*#__PURE__*/function () {
   /**
    * 检测是否接近底部（剩余滚动距离少于两屏）
    */
-  _createClass(FastScrollManager, [{
+  return _createClass(FastScrollManager, [{
     key: "isNearBottom",
     value: function isNearBottom(currentScrollTop, maxRenderHeight, totalScrollHeight) {
       var remainingScrollDistance = totalScrollHeight - currentScrollTop - maxRenderHeight;
@@ -163,5 +163,4 @@ export var FastScrollManager = /*#__PURE__*/function () {
       return _extends({}, this.config);
     }
   }]);
-  return FastScrollManager;
 }();

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

@@ -9,7 +9,7 @@ var SpanManager = /*#__PURE__*/function () {
     _classCallCheck(this, SpanManager);
     this.rects = [];
   }
-  _createClass(SpanManager, [{
+  return _createClass(SpanManager, [{
     key: "testSkip",
     value: function testSkip(rowIndex, colIndex) {
       return this.rects.some(function (_ref) {
@@ -39,6 +39,5 @@ var SpanManager = /*#__PURE__*/function () {
       });
     }
   }]);
-  return SpanManager;
 }();
 export { SpanManager as default };

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

@@ -59,17 +59,17 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     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 _sliceInstanceProperty(_context = _Array$from(rows)).call(_context, curRow.rowIndex, curRow.rowIndex + curRowSpan);
     };
     this.artTableWrapper = artTableWrapper;
@@ -86,7 +86,7 @@ export var TableDOMHelper = /*#__PURE__*/function () {
     this.stickyScroll = stickyScrolls[stickyScrolls.length - 1]; // 当嵌套多层表格时，需要查找最后一个，否则会查找到父表格内嵌套的子表格的
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(Classes.stickyScrollItem));
   }
-  _createClass(TableDOMHelper, [{
+  return _createClass(TableDOMHelper, [{
     key: "getVirtualTop",
     value: function getVirtualTop() {
       return this.tableBody.querySelector(".".concat(Classes.virtualBlank, ".top"));
@@ -137,5 +137,4 @@ export var TableDOMHelper = /*#__PURE__*/function () {
       return rowOffsetTop + tableOffsetTop;
     }
   }]);
-  return TableDOMHelper;
 }();

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

@@ -6,9 +6,9 @@ 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 = _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>");
+    container.innerHTML = _concatInstanceProperty(_context = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = _concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = _concatInstanceProperty(_context7 = _concatInstanceProperty(_context8 = _concatInstanceProperty(_context9 = _concatInstanceProperty(_context0 = _concatInstanceProperty(_context1 = _concatInstanceProperty(_context10 = _concatInstanceProperty(_context11 = _concatInstanceProperty(_context12 = _concatInstanceProperty(_context13 = _concatInstanceProperty(_context14 = _concatInstanceProperty(_context15 = "<div class='".concat(Classes.artTableWrapper, "'>\n          <div class='")).call(_context15, Classes.loadingWrapper, "'>\n              <div class='")).call(_context14, Classes.loadingIndicatorWrapper, "'>\n                <div class='")).call(_context13, Classes.loadingIndicator, "'></div>\n              </div>     \n              <div class='")).call(_context12, Classes.loadingContentWrapper, "'>\n                <div class='")).call(_context11, Classes.artTable, "'>\n                  <div class='")).call(_context10, Classes.tableHeader, "'>\n                    \n                  </div>\n                  <div class='")).call(_context1, Classes.tableBody, "'>\n                    <div class='")).call(_context0, 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)));
   });
   afterAll(function () {

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

@@ -29,11 +29,11 @@ export function HtmlTable(_ref) {
     descriptors: hozInfo.visible
   }), /*#__PURE__*/React.createElement(tbodyHtmlTag, null, _mapInstanceProperty(data).call(data, renderRow)));
   function renderRow(record, i) {
-    var _cx, _context;
+    var _context, _context2;
     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 rowClass = cx(Classes.tableRow, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Classes.first, rowIndex === verInfo.first), Classes.last, rowIndex === verInfo.last), Classes.even, rowIndex % 2 === 0), Classes.odd, rowIndex % 2 === 1), rowProps === null || rowProps === void 0 ? void 0 : rowProps.className);
     var visibleColumnDescriptor = _concatInstanceProperty(_context = hozInfo.visible).call(_context);
     // 左中右区域渲染，存在融合单元格时需要适配rowspan属性
     // 如果固定的列均存在融合单元格，需空白一列做占位,否则融合的单元格不会渲染，导致显示异常
@@ -46,12 +46,21 @@ export function HtmlTable(_ref) {
         isPlacehoder: true
       });
     }
+    // detail 行跳过水平虚拟化，渲染所有列，确保 column 0 的 getSpanRect 能正确执行
+    var isDetailRow = (rowProps === null || rowProps === void 0 ? void 0 : rowProps['data-row-detail-key']) != null;
+    var rowDescriptors = isDetailRow ? _mapInstanceProperty(_context2 = flat.full).call(_context2, function (col, i) {
+      return {
+        type: 'normal',
+        col: col,
+        colIndex: i
+      };
+    }) : visibleColumnDescriptor;
     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),
       "data-rowindex": rowIndex,
       "data-role": 'table-row'
-    }), _mapInstanceProperty(visibleColumnDescriptor).call(visibleColumnDescriptor, function (descriptor) {
+    }), _mapInstanceProperty(rowDescriptors).call(rowDescriptors, function (descriptor) {
       if (descriptor.type === 'blank') {
         return /*#__PURE__*/React.createElement("td", {
           key: descriptor.blankSide,
@@ -60,11 +69,10 @@ export function HtmlTable(_ref) {
           }
         });
       }
-      return renderBodyCell(record, rowIndex, descriptor.col, descriptor.colIndex);
+      return renderBodyCell(record, rowIndex, descriptor.col, descriptor.colIndex, isDetailRow ? fullFlatCount : undefined);
     }));
   }
-  function renderBodyCell(record, rowIndex, column, colIndex) {
-    var _cx2;
+  function renderBodyCell(record, rowIndex, column, colIndex, colSpanLimit) {
     var _a, _b, _c;
     if (spanManager.testSkip(rowIndex, colIndex)) {
       return null;
@@ -95,7 +103,7 @@ export function HtmlTable(_ref) {
     }
     // rowSpan/colSpan 不能过大，避免 rowSpan/colSpan 影响因虚拟滚动而未渲染的单元格
     rowSpan = Math.min(rowSpan, verInfo.limit - rowIndex);
-    colSpan = Math.min(colSpan, hozInfo.visible.length - colIndex);
+    colSpan = Math.min(colSpan, (colSpanLimit !== null && colSpanLimit !== void 0 ? colSpanLimit : hozInfo.visible.length) - colIndex);
     // todo: 右侧有列固定的情况下colSpan计算不对，这里先限制一下
     rowSpan = Math.max(rowSpan, 1);
     colSpan = Math.max(colSpan, 1);
@@ -119,7 +127,7 @@ export function HtmlTable(_ref) {
     return /*#__PURE__*/React.createElement('td', _extends(_extends(_extends(_extends({
       key: colIndex
     }, cellProps), {
-      className: cx(Classes.tableCell, cellProps.className, (_cx2 = {}, _defineProperty(_cx2, Classes.first, colIndex === 0), _defineProperty(_cx2, Classes.last, colIndex + colSpan === fullFlatCount), _defineProperty(_cx2, Classes.lockLeft, colIndex < leftFlatCount || tbodyPosition === 'left'), _defineProperty(_cx2, Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount), _defineProperty(_cx2, Classes.rowSpan, rowSpan > 1), _cx2))
+      className: cx(Classes.tableCell, cellProps.className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, Classes.first, colIndex === 0), Classes.last, colIndex + colSpan === fullFlatCount), Classes.lockLeft, colIndex < leftFlatCount || tbodyPosition === 'left'), Classes.lockRight, colIndex >= fullFlatCount - rightFlatCount), Classes.rowSpan, rowSpan > 1))
     }), hasSpan ? {
       colSpan: colSpan,
       rowSpan: rowSpan

package/es/table/base/loading.js

@@ -47,11 +47,11 @@ export default function Loading(_ref2) {
     LoadingIcon = _ref2$LoadingIcon === void 0 ? DefaultLoadingIcon : _ref2$LoadingIcon;
   return /*#__PURE__*/React.createElement("div", {
     className: Classes.loadingWrapper
-  }, visible && /*#__PURE__*/React.createElement("div", {
+  }, visible && (/*#__PURE__*/React.createElement("div", {
     className: Classes.loadingIndicatorWrapper
   }, /*#__PURE__*/React.createElement("div", {
     className: Classes.loadingIndicator
-  }, /*#__PURE__*/React.createElement(LoadingIcon, null))), /*#__PURE__*/React.createElement(LoadingContentWrapper, {
+  }, /*#__PURE__*/React.createElement(LoadingIcon, null)))), /*#__PURE__*/React.createElement(LoadingContentWrapper, {
     visible: visible,
     children: children
   }));