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

package/lib/table/base/BlankComponent.js

@@ -12,8 +12,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/hel
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 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 TopBlankComponent = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var heightFromProps = _ref.height;
   (0, _react.useEffect)(function () {
@@ -72,11 +71,9 @@ var BottomBlankComponent = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2,
 });
 BottomBlankComponent.displayName = 'BottomBlank';
 // 使用 memo 优化，只有当 height 或 className 改变时才重新渲染
-var TopBlank = /*#__PURE__*/(0, _react.memo)(TopBlankComponent, function (prevProps, nextProps) {
+var TopBlank = exports.TopBlank = /*#__PURE__*/(0, _react.memo)(TopBlankComponent, function (prevProps, nextProps) {
   return prevProps.height === nextProps.height;
 });
-exports.TopBlank = TopBlank;
-var BottomBlank = /*#__PURE__*/(0, _react.memo)(BottomBlankComponent, function (prevProps, nextProps) {
+var BottomBlank = exports.BottomBlank = /*#__PURE__*/(0, _react.memo)(BottomBlankComponent, function (prevProps, nextProps) {
   return prevProps.height === nextProps.height;
-});
-exports.BottomBlank = BottomBlank;
+});

package/lib/table/base/calculations.js

@@ -21,9 +21,9 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/ty
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _utils = require("../utils");
 var _utils2 = require("./utils");
-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 = _sliceInstanceProperty2(_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 = _sliceInstanceProperty2(_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; }
 function resolveVirtualEnabled(virtualEnum, defaultValue) {
   if (virtualEnum == null || virtualEnum === 'auto') {
     return defaultValue;

package/lib/table/base/empty.js

@@ -12,8 +12,7 @@ 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",
@@ -43,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/globalStyleComponent.js

@@ -11,23 +11,21 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/inherits"));
 var _react = _interopRequireWildcard(require("react"));
 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 _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
-var GlobalStyleComponent = /*#__PURE__*/function (_PureComponent) {
-  (0, _inherits2.default)(GlobalStyleComponent, _PureComponent);
-  var _super = _createSuper(GlobalStyleComponent);
+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 _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
+var GlobalStyleComponent = exports.default = /*#__PURE__*/function (_PureComponent) {
   function GlobalStyleComponent() {
     (0, _classCallCheck2.default)(this, GlobalStyleComponent);
-    return _super.apply(this, arguments);
+    return _callSuper(this, GlobalStyleComponent, arguments);
   }
-  (0, _createClass2.default)(GlobalStyleComponent, [{
+  (0, _inherits2.default)(GlobalStyleComponent, _PureComponent);
+  return (0, _createClass2.default)(GlobalStyleComponent, [{
     key: "render",
     value: function render() {
       return /*#__PURE__*/_react.default.createElement(_styles.GlobalStyle, {
@@ -35,6 +33,4 @@ var GlobalStyleComponent = /*#__PURE__*/function (_PureComponent) {
       });
     }
   }]);
-  return GlobalStyleComponent;
-}(_react.PureComponent);
-exports.default = GlobalStyleComponent;
+}(_react.PureComponent);

package/lib/table/base/header.js

@@ -19,9 +19,9 @@ 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++) {
@@ -79,12 +79,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];
@@ -98,12 +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,
@@ -208,7 +212,6 @@ function TableHeader(_ref2) {
   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);
     // 左中右区域渲染，分组列可能单独位于一个区域，此时其他区域也需要适配分组的高度
     // rowspan 需要空白的列头去占位, 需要补充额外的空白列头
@@ -223,7 +226,6 @@ function TableHeader(_ref2) {
     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,
@@ -250,9 +252,9 @@ function TableHeader(_ref2) {
         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'
@@ -280,7 +282,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/FastScrollManager.js

@@ -12,7 +12,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpe
  * 快速滚动管理器
  * 抽取 BaseTable 中的快速滚动相关逻辑
  */
-var FastScrollManager = /*#__PURE__*/function () {
+var FastScrollManager = exports.FastScrollManager = /*#__PURE__*/function () {
   function FastScrollManager(callbacks) {
     var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     (0, _classCallCheck2.default)(this, FastScrollManager);
@@ -38,7 +38,7 @@ var FastScrollManager = /*#__PURE__*/function () {
   /**
    * 检测是否接近底部（剩余滚动距离少于两屏）
    */
-  (0, _createClass2.default)(FastScrollManager, [{
+  return (0, _createClass2.default)(FastScrollManager, [{
     key: "isNearBottom",
     value: function isNearBottom(currentScrollTop, maxRenderHeight, totalScrollHeight) {
       var remainingScrollDistance = totalScrollHeight - currentScrollTop - maxRenderHeight;
@@ -170,6 +170,4 @@ var FastScrollManager = /*#__PURE__*/function () {
       return (0, _extends2.default)({}, this.config);
     }
   }]);
-  return FastScrollManager;
-}();
-exports.FastScrollManager = FastScrollManager;
+}();

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

@@ -11,12 +11,12 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpe
 /** 在表格的单元格的渲染过程中，先渲染的单元格的 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) {
@@ -46,6 +46,4 @@ var SpanManager = /*#__PURE__*/function () {
       });
     }
   }]);
-  return SpanManager;
-}();
-exports.default = SpanManager;
+}();

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

@@ -48,7 +48,7 @@ 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,
@@ -66,17 +66,17 @@ 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 (0, _slice.default)(_context = (0, _from.default)(rows)).call(_context, curRow.rowIndex, curRow.rowIndex + curRowSpan);
     };
     this.artTableWrapper = artTableWrapper;
@@ -93,7 +93,7 @@ var TableDOMHelper = /*#__PURE__*/function () {
     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"));
@@ -144,6 +144,4 @@ var TableDOMHelper = /*#__PURE__*/function () {
       return rowOffsetTop + tableOffsetTop;
     }
   }]);
-  return TableDOMHelper;
-}();
-exports.TableDOMHelper = TableDOMHelper;
+}();

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

@@ -9,9 +9,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 = (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/getRichVisibleRectsStream.js

@@ -20,8 +20,7 @@ var _resizeObserverPolyfill = _interopRequireDefault(require("resize-observer-po
 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]';
 }

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

@@ -36,11 +36,11 @@ function HtmlTable(_ref) {
     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, _context2;
     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 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属性
     // 如果固定的列均存在融合单元格，需空白一列做占位,否则融合的单元格不会渲染，导致显示异常
@@ -53,12 +53,21 @@ 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 ? (0, _map.default)(_context2 = flat.full).call(_context2, function (col, i) {
+      return {
+        type: 'normal',
+        col: col,
+        colIndex: i
+      };
+    }) : visibleColumnDescriptor;
     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),
       "data-rowindex": rowIndex,
       "data-role": 'table-row'
-    }), (0, _map.default)(visibleColumnDescriptor).call(visibleColumnDescriptor, function (descriptor) {
+    }), (0, _map.default)(rowDescriptors).call(rowDescriptors, function (descriptor) {
       if (descriptor.type === 'blank') {
         return /*#__PURE__*/_react.default.createElement("td", {
           key: descriptor.blankSide,
@@ -67,11 +76,10 @@ 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;
@@ -102,7 +110,7 @@ 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);
@@ -126,7 +134,7 @@ function HtmlTable(_ref) {
     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/loading.js

@@ -54,11 +54,11 @@ function Loading(_ref2) {
     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
   }));

package/lib/table/base/renderTemplates.js

@@ -21,8 +21,7 @@ var _styles = require("./styles");
 var _utils = require("./utils");
 var _utils2 = require("../utils");
 var _header = _interopRequireDefault(require("./header"));
-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); }
 /*
  * @Author: wqhui
  * @Date: 2022-03-14 11:21:12
@@ -62,7 +61,7 @@ function renderTableHeaderInIE(info, props, extra) {
     style: typeof (extra === null || extra === void 0 ? void 0 : extra.stickyRightOffset) === 'number' ? {
       width: extra === null || extra === void 0 ? void 0 : extra.stickyRightOffset
     } : undefined
-  })), left.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+  })), left.length > 0 ? (/*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.fixedLeft
   }, /*#__PURE__*/_react.default.createElement(_header.default, {
     info: (0, _extends2.default)((0, _extends2.default)({}, info), {
@@ -88,7 +87,7 @@ function renderTableHeaderInIE(info, props, extra) {
     }),
     theaderPosition: "left",
     rowCount: rowCount
-  })) : null, right.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+  }))) : null, right.length > 0 ? (/*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.fixedRight,
     style: fixedRightTableStyle
   }, /*#__PURE__*/_react.default.createElement(_header.default, {
@@ -115,7 +114,7 @@ function renderTableHeaderInIE(info, props, extra) {
     }),
     theaderPosition: 'right',
     rowCount: rowCount
-  })) : null);
+  }))) : null);
 }
 function renderTableBodyInIE(info, props, extra) {
   var dataSource = props.dataSource,
@@ -147,33 +146,33 @@ function renderTableBodyInIE(info, props, extra) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.virtual,
     tabIndex: -1
-  }, topBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  }, topBlank > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     key: "top-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'top'),
     style: {
       height: topBlank
     }
-  }), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
+  })), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
     tbodyHtmlTag: "tbody"
   }, commonProps, {
     tbodyPosition: hasLockColumn ? 'center' : undefined,
     horizontalRenderInfo: info,
     verticalRenderInfo: verticalRenderInfo
-  })), bottomBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  })), bottomBlank > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     key: "bottom-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'bottom'),
     style: {
       height: bottomBlank
     }
-  })), left.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+  }))), left.length > 0 ? (/*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.fixedLeft
-  }, topBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  }, topBlank > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     key: "top-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'top'),
     style: {
       height: topBlank
     }
-  }), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
+  })), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
     tbodyHtmlTag: "tbody"
   }, commonProps, {
     tbodyPosition: "left",
@@ -187,21 +186,21 @@ function renderTableBodyInIE(info, props, extra) {
       visible: (0, _slice.default)(visible).call(visible, 0, left.length)
     }),
     verticalRenderInfo: verticalRenderInfo
-  })), bottomBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  })), bottomBlank > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     key: "bottom-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'bottom'),
     style: {
       height: bottomBlank
     }
-  })) : null, right.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+  })))) : null, right.length > 0 ? (/*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.fixedRight
-  }, topBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  }, topBlank > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     key: "top-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'top'),
     style: {
       height: topBlank
     }
-  }), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
+  })), /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
     tbodyHtmlTag: "tbody"
   }, commonProps, {
     tbodyPosition: "right",
@@ -215,13 +214,13 @@ function renderTableBodyInIE(info, props, extra) {
       visible: (0, _slice.default)(visible).call(visible, visible.length - right.length)
     }),
     verticalRenderInfo: verticalRenderInfo
-  })), bottomBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
+  })), bottomBlank > 0 && (/*#__PURE__*/_react.default.createElement("div", {
     key: "bottom-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'bottom'),
     style: {
       height: bottomBlank
     }
-  })) : null, /*#__PURE__*/_react.default.createElement("div", {
+  })))) : null, /*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.rowDetailContainer
   }));
 }
@@ -308,7 +307,7 @@ function renderRowDetailInIE(params) {
   if (!domHelper) return;
   var artTable = domHelper.artTable;
   var rowDetailContainer = artTable && artTable.querySelector(".".concat(_styles.Classes.rowDetailContainer));
-  return /*#__PURE__*/_reactDom.default.createPortal( /*#__PURE__*/_react.default.createElement(RowDetail, (0, _extends2.default)({}, params)), rowDetailContainer);
+  return /*#__PURE__*/_reactDom.default.createPortal(/*#__PURE__*/_react.default.createElement(RowDetail, (0, _extends2.default)({}, params)), rowDetailContainer);
 }
 function RowDetail(props) {
   var detailRef = (0, _react.useRef)(null);
@@ -335,9 +334,7 @@ function RowDetail(props) {
   (0, _react.useEffect)(function () {
     // 这时候行才渲染完，只能在这里设置偏移量
     var offsetTop = domHelper.getRowTop(rowIndex) || 0;
-    setTimeout(function () {
-      detailRef.current.style.transform = "translateY(".concat(offsetTop + 'px', ")");
-    }, 0);
+    detailRef.current.style.transform = "translateY(".concat(offsetTop + 'px', ")");
   });
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: detailRef,