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

package/lib/table/base/calculations.js

@@ -1,96 +1,62 @@
 "use strict";
 
 var _sliceInstanceProperty2 = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
 var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
-
 var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
-
 var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.calculateRenderInfo = calculateRenderInfo;
 exports.getLeftNestedLockCount = getLeftNestedLockCount;
-
 var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _map2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/map"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
-
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
-
 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 resolveVirtualEnabled(virtualEnum, defaultValue) {
   if (virtualEnum == null || virtualEnum === 'auto') {
     return defaultValue;
   }
-
   return virtualEnum;
 }
-
 var lockColumnNeedSpecifiedWidthWarned = false;
-
 function warnLockColumnNeedSpecifiedWidth(column) {
   if (!lockColumnNeedSpecifiedWidthWarned) {
     lockColumnNeedSpecifiedWidthWarned = true;
-
     _utils.console.warn('lock=true 的列需要指定宽度', column);
   }
 }
-
 var columnHiddenDeprecatedWarned = false;
-
 function warnColumnHiddenDeprecated(column) {
   if (!columnHiddenDeprecatedWarned) {
     columnHiddenDeprecatedWarned = true;
-
     _utils.console.warn('column.hidden 已经过时，如果需要隐藏该列，请将其从 columns 数组中移除', column);
   }
 }
 /** 检查列配置 & 设置默认宽度 & 剔除隐藏的列 */
-
-
 function processColumns(columns, defaultColumnWidth) {
   if (columns == null || !Array.isArray(columns)) {
     _utils.console.warn('<BaseTable /> props.columns 需要传入一个数组', columns);
-
     columns = [];
   }
-
   function dfs(columns) {
     var result = [];
-
     var _iterator = _createForOfIteratorHelper(columns),
-        _step;
-
+      _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var column = _step.value;
-
         if (column.width == null) {
           if (defaultColumnWidth != null) {
             column = (0, _extends2.default)((0, _extends2.default)({}, column), {
@@ -100,7 +66,6 @@ function processColumns(columns, defaultColumnWidth) {
             warnLockColumnNeedSpecifiedWidth(column);
           }
         }
-
         if ((0, _utils.isLeafNode)(column)) {
           if (column.hidden) {
             // 被隐藏的列 会在这里被剔除
@@ -109,8 +74,8 @@ function processColumns(columns, defaultColumnWidth) {
             result.push(column);
           }
         } else {
-          var nextChildren = dfs(column.children); // 如果 nextChildren 为空，说明所有的子节点均被隐藏了，在这里隐藏父节点
-
+          var nextChildren = dfs(column.children);
+          // 如果 nextChildren 为空，说明所有的子节点均被隐藏了，在这里隐藏父节点
           if (nextChildren.length > 0) {
             result.push((0, _extends2.default)((0, _extends2.default)({}, column), {
               children: nextChildren
@@ -123,23 +88,17 @@ function processColumns(columns, defaultColumnWidth) {
     } finally {
       _iterator.f();
     }
-
     return result;
   }
-
   return dfs(columns);
 }
-
 function getLeftNestedLockCount(columns) {
   var nestedCount = 0;
-
   var _iterator2 = _createForOfIteratorHelper(columns),
-      _step2;
-
+    _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var col = _step2.value;
-
       if (isLock(col)) {
         nestedCount += 1;
       } else {
@@ -151,9 +110,7 @@ function getLeftNestedLockCount(columns) {
   } finally {
     _iterator2.f();
   }
-
   return nestedCount;
-
   function isLock(col) {
     if ((0, _utils.isLeafNode)(col)) {
       return col.lock;
@@ -162,15 +119,12 @@ function getLeftNestedLockCount(columns) {
     }
   }
 }
-
 function getHorizontalRenderRange(_ref) {
   var _context, _context2;
-
   var offsetX = _ref.offsetX,
-      maxRenderWidth = _ref.maxRenderWidth,
-      flat = (0, _flat.default)(_ref),
-      useVirtual = _ref.useVirtual;
-
+    maxRenderWidth = _ref.maxRenderWidth,
+    flat = (0, _flat.default)(_ref),
+    useVirtual = _ref.useVirtual;
   if (!useVirtual.horizontal) {
     return {
       leftIndex: 0,
@@ -179,30 +133,24 @@ function getHorizontalRenderRange(_ref) {
       rightBlank: 0
     };
   }
-
   var leftIndex = 0;
   var centerCount = 0;
   var leftBlank = 0;
   var centerRenderWidth = 0;
   var overscannedOffsetX = Math.max(0, offsetX - _utils2.OVERSCAN_SIZE);
-
   while (leftIndex < flat.center.length) {
     var col = flat.center[leftIndex];
-
     if (col.width + leftBlank < overscannedOffsetX) {
       leftIndex += 1;
       leftBlank += col.width;
     } else {
       break;
     }
-  } // 考虑 over scan 之后，中间部分的列至少需要渲染的宽度
-
-
+  }
+  // 考虑 over scan 之后，中间部分的列至少需要渲染的宽度
   var minCenterRenderWidth = maxRenderWidth + (overscannedOffsetX - leftBlank) + 2 * _utils2.OVERSCAN_SIZE;
-
   while (leftIndex + centerCount < flat.center.length) {
     var _col = flat.center[leftIndex + centerCount];
-
     if (centerRenderWidth < minCenterRenderWidth) {
       centerRenderWidth += _col.width;
       centerCount += 1;
@@ -210,7 +158,6 @@ function getHorizontalRenderRange(_ref) {
       break;
     }
   }
-
   var rightBlankCount = flat.center.length - leftIndex - centerCount;
   var rightBlank = (0, _utils2.sum)((0, _map.default)(_context = (0, _slice.default)(_context2 = flat.center).call(_context2, flat.center.length - rightBlankCount)).call(_context, function (col) {
     return col.width;
@@ -221,28 +168,25 @@ function getHorizontalRenderRange(_ref) {
     rightIndex: leftIndex + centerCount,
     rightBlank: rightBlank
   };
-} // 一顿计算，将表格本次渲染所需要的数据都给算出来（代码写得有点乱，有较大优化空间）
+}
+// 一顿计算，将表格本次渲染所需要的数据都给算出来（代码写得有点乱，有较大优化空间）
 // todo 可以考虑下将 header 部分的计算逻辑也放到这个文件中，目前应该有一些重复的计算逻辑
-
-
 function calculateRenderInfo(table) {
   var _context3, _context4, _context5, _context6, _context7, _context8, _context9;
-
   var _table$state = table.state,
-      offsetX = _table$state.offsetX,
-      maxRenderWidth = _table$state.maxRenderWidth;
+    offsetX = _table$state.offsetX,
+    maxRenderWidth = _table$state.maxRenderWidth;
   var _table$props = table.props,
-      useVirtualProp = _table$props.useVirtual,
-      columnsProp = _table$props.columns,
-      dataSourceProp = _table$props.dataSource,
-      defaultColumnWidth = _table$props.defaultColumnWidth;
+    useVirtualProp = _table$props.useVirtual,
+    columnsProp = _table$props.columns,
+    dataSourceProp = _table$props.dataSource,
+    defaultColumnWidth = _table$props.defaultColumnWidth;
   var columns = processColumns(columnsProp, defaultColumnWidth);
   var leftNestedLockCount = getLeftNestedLockCount(columns);
   var fullFlat = (0, _utils.collectNodes)(columns, 'leaf-only');
   var flat;
   var nested;
   var useVirtual;
-
   if (leftNestedLockCount === columns.length) {
     flat = {
       left: [],
@@ -288,7 +232,6 @@ function calculateRenderInfo(table) {
       center: centerNested
     };
   }
-
   var horizontalRenderRange = getHorizontalRenderRange({
     maxRenderWidth: maxRenderWidth,
     offsetX: offsetX,
@@ -297,9 +240,9 @@ function calculateRenderInfo(table) {
   });
   var verticalRenderRange = table.getVerticalRenderRange(useVirtual);
   var leftBlank = horizontalRenderRange.leftBlank,
-      leftIndex = horizontalRenderRange.leftIndex,
-      rightBlank = horizontalRenderRange.rightBlank,
-      rightIndex = horizontalRenderRange.rightIndex;
+    leftIndex = horizontalRenderRange.leftIndex,
+    rightBlank = horizontalRenderRange.rightBlank,
+    rightIndex = horizontalRenderRange.rightIndex;
   var unfilteredVisibleColumnDescriptors = (0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)((0, _map.default)(_context4 = flat.left).call(_context4, function (col, i) {
     return {
       type: 'normal',
@@ -327,7 +270,8 @@ function calculateRenderInfo(table) {
       colIndex: flat.full.length - flat.right.length + i
     };
   })));
-  var visibleColumnDescriptors = (0, _filter.default)(unfilteredVisibleColumnDescriptors).call(unfilteredVisibleColumnDescriptors, Boolean); // const totalWidth = visibleColumnDescriptors.reduce((pre, cur) => {
+  var visibleColumnDescriptors = (0, _filter.default)(unfilteredVisibleColumnDescriptors).call(unfilteredVisibleColumnDescriptors, Boolean);
+  // const totalWidth = visibleColumnDescriptors.reduce((pre, cur) => {
   //   if (cur.type === 'blank') {
   //     return cur.width + pre
   //   } else {
@@ -341,26 +285,21 @@ function calculateRenderInfo(table) {
   //     width: `width: calc(100% - ${totalWidth}px)`
   //   } as VisibleColumnDescriptor)
   // }
-
   var fullFlatCount = flat.full.length;
   var leftFlatCount = flat.left.length;
   var rightFlatCount = flat.right.length;
   var stickyLeftMap = new _map2.default();
   var stickyLeft = 0;
-
   for (var i = 0; i < leftFlatCount; i++) {
     stickyLeftMap.set(i, stickyLeft);
     stickyLeft += flat.full[i].width;
   }
-
   var stickyRightMap = new _map2.default();
   var stickyRight = 0;
-
   for (var _i = 0; _i < rightFlatCount; _i++) {
     stickyRightMap.set(fullFlatCount - 1 - _i, stickyRight);
     stickyRight += flat.full[fullFlatCount - 1 - _i].width;
   }
-
   var leftLockTotalWidth = (0, _utils2.sum)((0, _map.default)(_context8 = flat.left).call(_context8, function (col) {
     return col.width;
   }));

package/lib/table/base/colgroup.js

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

package/lib/table/base/empty.js

@@ -1,30 +1,19 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EmptyHtmlTable = EmptyHtmlTable;
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _colgroup = require("./colgroup");
-
 var _styles = require("./styles");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var DefaultEmptyContent = /*#__PURE__*/_react.default.memo(function () {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("img", {
     alt: "empty-image",
@@ -34,13 +23,12 @@ var DefaultEmptyContent = /*#__PURE__*/_react.default.memo(function () {
     className: "empty-tips"
   }, "\u6CA1\u6709\u7B26\u5408\u67E5\u8BE2\u6761\u4EF6\u7684\u6570\u636E", /*#__PURE__*/_react.default.createElement("br", null), "\u8BF7\u4FEE\u6539\u6761\u4EF6\u540E\u91CD\u65B0\u67E5\u8BE2"));
 });
-
 function EmptyHtmlTable(_ref) {
   var descriptors = _ref.descriptors,
-      isLoading = _ref.isLoading,
-      emptyCellHeight = _ref.emptyCellHeight,
-      _ref$EmptyContent = _ref.EmptyContent,
-      EmptyContent = _ref$EmptyContent === void 0 ? DefaultEmptyContent : _ref$EmptyContent;
+    isLoading = _ref.isLoading,
+    emptyCellHeight = _ref.emptyCellHeight,
+    _ref$EmptyContent = _ref.EmptyContent,
+    EmptyContent = _ref$EmptyContent === void 0 ? DefaultEmptyContent : _ref$EmptyContent;
   var show = !isLoading;
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("table", {
     key: "table"

package/lib/table/base/header.d.ts

@@ -4,6 +4,7 @@ interface TableHeaderProps {
     info: RenderInfo;
     theaderPosition?: 'left' | 'center' | 'right';
     rowCount?: number;
+    stickyRightOffset?: number;
 }
-export default function TableHeader({ info, theaderPosition, rowCount: _rowCount }: TableHeaderProps): JSX.Element;
+export default function TableHeader({ info, theaderPosition, rowCount: _rowCount, stickyRightOffset }: TableHeaderProps): JSX.Element;
 export {};

package/lib/table/base/header.js

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