@kdcloudjs/table 1.2.0-canary.8 → 1.2.0

package/es/table/pipeline/features/treeMode.js

@@ -71,6 +71,11 @@ export function treeMode() {
     return pipeline.mapDataSource(processDataSource).mapColumns(processColumns);
 
     function processDataSource(input) {
+      if (pipeline.isSameInputDataSource() && openKeys === pipeline.getFeatureOptions('lastOpenKeys')) {
+        return pipeline.getFeatureOptions('lastTreeMode');
+      }
+
+      pipeline.setFeatureOptions('lastOpenKeys', pipeline.getStateAtKey(stateKey) || openKeys);
       var result = [];
       dfs(input, 0);
 
@@ -111,6 +116,7 @@ export function treeMode() {
         }
       }
 
+      pipeline.setFeatureOptions('lastTreeMode', result);
       return result;
     }
 

package/es/table/pipeline/pipeline.d.ts

@@ -35,6 +35,7 @@ export declare class TablePipeline {
     private readonly _rowPropsGetters;
     private _tableProps;
     private _dataSource;
+    private _isSameInputDataSource;
     private _columns;
     private _footerDataSource?;
     static defaultIndents: TablePipelineIndentsConfig;
@@ -51,6 +52,7 @@ export declare class TablePipeline {
     appendRowPropsGetter(getter: RowPropsGetter): this;
     addTableProps(props: React.HTMLAttributes<HTMLTableElement>): void;
     getDataSource(name?: string): any[];
+    isSameInputDataSource(): boolean;
     getColumns(name?: string): any[];
     getFooterDataSource(): any[];
     getStateAtKey<T = any>(stateKey: string, defaultValue?: T): T;

package/es/table/pipeline/pipeline.js

@@ -76,6 +76,11 @@ export var TablePipeline = /*#__PURE__*/function () {
         return this._snapshots[name].dataSource;
       }
     }
+  }, {
+    key: "isSameInputDataSource",
+    value: function isSameInputDataSource() {
+      return this._isSameInputDataSource;
+    }
   }, {
     key: "getColumns",
     value: function getColumns(name) {
@@ -127,9 +132,12 @@ export var TablePipeline = /*#__PURE__*/function () {
 
       if (this._dataSource != null || this._columns != null) {
         throw new Error('input 不能调用两次');
-      }
+      } // 在 pipeline 中识别本次更新是否有数据变化
+
 
+      this._isSameInputDataSource = _input.dataSource === this.ref.current._lastInputDataSource;
       this._dataSource = _input.dataSource;
+      this.ref.current._lastInputDataSource = _input.dataSource;
       this._columns = _mapInstanceProperty(_context = _input.columns).call(_context, function (col) {
         return _extends(_extends({}, col), {
           key: _this.guid()

package/es/table/utils/index.d.ts

@@ -17,3 +17,4 @@ export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
 export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

package/es/table/utils/index.js

@@ -16,4 +16,5 @@ export { copyDataToClipboard, executeOnTempElement } from './copyToClipboard';
 export { default as layeredFilter } from './layeredFilter';
 export { getEventPath, isElementInEventPath, getTargetEleInEventPath, calculatePointerRelative, calculatePopupRelative, keepWithinBounds } from './element';
 export { default as console } from './console';
-export { browserType } from './browserType';
+export { browserType } from './browserType';
+export { MULTI_SELECT_MARK_PROPNAME, SINGLE_SELECT_MARK_PROPNAME, isSelectColumn } from './selectColumn';

package/es/table/utils/selectColumn.d.ts

@@ -0,0 +1,4 @@
+import { ArtColumn } from '../interfaces';
+export declare const MULTI_SELECT_MARK_PROPNAME = "checkboxSelection";
+export declare const SINGLE_SELECT_MARK_PROPNAME = "radioSelection";
+export declare function isSelectColumn(column: ArtColumn): boolean;

package/es/table/utils/selectColumn.js

@@ -0,0 +1,6 @@
+export var MULTI_SELECT_MARK_PROPNAME = 'checkboxSelection';
+export var SINGLE_SELECT_MARK_PROPNAME = 'radioSelection';
+export function isSelectColumn(column) {
+  var features = column.features || {};
+  return features[MULTI_SELECT_MARK_PROPNAME] === true || features[SINGLE_SELECT_MARK_PROPNAME] === true;
+}

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

@@ -249,7 +249,8 @@ function TableHeader(_ref2) {
 
   var info = _ref2.info,
       theaderPosition = _ref2.theaderPosition,
-      _rowCount = _ref2.rowCount;
+      _rowCount = _ref2.rowCount,
+      stickyRightOffset = _ref2.stickyRightOffset;
   var nested = info.nested,
       flat = (0, _flat.default)(info),
       stickyLeftMap = info.stickyLeftMap,
@@ -293,7 +294,8 @@ function TableHeader(_ref2) {
           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';

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

@@ -107,7 +107,9 @@ var TableDOMHelper = /*#__PURE__*/function () {
     this.tableFooter = this.artTable.querySelector(".".concat(_styles.Classes.tableFooter));
     this.tableFooterMain = this.artTable.querySelector(".".concat(_styles.Classes.tableFooterMain));
     var stickyScrollSelector = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = ".".concat(_styles.Classes.artTable, " + .")).call(_context3, _styles.Classes.horizontalStickyScrollContainer, " .")).call(_context2, _styles.Classes.stickyScroll);
-    this.stickyScroll = artTableWrapper.querySelector(stickyScrollSelector);
+    var stickyScrolls = artTableWrapper.querySelectorAll(stickyScrollSelector);
+    this.stickyScroll = stickyScrolls[stickyScrolls.length - 1]; // 当嵌套多层表格时，需要查找最后一个，否则会查找到父表格内嵌套的子表格的
+
     this.stickyScrollItem = this.stickyScroll.querySelector(".".concat(_styles.Classes.stickyScrollItem));
   }
 

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

@@ -141,7 +141,7 @@ function HtmlTable(_ref) {
       positionStyle.left = hozInfo.stickyLeftMap.get(colIndex);
     } else if (colIndex >= fullFlatCount - rightFlatCount) {
       positionStyle.position = 'sticky';
-      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
+      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) + (typeof stickyRightOffset === 'number' ? stickyRightOffset : 0);
     }
 
     return /*#__PURE__*/_react.default.createElement('td', (0, _extends2.default)((0, _extends2.default)((0, _extends2.default)((0, _extends2.default)({

package/lib/table/base/renderTemplates.js

@@ -50,7 +50,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  */
 var TEMPLATES = new _map.default();
 
-function renderTableHeaderInIE(info, props) {
+function renderTableHeaderInIE(info, props, extra) {
   var stickyTop = props.stickyTop,
       hasHeader = props.hasHeader;
   var flat = (0, _flat.default)(info),
@@ -63,6 +63,9 @@ function renderTableHeaderInIE(info, props) {
       rightNested = nested.right,
       full = nested.full;
   var rowCount = (0, _utils2.getTreeDepth)(full) + 1;
+  var fixedRightTableStyle = {
+    right: (extra === null || extra === void 0 ? void 0 : extra.stickyRightOffset) || 0
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_styles.Classes.tableHeader)
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -74,6 +77,11 @@ function renderTableHeaderInIE(info, props) {
   }, /*#__PURE__*/_react.default.createElement(_header.default, {
     info: info,
     theaderPosition: hasLockColumn ? 'center' : undefined
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: _styles.Classes.verticalScrollPlaceholder,
+    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", {
     className: _styles.Classes.fixedLeft
   }, /*#__PURE__*/_react.default.createElement(_header.default, {
@@ -101,7 +109,8 @@ function renderTableHeaderInIE(info, props) {
     theaderPosition: "left",
     rowCount: rowCount
   })) : null, right.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
-    className: _styles.Classes.fixedRight
+    className: _styles.Classes.fixedRight,
+    style: fixedRightTableStyle
   }, /*#__PURE__*/_react.default.createElement(_header.default, {
     info: (0, _extends2.default)((0, _extends2.default)({}, info), {
       flat: {
@@ -154,9 +163,6 @@ function renderTableBodyInIE(info, props, extra) {
     primaryKey: primaryKey,
     data: (0, _slice.default)(dataSource).call(dataSource, topIndex, bottomIndex)
   };
-  var fixedRightTableStyle = {
-    right: -extra.stickyRightOffset
-  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_styles.Classes.tableBody, _styles.Classes.horizontalScrollContainer)
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -209,8 +215,7 @@ function renderTableBodyInIE(info, props, extra) {
       height: bottomBlank
     }
   })) : null, right.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
-    className: _styles.Classes.fixedRight,
-    style: fixedRightTableStyle
+    className: _styles.Classes.fixedRight
   }, topBlank > 0 && /*#__PURE__*/_react.default.createElement("div", {
     key: "top-blank",
     className: (0, _classnames.default)(_styles.Classes.virtualBlank, 'top'),
@@ -221,7 +226,6 @@ function renderTableBodyInIE(info, props, extra) {
     tbodyHtmlTag: "tbody"
   }, commonProps, {
     tbodyPosition: "right",
-    stickyRightOffset: extra.stickyRightOffset,
     horizontalRenderInfo: (0, _extends2.default)((0, _extends2.default)({}, info), {
       flat: {
         center: right,
@@ -269,6 +273,9 @@ function renderTableFooterInIE(info, props, extra) {
     primaryKey: primaryKey,
     verticalRenderInfo: verticalRenderInfo
   };
+  var fixedRightTableStyle = {
+    right: (extra === null || extra === void 0 ? void 0 : extra.stickyRightOffset) || 0
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)(_styles.Classes.tableFooter),
     style: {
@@ -281,7 +288,13 @@ function renderTableFooterInIE(info, props, extra) {
   }, commonProps, {
     tbodyPosition: hasLockColumn ? 'center' : undefined,
     horizontalRenderInfo: info
-  }))), left.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+  })), footerDataSource.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+    className: _styles.Classes.verticalScrollPlaceholder,
+    style: typeof (extra === null || extra === void 0 ? void 0 : extra.stickyRightOffset) === 'number' ? {
+      width: extra === null || extra === void 0 ? void 0 : extra.stickyRightOffset,
+      visibility: 'initial'
+    } : undefined
+  }) : null), left.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
     className: _styles.Classes.fixedLeft
   }, /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
     tbodyHtmlTag: "tfoot"
@@ -297,7 +310,8 @@ function renderTableFooterInIE(info, props, extra) {
       visible: (0, _slice.default)(visible).call(visible, 0, left.length)
     })
   }))) : null, right.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
-    className: _styles.Classes.fixedRight
+    className: _styles.Classes.fixedRight,
+    style: fixedRightTableStyle
   }, /*#__PURE__*/_react.default.createElement(_htmlTable.HtmlTable, (0, _extends2.default)({
     tbodyHtmlTag: "tfoot"
   }, commonProps, {

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

@@ -70,6 +70,13 @@ export declare const Classes: {
     readonly popup: string;
     readonly popupHeader: string;
     readonly popupBody: string;
+    readonly rowDragging: string;
+    readonly rowDragStart: string;
+    readonly rowDragEnd: string;
+    readonly rowDragEndToTop: string;
+    readonly rowDragEndToBottom: string;
+    readonly rowDragElement: string;
+    readonly rowDragCell: string;
 };
 export declare const MenuClasses: {
     menu: string;

package/lib/table/base/styles.js

@@ -105,7 +105,14 @@ var Classes = {
   collapsed: "".concat(prefix, "collapsed"),
   popup: "".concat(prefix, "popup"),
   popupHeader: "".concat(prefix, "popup-header"),
-  popupBody: "".concat(prefix, "popup-body")
+  popupBody: "".concat(prefix, "popup-body"),
+  rowDragging: "".concat(prefix, "row-dragging"),
+  rowDragStart: "".concat(prefix, "row-drag-start"),
+  rowDragEnd: "".concat(prefix, "row-drag-end"),
+  rowDragEndToTop: "".concat(prefix, "row-drag-end-to-top"),
+  rowDragEndToBottom: "".concat(prefix, "row-drag-end-to-bottom"),
+  rowDragElement: "".concat(prefix, "row-drag-element"),
+  rowDragCell: "".concat(prefix, "row-drag-cell")
 };
 exports.Classes = Classes;
 var MenuClasses = {
@@ -162,7 +169,7 @@ exports.variableConst = variableConst;
 var notBorderedStyleMixin = (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  --cell-border-vertical: none;\n  --header-cell-border-vertical: none;\n"])));
 var borderedStyleMixin = (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  //th\u9690\u85CF\u5217\u5BBD\u62D6\u62FD\u7684\u80CC\u666F\u8272\uFF0C\u4F7F\u7528th\u7684\u53F3\u8FB9\u6846\u4EE3\u66FF\n  .", "::after{\n    background-color: inherit;\n  }\n"])), Classes.tableHeaderCellResize);
 
-var StyledArtTableWrapper = _styledComponents.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  :root {\n    ", "\n  }\n  ", "\n\n  box-sizing: border-box;\n  * {\n    box-sizing: border-box;\n  }\n  cursor: default;\n  color: var(--color);\n  font-size: var(--font-size);\n  line-height: var(--line-height);\n  position: relative;\n\n  // \u8868\u683C\u5916\u8FB9\u6846\u7531 art-table-wrapper \u63D0\u4F9B\uFF0C\u800C\u4E0D\u662F\u7531\u5355\u5143\u683C\u63D0\u4F9B\n  &.use-outer-border {\n    ", ";\n  }\n\n  // \u8868\u683C\u4E0D\u542F\u7528\u8FB9\u6846\u7EBF\uFF0C\u9690\u85CFth\u3001td\u7684\u5355\u5143\u683C\u5DE6\u53F3\u8FB9\u6846\u7EBF\n  &:not(.", ") {\n    ", "\n  }\n  &.", "{\n    ", "\n  }\n\n  .no-scrollbar {\n    ::-webkit-scrollbar {\n      display: none;\n    }\n  }\n\n  .", " {\n    overflow: auto;\n    flex-shrink: 1;\n    flex-grow: 1;\n    display: flex;\n    flex-direction: column;\n  }\n\n  .", " {\n    overflow: hidden;\n    background: var(--header-bgcolor);\n    display: flex;\n    flex-shrink: 0;\n    border-bottom: var(--header-cell-border-horizontal);\n  }\n\n  .", " {\n    display: flex;\n    // justify-content: flex-start;\n    align-items: center;\n    height: inherit;\n  }\n\n  .", " {\n     overflow-x:auto;\n     flex-shrink: 0;\n     flex-grow: 0;\n     scrollbar-width: none; // \u517C\u5BB9\u706B\u72D0\n     & {\n       ::-webkit-scrollbar {\n         display:none;\n       }\n     }\n   }\n\n  .", " {\n    display: flex;\n    flex: none;\n  }\n  .", ", .", " {\n    background: var(--bgcolor);\n    overflow: auto;\n    overflow-x: hidden;\n    overflow-anchor: none;\n    position:relative;\n    &.empty {\n      position: relative;\n    }\n  }\n\n  .", " {\n    position: relative;\n  }\n  .", ", .", "  {\n    .", "{\n      background-color: #e6effb !important;\n    }\n    .", "{\n      border-top: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-left: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-bottom: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-right: 1px solid #0E5FD8 !important;\n    }\n  }\n\n  .", " {\n    user-select:none;\n  }\n\n\n  &.sticky-header .", " {\n    position: sticky;\n    top: 0;\n    z-index: ", ";\n  }\n\n  &.sticky-footer .", " {\n    position: sticky;\n    bottom: 0;\n    z-index: ", ";\n  }\n\n  table {\n    width: 0;\n    table-layout: fixed;\n    border-collapse: separate;\n    border-spacing: 0;\n    display: table;\n    margin: 0;\n    padding: 0;\n    flex-shrink: 0;\n    flex-grow: 0;\n    position:relative;\n  }\n\n  // \u5728 tr \u4E0A\u8BBE\u7F6E .no-hover \u53EF\u4EE5\u7981\u7528\u9F20\u6807\u60AC\u505C\u6548\u679C\n  tr:not(.no-hover):hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u4F7F\u7528 js \u6DFB\u52A0\u60AC\u6D6E\u6548\u679C\n  tr:not(.no-hover).row-hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u5728 tr \u8BBE\u7F6E highlight \u53EF\u4EE5\u4E3A\u5E95\u4E0B\u7684 td \u8BBE\u7F6E\u4E3A\u9AD8\u4EAE\u8272\n  // \u800C\u8BBE\u7F6E .no-highlight \u7684\u8BDD\u5219\u53EF\u4EE5\u7981\u7528\u9AD8\u4EAE\u6548\u679C\uFF1B\n  tr:not(.no-highlight).highlight > td {\n    background: var(--highlight-bgcolor);\n  }\n\n  th {\n    font-weight: normal;\n    text-align: left;\n    padding: var(--cell-padding);\n    height: var(--header-row-height);\n    color: var(--header-color);\n    background: var(--header-bgcolor);\n    border:1px solid transparent;\n    border-right: var(--header-cell-border-vertical);\n    border-bottom: var(--header-cell-border-horizontal);\n    position: relative;\n  }\n\n  th.resizeable{\n    border-right: var(--header-cell-border-vertical)\n  }\n\n  th.", " {\n    border-right: var(--header-cell-border-vertical);\n    border-bottom: none;\n  }\n\n  tr.", " th {\n    border-top: var(--header-cell-border-horizontal);\n  }\n  th.", " {\n    border-left: var(--header-cell-border-vertical);\n  }\n\n  td {\n    padding: var(--cell-padding);\n    background: var(--bgcolor);\n    height: var(--row-height);\n    border:1px solid transparent;\n    border-right: var(--cell-border-vertical);\n    border-bottom: var(--cell-border-horizontal);\n    word-break: break-all;\n  }\n  td.", " {\n    border-left: var(--cell-border-vertical);\n  }\n  tr.", " td {\n    border-top: var(--cell-border-horizontal);\n  }\n  &.has-header tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tbody tr.", " td {\n    border-bottom: none;\n  }\n\n  .", ",\n  .", " {\n    z-index: ", ";\n  }\n\n  //#region \u9501\u5217\u9634\u5F71\n  .", " {\n    position: absolute;\n    top: 0;\n    bottom: 0;\n    z-index: ", ";\n    pointer-events: none;\n    overflow: hidden;\n\n    .", " {\n      height: 100%;\n    }\n\n    .", " {\n      margin-right: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-right: var(--cell-border-vertical);\n      }\n    }\n\n    .", " {\n      margin-left: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-left: var(--cell-border-vertical);\n      }\n    }\n  }\n  //#endregion\n\n  //#region \u7A7A\u8868\u683C\u5C55\u73B0\n  .", " {\n    pointer-events: none;\n    color: #99a3b3;\n    font-size: 12px;\n    text-align: center;\n    position: absolute;\n    left: 50%;\n    top: 50%;\n    transform: translate(-50%, -50%);\n\n    .empty-image {\n      width: 50px;\n      height: 50px;\n    }\n\n    .empty-tips {\n      margin-top: 16px;\n      line-height: 1.5;\n    }\n  }\n  //#endregion\n\n  //#region IE\u517C\u5BB9\n  &.ie-polyfill-wrapper {\n    //\u9501\u5B9A\u5217\u517C\u5BB9 \u4EC5\u5728\u9501\u5B9A\u5217\u7684\u60C5\u51B5\u4E0B\u751F\u6548\n    .", " {\n      overflow-x: hidden;\n    }\n    .", ", .", " {\n      position:relative;\n    }\n    .", " {\n      overflow: hidden;\n    }\n    .", " {\n      position: relative;\n    }\n\n    .", " {\n      overflow: auto;\n      overflow-x: hidden;\n      overflow-anchor: none;\n    }\n\n    .", ", .", "{\n      position: absolute;\n      z-index: ", ";\n      top: 0;\n    }\n    .", "{\n      left:0;\n    }\n    .", "{\n      right:0;\n    }\n\n    .", "{\n      .", "{\n        position: absolute;\n        top: 0;\n        width: 100%;\n        z-index: ", ";\n      }\n    }\n\n    tr:not(.no-hover).row-hover > td {\n      background: var(--hover-bgcolor);\n    }\n  }\n  //#endregion\n\n  //#region \u7C98\u6027\u6EDA\u52A8\u6761\n  .", "{\n    display:flex;\n    background: var(--bgcolor);\n  }\n  .", "{\n    height: 1px;\n    flex-shrink: 0;\n    border-top: 1px solid var(--border-color);\n  }\n\n  .", "{\n    height: 1px;\n    flex-shrink: 0;\n    border-top: 1px solid var(--border-color);\n  }\n  .", " {\n    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 1;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n  }\n\n  .", " {\n    // \u5FC5\u987B\u6709\u9AD8\u5EA6\u624D\u80FD\u51FA\u73B0\u6EDA\u52A8\u6761\n    height: 1px;\n    visibility: hidden;\n  }\n  //#endregion\n\n  //#region \u52A0\u8F7D\u6837\u5F0F\n  .", " {\n    position: relative;\n    width: 100%;\n    height: 100%;\n    overflow: auto;\n\n    .", " {\n      filter: none;\n      width: 100%;\n      height: 100%;\n      overflow: hidden;//\u5217\u5168\u90E8\u56FA\u5B9A\u65F6\uFF0C\u5B58\u5728\u53CC\u6A2A\u5411\u6EDA\u52A8\u6761\n      display: flex;\n      position: relative;\n      flex-direction: column;\n    }\n\n    .", " {\n      position: absolute;\n      left: 0;\n      right: 0;\n      top: 0;\n      bottom: 0;\n      pointer-events: none;\n    }\n\n    .", " {\n      position: sticky;\n      z-index: ", ";\n      transform: translateY(-50%);\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u8FC7\u6EE4\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n    padding: 6px 4px;\n    &:hover{\n      background-color: #e5e5e5;\n    }\n    &:focus {\n      outline: none\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u6392\u5E8F\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  //#endregion\n\n  //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n  .", " {\n    visibility: hidden;\n    flex-shrink: 0;\n  }\n  .", " .", " {\n    border-top: var(--cell-border-horizontal);\n  }\n  //#endregion\n\n  //#region \u62D6\u62FD\u5217\u5BBD\u5927\u5C0F\n  .", "::after{\n    background-color: var(--border-color);\n  }\n  //\u89E3\u51B3\u90E8\u5206\u6D4F\u89C8\u5668(chrome109)\u6700\u540E\u4E00\u4E2A\u5355\u5143\u683C\u7684\u5217\u5BBD\u62D6\u62FD\u533A\u57DF\u7EDD\u5BF9\u5B9A\u4F4D\u8D85\u51FA\u8868\u683C\uFF0C\u5BFC\u81F4\u8868\u683C\u7AD6\u5206\u5272\u7EBF\u65E0\u6CD5\u5BF9\u9F50\n  .", " th.", " .", "{\n    right: 0;\n    width: 5px;\n    &::after{\n      left: 4px;\n    }\n  }\n  //#endregion\n\n  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTableBordered, notBorderedStyleMixin, Classes.artTableBordered, borderedStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableFooter, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, Classes.rangeSelection, Classes.tableHeader, Z.header, Classes.tableFooter, Z.footer, Classes.leaf, Classes.first, Classes.first, Classes.first, Classes.first, Classes.first, Classes.last, Classes.lockLeft, Classes.lockRight, Z.lock, Classes.lockShadowMask, Z.lockShadow, Classes.lockShadow, Classes.leftLockShadow, LOCK_SHADOW_PADDING, Classes.rightLockShadow, LOCK_SHADOW_PADDING, Classes.emptyWrapper, Classes.virtual, Classes.tableBody, Classes.tableFooter, Classes.tableHeaderMain, Classes.tableHeader, Classes.tableFooterMain, Classes.fixedLeft, Classes.fixedRight, Z.lock, Classes.fixedLeft, Classes.fixedRight, Classes.rowDetailContainer, Classes.rowDetailItem, Z.rowDetail, Classes.horizontalStickyScrollContainer, Classes.horizontalScrollLeftSpacer, Classes.horizontalScrollRightSpacer, Classes.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.tableExtendIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder, Classes.tableHeaderCellResize, Classes.tableHeaderRow, Classes.last, Classes.tableHeaderCellResize);
+var StyledArtTableWrapper = _styledComponents.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  :root {\n    ", "\n  }\n  ", "\n\n  box-sizing: border-box;\n  * {\n    box-sizing: border-box;\n  }\n  cursor: default;\n  color: var(--color);\n  font-size: var(--font-size);\n  line-height: var(--line-height);\n  position: relative;\n\n  // \u8868\u683C\u5916\u8FB9\u6846\u7531 art-table-wrapper \u63D0\u4F9B\uFF0C\u800C\u4E0D\u662F\u7531\u5355\u5143\u683C\u63D0\u4F9B\n  &.use-outer-border {\n    ", ";\n  }\n\n  // \u8868\u683C\u4E0D\u542F\u7528\u8FB9\u6846\u7EBF\uFF0C\u9690\u85CFth\u3001td\u7684\u5355\u5143\u683C\u5DE6\u53F3\u8FB9\u6846\u7EBF\n  &:not(.", ") {\n    ", "\n  }\n  &.", "{\n    ", "\n  }\n\n  .no-scrollbar {\n    ::-webkit-scrollbar {\n      display: none;\n    }\n  }\n\n  .", " {\n    overflow: auto;\n    flex-shrink: 1;\n    flex-grow: 1;\n    display: flex;\n    flex-direction: column;\n  }\n\n  .", " {\n    overflow: hidden;\n    background: var(--header-bgcolor);\n    display: flex;\n    flex-shrink: 0;\n    border-bottom: var(--header-cell-border-horizontal);\n  }\n\n  .", " {\n    display: flex;\n    // justify-content: flex-start;\n    align-items: center;\n    height: inherit;\n  }\n\n  .", " {\n     overflow-x:auto;\n     flex-shrink: 0;\n     flex-grow: 0;\n     scrollbar-width: none; // \u517C\u5BB9\u706B\u72D0\n     & {\n       ::-webkit-scrollbar {\n         display:none;\n       }\n     }\n   }\n\n  .", " {\n    display: flex;\n    flex: none;\n  }\n  .", ", .", " {\n    background: var(--bgcolor);\n    overflow: auto;\n    overflow-x: hidden;\n    overflow-anchor: none;\n    position:relative;\n    &.empty {\n      position: relative;\n    }\n  }\n\n  .", " {\n    position: relative;\n  }\n  .", ", .", "  {\n    .", "{\n      background-color: #e6effb !important;\n    }\n    .", "{\n      border-top: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-left: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-bottom: 1px solid #0E5FD8 !important;\n    }\n    .", "{\n      border-right: 1px solid #0E5FD8 !important;\n    }\n  }\n\n  .", " {\n    user-select:none;\n  }\n\n  .", " {\n    user-select:none;\n    .", " .", " >td{\n        cursor:move;\n    }\n\n    .", " .", " >td{\n        cursor:no-drop;\n    }\n    \n  }\n\n  .", "{\n    opacity: 0.5;\n  }\n\n\n  .", " td{\n    border-top: 1px solid var(--primary-color) !important;\n  }\n\n  .", " td{\n    border-bottom: 1px solid var(--primary-color) !important;\n   \n  }\n\n  .", " {\n    cursor:pointer;\n  }\n\n\n  &.sticky-header .", " {\n    position: sticky;\n    top: 0;\n    z-index: ", ";\n  }\n\n  &.sticky-footer .", " {\n    position: sticky;\n    bottom: 0;\n    z-index: ", ";\n  }\n\n  table {\n    width: 0;\n    table-layout: fixed;\n    border-collapse: separate;\n    border-spacing: 0;\n    display: table;\n    margin: 0;\n    padding: 0;\n    flex-shrink: 0;\n    flex-grow: 0;\n    position:relative;\n  }\n\n  // \u5728 tr \u4E0A\u8BBE\u7F6E .no-hover \u53EF\u4EE5\u7981\u7528\u9F20\u6807\u60AC\u505C\u6548\u679C\n  tr:not(.no-hover):hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u4F7F\u7528 js \u6DFB\u52A0\u60AC\u6D6E\u6548\u679C\n  tr:not(.no-hover).row-hover > td {\n    background: var(--hover-bgcolor);\n  }\n  // \u5728 tr \u8BBE\u7F6E highlight \u53EF\u4EE5\u4E3A\u5E95\u4E0B\u7684 td \u8BBE\u7F6E\u4E3A\u9AD8\u4EAE\u8272\n  // \u800C\u8BBE\u7F6E .no-highlight \u7684\u8BDD\u5219\u53EF\u4EE5\u7981\u7528\u9AD8\u4EAE\u6548\u679C\uFF1B\n  tr:not(.no-highlight).highlight > td {\n    background: var(--highlight-bgcolor);\n  }\n\n  th {\n    font-weight: normal;\n    text-align: left;\n    padding: var(--cell-padding);\n    height: var(--header-row-height);\n    color: var(--header-color);\n    background: var(--header-bgcolor);\n    border:1px solid transparent;\n    border-right: var(--header-cell-border-vertical);\n    border-bottom: var(--header-cell-border-horizontal);\n    position: relative;\n  }\n\n  th.resizeable{\n    border-right: var(--header-cell-border-vertical)\n  }\n\n  th.", " {\n    border-right: var(--header-cell-border-vertical);\n    border-bottom: none;\n  }\n\n  tr.", " th {\n    border-top: var(--header-cell-border-horizontal);\n  }\n  th.", " {\n    border-left: var(--header-cell-border-vertical);\n  }\n\n  td {\n    padding: var(--cell-padding);\n    background: var(--bgcolor);\n    height: var(--row-height);\n    border:1px solid transparent;\n    border-right: var(--cell-border-vertical);\n    border-bottom: var(--cell-border-horizontal);\n    word-break: break-all;\n  }\n  td.", " {\n    border-left: var(--cell-border-vertical);\n  }\n  tr.", " td {\n    border-top: var(--cell-border-horizontal);\n  }\n  &.has-header tbody tr.", " td {\n    border-top: none;\n  }\n  &.has-footer tbody tr.", " td {\n    border-bottom: none;\n  }\n\n  .", ",\n  .", " {\n    z-index: ", ";\n  }\n\n  //#region \u9501\u5217\u9634\u5F71\n  .", " {\n    position: absolute;\n    top: 0;\n    bottom: 0;\n    z-index: ", ";\n    pointer-events: none;\n    overflow: hidden;\n\n    .", " {\n      height: 100%;\n    }\n\n    .", " {\n      margin-right: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-right: var(--cell-border-vertical);\n      }\n    }\n\n    .", " {\n      margin-left: ", "px;\n      box-shadow: none;\n\n      &.show-shadow {\n        box-shadow: var(--lock-shadow);\n        border-left: var(--cell-border-vertical);\n      }\n    }\n  }\n  //#endregion\n\n  //#region \u7A7A\u8868\u683C\u5C55\u73B0\n  .", " {\n    pointer-events: none;\n    color: #99a3b3;\n    font-size: 12px;\n    text-align: center;\n    position: absolute;\n    left: 50%;\n    top: 50%;\n    transform: translate(-50%, -50%);\n\n    .empty-image {\n      width: 50px;\n      height: 50px;\n    }\n\n    .empty-tips {\n      margin-top: 16px;\n      line-height: 1.5;\n    }\n  }\n  //#endregion\n\n  //#region IE\u517C\u5BB9\n  &.ie-polyfill-wrapper {\n    //\u9501\u5B9A\u5217\u517C\u5BB9 \u4EC5\u5728\u9501\u5B9A\u5217\u7684\u60C5\u51B5\u4E0B\u751F\u6548\n    .", " {\n      overflow-x: hidden;\n    }\n    .", ", .", " {\n      position:relative;\n    }\n    .", " {\n      overflow: hidden;\n      display: flex;\n    }\n    .", " {\n      position: relative;\n    }\n\n    .", " {\n      display: flex;\n      overflow: auto;\n      overflow-x: hidden;\n      overflow-anchor: none;\n    }\n\n    .", ", .", "{\n      position: absolute;\n      z-index: ", ";\n      top: 0;\n    }\n    .", "{\n      left:0;\n    }\n    .", "{\n      right:0;\n    }\n\n    .", "{\n      .", "{\n        position: absolute;\n        top: 0;\n        width: 100%;\n        z-index: ", ";\n      }\n    }\n\n    tr:not(.no-hover).row-hover > td {\n      background: var(--hover-bgcolor);\n    }\n  }\n  //#endregion\n\n  //#region \u7C98\u6027\u6EDA\u52A8\u6761\n  .", "{\n    display:flex;\n    background: var(--bgcolor);\n  }\n  .", "{\n    height: 1px;\n    flex-shrink: 0;\n    border-top: 1px solid var(--border-color);\n  }\n\n  .", "{\n    height: 1px;\n    flex-shrink: 0;\n    border-top: 1px solid var(--border-color);\n  }\n  .", " {\n    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 1;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n  }\n\n  .", " {\n    // \u5FC5\u987B\u6709\u9AD8\u5EA6\u624D\u80FD\u51FA\u73B0\u6EDA\u52A8\u6761\n    height: 1px;\n    visibility: hidden;\n  }\n  //#endregion\n\n  //#region \u52A0\u8F7D\u6837\u5F0F\n  .", " {\n    position: relative;\n    width: 100%;\n    height: 100%;\n    overflow: auto;\n\n    .", " {\n      filter: none;\n      width: 100%;\n      height: 100%;\n      overflow: hidden;//\u5217\u5168\u90E8\u56FA\u5B9A\u65F6\uFF0C\u5B58\u5728\u53CC\u6A2A\u5411\u6EDA\u52A8\u6761\n      display: flex;\n      position: relative;\n      flex-direction: column;\n    }\n\n    .", " {\n      position: absolute;\n      left: 0;\n      right: 0;\n      top: 0;\n      bottom: 0;\n      pointer-events: none;\n    }\n\n    .", " {\n      position: sticky;\n      z-index: ", ";\n      transform: translateY(-50%);\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u8FC7\u6EE4\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n    padding: 6px 4px;\n    &:hover{\n      background-color: #e5e5e5;\n    }\n    &:focus {\n      outline: none\n    }\n  }\n  //#endregion\n\n  //#region \u8868\u683C\u6392\u5E8F\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  .", " {\n    color:var(--icon-color);\n    &.active{\n      color:var(--primary-color);\n    }\n  }\n  //#endregion\n\n  //#region \u6EDA\u52A8\u6761\u5360\u4F4D\n  .", " {\n    visibility: hidden;\n    flex-shrink: 0;\n  }\n  .", " .", " {\n    border-top: var(--cell-border-horizontal);\n  }\n  //#endregion\n\n  //#region \u62D6\u62FD\u5217\u5BBD\u5927\u5C0F\n  .", "::after{\n    background-color: var(--border-color);\n  }\n  //\u89E3\u51B3\u90E8\u5206\u6D4F\u89C8\u5668(chrome109)\u6700\u540E\u4E00\u4E2A\u5355\u5143\u683C\u7684\u5217\u5BBD\u62D6\u62FD\u533A\u57DF\u7EDD\u5BF9\u5B9A\u4F4D\u8D85\u51FA\u8868\u683C\uFF0C\u5BFC\u81F4\u8868\u683C\u7AD6\u5206\u5272\u7EBF\u65E0\u6CD5\u5BF9\u9F50\n  .", " th.", " .", "{\n    right: 0;\n    width: 5px;\n    &::after{\n      left: 4px;\n    }\n  }\n  //#endregion\n\n  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTableBordered, notBorderedStyleMixin, Classes.artTableBordered, borderedStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableFooter, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, Classes.rangeSelection, Classes.rowDragging, Classes.tableBody, Classes.tableRow, Classes.tableFooter, Classes.tableRow, Classes.rowDragStart, Classes.rowDragEndToTop, Classes.rowDragEndToBottom, Classes.rowDragCell, Classes.tableHeader, Z.header, Classes.tableFooter, Z.footer, Classes.leaf, Classes.first, Classes.first, Classes.first, Classes.first, Classes.first, Classes.last, Classes.lockLeft, Classes.lockRight, Z.lock, Classes.lockShadowMask, Z.lockShadow, Classes.lockShadow, Classes.leftLockShadow, LOCK_SHADOW_PADDING, Classes.rightLockShadow, LOCK_SHADOW_PADDING, Classes.emptyWrapper, Classes.virtual, Classes.tableBody, Classes.tableFooter, Classes.tableHeaderMain, Classes.tableHeader, Classes.tableFooterMain, Classes.fixedLeft, Classes.fixedRight, Z.lock, Classes.fixedLeft, Classes.fixedRight, Classes.rowDetailContainer, Classes.rowDetailItem, Z.rowDetail, Classes.horizontalStickyScrollContainer, Classes.horizontalScrollLeftSpacer, Classes.horizontalScrollRightSpacer, Classes.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.tableExtendIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder, Classes.tableHeaderCellResize, Classes.tableHeaderRow, Classes.last, Classes.tableHeaderCellResize);
 
 exports.StyledArtTableWrapper = StyledArtTableWrapper;
 var ButtonCSS = (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  ", "\n  //#region \u6309\u94AE\n  .", "{\n    color: var(--color);\n    background:#ffffff;\n    border:1px solid var(--strong-border-color);\n    border-radius: 2px;\n    cursor: pointer;\n    &:hover{\n      color: var(--primary-color);\n      border:1px solid var(--primary-color);\n    }\n  }\n  .", " {\n    color:#ffffff;\n    background-color: var(--primary-color);\n    border:none;\n    &:hover{\n      color:#ffffff;\n      background-color: var(--primary-color-level2);\n      border:none;\n    }\n  }\n//#endregion\n"])), variableConst, Classes.button, Classes.buttonPrimary);

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

@@ -130,11 +130,11 @@ export declare class BaseTable extends React.Component<BaseTableProps, BaseTable
     private artTableWrapperRef;
     private domHelper;
     private rootSubscription;
+    private resizeSubject;
     private lastInfo;
     private props$;
     private hasScrollY;
     private resizeObserver?;
-    private resizeSubject;
     private offsetY;
     /** @deprecated BaseTable.getDoms() 已经过时，请勿调用 */
     getDoms(): TableDOMHelper;
@@ -154,6 +154,7 @@ export declare class BaseTable extends React.Component<BaseTableProps, BaseTable
     private renderLockShadows;
     private renderStickyScroll;
     private getScrollBarWidth;
+    private getStickyScrollContainerStyle;
     render(): JSX.Element;
     componentDidMount(): void;
     componentDidUpdate(prevProps: Readonly<BaseTableProps>, prevState: Readonly<BaseTableState>): void;

package/lib/table/base/table.js

@@ -113,9 +113,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     _this = _super.call(this, props);
     _this.rowHeightManager = (0, _rowHeightManager.makeRowHeightManager)(_this.props.dataSource.length, _this.props.estimatedRowHeight);
     _this.artTableWrapperRef = /*#__PURE__*/_react.default.createRef();
-    _this.rootSubscription = new _rxjs.Subscription();
     _this.hasScrollY = false;
-    _this.resizeSubject = new _rxjs.Subject();
     _this.offsetY = 0;
 
     _this.handleRowMouseEnter = function (e) {
@@ -182,7 +180,6 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           bottomBlank = _info$verticalRenderR.bottomBlank,
           topBlank = _info$verticalRenderR.topBlank,
           bottomIndex = _info$verticalRenderR.bottomIndex;
-      var stickyRightOffset = _this.hasScrollY ? _this.getScrollBarWidth() : 0;
       var renderBody = (0, _renderTemplates.default)('body');
 
       if (typeof renderBody === 'function') {
@@ -190,8 +187,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           rowProps: {
             onMouseEnter: _this.handleRowMouseEnter,
             onMouseLeave: _this.handleRowMouseLeave
-          },
-          stickyRightOffset: stickyRightOffset
+          }
         });
       }
 
@@ -212,7 +208,6 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         getRowProps: getRowProps,
         primaryKey: primaryKey,
         data: (0, _slice.default)(dataSource).call(dataSource, topIndex, bottomIndex),
-        stickyRightOffset: stickyRightOffset,
         horizontalRenderInfo: info,
         verticalRenderInfo: {
           first: 0,
@@ -273,6 +268,9 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       var tableBodyHtmlTable = this.domHelper.getTableBodyHtmlTable();
       var innerTableWidth = tableBodyHtmlTable.offsetWidth;
       var artTableWidth = artTable.offsetWidth;
+      var artTableHeight = artTable.offsetHeight; // 表格隐藏后，不需要对表格的滚动条做额外的逻辑处理
+
+      if (artTableWidth === 0 && artTableHeight === 0) return;
       var stickyScrollHeightProp = this.props.stickyScrollHeight;
       var stickyScrollHeight = stickyScrollHeightProp === 'auto' ? this.getScrollBarWidth() : stickyScrollHeightProp; // stickyScroll.style.marginTop = `-${stickyScrollHeight + 1}px`
       // 设置滚动条高度
@@ -302,10 +300,10 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         //   }
         this.hasScrollY = true;
       } else {
-        stickyScroll.style.paddingRight = "".concat(stickyScrollHeight, "px"); //   this.setState({
+        // stickyScroll.style.paddingRight = `${stickyScrollHeight}px`
+        //   this.setState({
         //     hasScrollY: false
         //   })
-
         this.hasScrollY = false;
       }
 
@@ -316,9 +314,10 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       var _this$lastInfo = this.lastInfo,
           leftLockTotalWidth = _this$lastInfo.leftLockTotalWidth,
           rightLockTotalWidth = _this$lastInfo.rightLockTotalWidth;
-      var lockTotalWidth = leftLockTotalWidth + rightLockTotalWidth; // 设置子节点宽度
+      var lockTotalWidth = leftLockTotalWidth + rightLockTotalWidth;
+      var stickyRightOffset = this.hasScrollY ? this.getScrollBarWidth() : 0; // 设置子节点宽度
 
-      stickyScrollItem.style.width = "".concat(innerTableWidth - lockTotalWidth, "px");
+      stickyScrollItem.style.width = "".concat(innerTableWidth - lockTotalWidth + stickyRightOffset, "px");
     }
   }, {
     key: "renderTableHeader",
@@ -327,9 +326,12 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           stickyTop = _this$props3.stickyTop,
           hasHeader = _this$props3.hasHeader;
       var renderHeader = (0, _renderTemplates.default)('header');
+      var stickyRightOffset = this.hasScrollY ? this.getScrollBarWidth() : 0;
 
       if (typeof renderHeader === 'function') {
-        return renderHeader(info, this.props);
+        return renderHeader(info, this.props, {
+          stickyRightOffset: stickyRightOffset
+        });
       }
 
       return /*#__PURE__*/_react.default.createElement("div", {
@@ -339,7 +341,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           display: hasHeader ? undefined : 'none'
         }
       }, /*#__PURE__*/_react.default.createElement(_header.default, {
-        info: info
+        info: info,
+        stickyRightOffset: stickyRightOffset
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: _styles.Classes.verticalScrollPlaceholder,
         style: this.hasScrollY ? {
@@ -419,6 +422,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           getRowProps = _this$props4.getRowProps,
           primaryKey = _this$props4.primaryKey,
           stickyBottom = _this$props4.stickyBottom;
+      var stickyRightOffset = this.hasScrollY ? this.getScrollBarWidth() : 0;
       var renderFooter = (0, _renderTemplates.default)('footer');
 
       if (typeof renderFooter === 'function') {
@@ -426,7 +430,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           rowProps: {
             onMouseEnter: this.handleRowMouseEnter,
             onMouseLeave: this.handleRowMouseLeave
-          }
+          },
+          stickyRightOffset: stickyRightOffset
         });
       }
 
@@ -440,6 +445,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         data: footerDataSource,
         horizontalRenderInfo: info,
         getRowProps: getRowProps,
+        stickyRightOffset: stickyRightOffset,
         primaryKey: primaryKey,
         verticalRenderInfo: {
           offset: 0,
@@ -458,7 +464,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "renderLockShadows",
     value: function renderLockShadows(info) {
-      // console.log('render LockShadows')
+      var stickyRightOffset = this.hasScrollY ? this.getScrollBarWidth() : 0; // console.log('render LockShadows')
+
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: _styles.Classes.lockShadowMask,
         style: {
@@ -471,7 +478,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         className: _styles.Classes.lockShadowMask,
         style: {
           right: 0,
-          width: info.rightLockTotalWidth + _styles.LOCK_SHADOW_PADDING
+          width: info.rightLockTotalWidth + _styles.LOCK_SHADOW_PADDING + stickyRightOffset
         }
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.lockShadow, _styles.Classes.rightLockShadow)
@@ -485,17 +492,21 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           hasStickyScroll = _this$props5.hasStickyScroll,
           stickyBottom = _this$props5.stickyBottom;
       var hasScroll = this.state.hasScroll;
+      var isScroll = hasStickyScroll && hasScroll;
+      var stickyScrollContainerStyle = this.getStickyScrollContainerStyle();
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)(_styles.Classes.horizontalScrollContainer, _styles.Classes.horizontalStickyScrollContainer)
+        className: (0, _classnames.default)(_styles.Classes.horizontalScrollContainer, _styles.Classes.horizontalStickyScrollContainer),
+        style: stickyScrollContainerStyle
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.horizontalScrollLeftSpacer),
         style: {
-          width: info.leftLockTotalWidth
+          width: info.leftLockTotalWidth,
+          display: isScroll ? 'block' : 'none'
         }
       }), /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.stickyScroll),
         style: {
-          display: hasStickyScroll && hasScroll ? 'block' : 'none',
+          display: isScroll ? 'block' : 'none',
           bottom: stickyBottom
         }
       }, /*#__PURE__*/_react.default.createElement("div", {
@@ -503,7 +514,8 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       })), /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)(_styles.Classes.horizontalScrollRightSpacer),
         style: {
-          width: info.rightLockTotalWidth
+          width: info.rightLockTotalWidth,
+          display: isScroll ? 'block' : 'none'
         }
       }));
     }
@@ -512,6 +524,22 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     value: function getScrollBarWidth() {
       return this.props.scrollbarWidth || (0, _utils.getScrollbarSize)().width;
     }
+  }, {
+    key: "getStickyScrollContainerStyle",
+    value: function getStickyScrollContainerStyle() {
+      var _this$props6 = this.props,
+          hasStickyScroll = _this$props6.hasStickyScroll,
+          stickyScrollHeight = _this$props6.stickyScrollHeight;
+      var hasScroll = this.state.hasScroll;
+      var isScroll = hasStickyScroll && hasScroll;
+      var height = stickyScrollHeight === 'auto' ? this.getScrollBarWidth() : stickyScrollHeight;
+      var stickyHeight = isScroll ? height : 0;
+      return {
+        height: stickyHeight,
+        maxHeight: stickyHeight,
+        minHeight: stickyHeight
+      };
+    }
   }, {
     key: "render",
     value: function render() {
@@ -520,20 +548,20 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       // console.log('render table')
       var info = (0, _calculations.calculateRenderInfo)(this);
       this.lastInfo = info;
-      var _this$props6 = this.props,
-          dataSource = _this$props6.dataSource,
-          className = _this$props6.className,
-          style = _this$props6.style,
-          hasHeader = _this$props6.hasHeader,
-          useOuterBorder = _this$props6.useOuterBorder,
-          isStickyHead = _this$props6.isStickyHead,
-          isStickyHeader = _this$props6.isStickyHeader,
-          isStickyFooter = _this$props6.isStickyFooter,
-          isLoading = _this$props6.isLoading,
-          getTableProps = _this$props6.getTableProps,
-          footerDataSource = _this$props6.footerDataSource,
-          components = _this$props6.components,
-          bordered = _this$props6.bordered;
+      var _this$props7 = this.props,
+          dataSource = _this$props7.dataSource,
+          className = _this$props7.className,
+          style = _this$props7.style,
+          hasHeader = _this$props7.hasHeader,
+          useOuterBorder = _this$props7.useOuterBorder,
+          isStickyHead = _this$props7.isStickyHead,
+          isStickyHeader = _this$props7.isStickyHeader,
+          isStickyFooter = _this$props7.isStickyFooter,
+          isLoading = _this$props7.isLoading,
+          getTableProps = _this$props7.getTableProps,
+          footerDataSource = _this$props7.footerDataSource,
+          components = _this$props7.components,
+          bordered = _this$props7.bordered;
       var artTableWrapperClassName = (0, _classnames.default)(_styles.Classes.artTableWrapper, (_cx = {
         'use-outer-border': useOuterBorder,
         empty: dataSource.length === 0,
@@ -559,20 +587,19 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _a, _b, _c, _d, _e, _f; // console.log('did mount start')
-      // console.log('update dom helper start')
-
-
-      this.updateDOMHelper(); // console.log('update dom helper end')
+      var _a, _b, _c, _d, _e, _f;
 
+      this.rootSubscription = new _rxjs.Subscription();
+      this.resizeSubject = new _rxjs.Subject();
+      this.updateDOMHelper();
       this.props$ = new _rxjs.BehaviorSubject(this.props);
       this.initSubscriptions();
       this.didMountOrUpdate(); // console.log('did mount end')
 
-      var _this$props7 = this.props,
-          cssVariables = _this$props7.cssVariables,
-          enableCSSVariables = _this$props7.enableCSSVariables,
-          bordered = _this$props7.bordered;
+      var _this$props8 = this.props,
+          cssVariables = _this$props8.cssVariables,
+          enableCSSVariables = _this$props8.enableCSSVariables,
+          bordered = _this$props8.bordered;
       (0, _utils.cssPolifill)({
         variables: cssVariables || {},
         enableCSSVariables: enableCSSVariables,
@@ -588,10 +615,10 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       var _a; // console.log('did update start')
 
 
-      var _this$props8 = this.props,
-          cssVariables = _this$props8.cssVariables,
-          enableCSSVariables = _this$props8.enableCSSVariables,
-          bordered = _this$props8.bordered;
+      var _this$props9 = this.props,
+          cssVariables = _this$props9.cssVariables,
+          enableCSSVariables = _this$props9.enableCSSVariables,
+          bordered = _this$props9.bordered;
 
       if (!(0, _utils.shallowEqual)(prevProps === null || prevProps === void 0 ? void 0 : prevProps.cssVariables, (_a = this.props) === null || _a === void 0 ? void 0 : _a.cssVariables)) {
         (0, _utils.cssPolifill)({

package/lib/table/interfaces.d.ts

@@ -27,6 +27,8 @@ export interface ArtColumnStaticPart {
     features?: {
         [key: string]: any;
     };
+    /** 表头设置操作项到自定义操作区 */
+    renderHeader?: (title: ReactNode, opr: ReactNode) => ReactNode;
 }
 export interface Features {
     /** 是否开启排序功能 */