@kdcloudjs/kdesign 1.5.0 → 1.5.1

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.4.1
+ *   @kdcloudjs/kdesign v1.5.0
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -31316,7 +31316,10 @@ function Table(props) {
       getTableProps = props.getTableProps,
       contextMenu = props.contextMenu,
       rangeSelection = props.rangeSelection,
-      cssVariables = props.cssVariables;
+      cssVariables = props.cssVariables,
+      stickyScrollHeight = props.stickyScrollHeight,
+      scrollbarWidth = props.scrollbarWidth,
+      scrollLoad = props.scrollLoad;
 
   var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_4__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_6__["default"]),
       getPrefixCls = _useContext.getPrefixCls,
@@ -31395,7 +31398,10 @@ function Table(props) {
     hasHeader: hasHeader,
     useOuterBorder: useOuterBorder,
     defaultColumnWidth: defaultColumnWidth,
-    cssVariables: cssVariables
+    cssVariables: cssVariables,
+    stickyScrollHeight: stickyScrollHeight,
+    scrollbarWidth: scrollbarWidth,
+    scrollLoad: scrollLoad
   }));
 }
 
@@ -40702,31 +40708,33 @@ var TableDOMHelper = /*#__PURE__*/function () {
   }, {
     key: "getTableRows",
     value: function getTableRows() {
-      var htmlTable = this.getTableBodyHtmlTable();
-      return htmlTable.querySelectorAll("tbody > .".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableRow));
+      var _context2;
+
+      var tbody = this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context2 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context2, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtual, " table tbody"));
+      return tbody.childNodes;
     }
   }, {
     key: "getTableBodyHtmlTable",
     value: function getTableBodyHtmlTable() {
-      var _context2;
+      var _context3;
 
-      return this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context2 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context2, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtual, " table"));
+      return this.artTable.querySelector(_babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context3 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context3, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].virtual, " table"));
     }
   }, {
     key: "getLeftLockShadow",
     value: function getLeftLockShadow() {
-      var _context3;
+      var _context4;
 
-      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context3 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].lockShadowMask, " .")).call(_context3, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].leftLockShadow);
+      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context4 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].lockShadowMask, " .")).call(_context4, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].leftLockShadow);
 
       return this.artTable.querySelector(selector);
     }
   }, {
     key: "getRightLockShadow",
     value: function getRightLockShadow() {
-      var _context4;
+      var _context5;
 
-      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context4 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].lockShadowMask, " .")).call(_context4, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].rightLockShadow);
+      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context5 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].lockShadowMask, " .")).call(_context5, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].rightLockShadow);
 
       return this.artTable.querySelector(selector);
     }
@@ -40738,11 +40746,11 @@ var TableDOMHelper = /*#__PURE__*/function () {
   }, {
     key: "getRowTop",
     value: function getRowTop(rowIndex) {
-      var _context5, _context6;
+      var _context6, _context7;
 
       if (rowIndex === 0) return 0;
 
-      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context5 = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context6 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context6, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableRow, "[data-rowindex=\"")).call(_context5, rowIndex, "\"]");
+      var selector = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context6 = _babel_runtime_corejs3_core_js_stable_instance_concat__WEBPACK_IMPORTED_MODULE_2___default()(_context7 = ".".concat(_styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableBody, " .")).call(_context7, _styles__WEBPACK_IMPORTED_MODULE_3__["Classes"].tableRow, "[data-rowindex=\"")).call(_context6, rowIndex, "\"]");
 
       var row = this.artTable.querySelector(selector);
       var rowOffsetTop = row && row.offsetTop || 0;
@@ -41202,8 +41210,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _colgroup__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./colgroup */ "./node_modules/@kdcloudjs/table/es/table/base/colgroup.js");
 /* harmony import */ var _helpers_SpanManager__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./helpers/SpanManager */ "./node_modules/@kdcloudjs/table/es/table/base/helpers/SpanManager.js");
 /* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./styles */ "./node_modules/@kdcloudjs/table/es/table/base/styles.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./utils */ "./node_modules/@kdcloudjs/table/es/table/base/utils.js");
-
 
 
 
@@ -41219,7 +41225,7 @@ function HtmlTable(_ref) {
   var tbodyHtmlTag = _ref.tbodyHtmlTag,
       getRowProps = _ref.getRowProps,
       primaryKey = _ref.primaryKey,
-      hasScrollY = _ref.hasScrollY,
+      stickyRightOffset = _ref.stickyRightOffset,
       data = _ref.data,
       verInfo = _ref.verticalRenderInfo,
       hozInfo = _ref.horizontalRenderInfo,
@@ -41324,14 +41330,13 @@ function HtmlTable(_ref) {
     rowSpan = Math.max(rowSpan, 1);
     colSpan = Math.max(colSpan, 1);
     var positionStyle = {};
-    var scrollbarWidth = hasScrollY ? Object(_utils__WEBPACK_IMPORTED_MODULE_11__["getScrollbarSize"])().width : 0;
 
     if (colIndex < leftFlatCount) {
       positionStyle.position = 'sticky';
       positionStyle.left = hozInfo.stickyLeftMap.get(colIndex);
     } else if (colIndex >= fullFlatCount - rightFlatCount) {
       positionStyle.position = 'sticky';
-      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - scrollbarWidth;
+      positionStyle.right = hozInfo.stickyRightMap.get(colIndex) - stickyRightOffset;
     }
 
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement('td', _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
@@ -41611,14 +41616,14 @@ function renderTableBodyInIE(info, props, extra) {
     primaryKey: primaryKey,
     data: _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_3___default()(dataSource).call(dataSource, topIndex, bottomIndex)
   };
-  var scrollbarWidth = extra.hasScrollY ? Object(_utils__WEBPACK_IMPORTED_MODULE_10__["getScrollbarSize"])().width : 0;
   var fixedRightTableStyle = {
-    right: -scrollbarWidth
+    right: -extra.stickyRightOffset
   };
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
     className: classnames__WEBPACK_IMPORTED_MODULE_7___default()(_styles__WEBPACK_IMPORTED_MODULE_9__["Classes"].tableBody, _styles__WEBPACK_IMPORTED_MODULE_9__["Classes"].horizontalScrollContainer)
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
-    className: _styles__WEBPACK_IMPORTED_MODULE_9__["Classes"].virtual
+    className: _styles__WEBPACK_IMPORTED_MODULE_9__["Classes"].virtual,
+    tabIndex: -1
   }, topBlank > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
     key: "top-blank",
     className: classnames__WEBPACK_IMPORTED_MODULE_7___default()(_styles__WEBPACK_IMPORTED_MODULE_9__["Classes"].virtualBlank, 'top'),
@@ -41678,7 +41683,7 @@ function renderTableBodyInIE(info, props, extra) {
     tbodyHtmlTag: "tbody"
   }, commonProps, {
     tbodyPosition: "right",
-    hasScrollY: extra.hasScrollY,
+    stickyRightOffset: extra.stickyRightOffset,
     horizontalRenderInfo: _babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()(_babel_runtime_corejs3_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, info), {
       flat: {
         center: right,
@@ -41971,8 +41976,7 @@ var defaultCSSVariables = {
   '--cell-border-horizontal': '1px solid #dfe3e8',
   '---cell-border-vertical': '1px solid #dfe3e8',
   '--header-cell-border': '1px solid #dfe3e8',
-  '--header-cell-border-horizontal': '1px solid #dfe3e8',
-  '--header-cell-border-vertical': '1px solid #dfe3e8'
+  '--header-cell-border-horizontal': '1px solid #dfe3e8'
 };
 var variableConst = getCssVariableText(defaultCSSVariables);
 var StyledArtTableWrapper = styled_components__WEBPACK_IMPORTED_MODULE_3__["default"].div(_templateObject2 || (_templateObject2 = _babel_runtime_corejs3_helpers_taggedTemplateLiteral__WEBPACK_IMPORTED_MODULE_0___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  .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    user-select:none;\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  &.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  // \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:none\n  }\n\n  th.", " {\n    border-right: none;\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    overflow-y: hidden;\n    overflow-x: auto;\n    z-index: ", ";\n    flex-shrink: 0;\n    flex-grow: 0;\n    border-top: 1px solid var(--border-color);\n    background: var(--bgcolor);\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: auto;\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  }\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  //#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  "])), variableConst, variableConst, outerBorderStyleMixin, Classes.artTable, Classes.tableHeader, Classes.tableHeaderCellContent, Classes.virtual, Classes.tableFooter, Classes.tableBody, Classes.tableFooter, Classes.tableRow, Classes.tableBody, Classes.tableCellRangeSelected, Classes.tableCellRangeTop, Classes.tableCellRangeLeft, Classes.tableCellRangeBottom, Classes.tableCellRangeRight, 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.stickyScroll, Z.scrollItem, Classes.stickyScrollItem, Classes.loadingWrapper, Classes.loadingContentWrapper, Classes.loadingIndicatorWrapper, Classes.loadingIndicator, Z.loadingIndicator, Classes.tableFilterTrigger, Classes.tableSortIcon, Classes.verticalScrollPlaceholder, Classes.tableFooter, Classes.verticalScrollPlaceholder);
@@ -42143,6 +42147,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     _this.rootSubscription = new rxjs__WEBPACK_IMPORTED_MODULE_17__["Subscription"]();
     _this.hasScrollY = false;
     _this.resizeSubject = new rxjs__WEBPACK_IMPORTED_MODULE_17__["Subject"]();
+    _this.offsetY = 0;
 
     _this.getRowNodeListByEvent = function (e) {
       var nodeList = null;
@@ -42208,6 +42213,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           className: classnames__WEBPACK_IMPORTED_MODULE_15___default()(tableBodyClassName, 'empty')
         }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
           className: _styles__WEBPACK_IMPORTED_MODULE_27__["Classes"].virtual,
+          tabIndex: -1,
           style: virtualStyle
         }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement(_empty__WEBPACK_IMPORTED_MODULE_20__["EmptyHtmlTable"], {
           descriptors: info.visible,
@@ -42222,6 +42228,7 @@ 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 = Object(_renderTemplates__WEBPACK_IMPORTED_MODULE_31__["default"])('body');
 
       if (typeof renderBody === 'function') {
@@ -42230,7 +42237,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
             onMouseEnter: _this.handleRowMouseEnter,
             onMouseLeave: _this.handleRowMouseLeave
           },
-          hasScrollY: _this.hasScrollY
+          stickyRightOffset: stickyRightOffset
         });
       }
 
@@ -42238,6 +42245,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         className: tableBodyClassName
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_27__["Classes"].virtual,
+        tabIndex: -1,
         style: virtualStyle
       }, topBlank > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
         key: "top-blank",
@@ -42250,7 +42258,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         getRowProps: getRowProps,
         primaryKey: primaryKey,
         data: _babel_runtime_corejs3_core_js_stable_instance_slice__WEBPACK_IMPORTED_MODULE_12___default()(dataSource).call(dataSource, topIndex, bottomIndex),
-        hasScrollY: _this.hasScrollY,
+        stickyRightOffset: stickyRightOffset,
         horizontalRenderInfo: info,
         verticalRenderInfo: {
           first: 0,
@@ -42311,7 +42319,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       var innerTableWidth = tableBodyHtmlTable.offsetWidth;
       var artTableWidth = artTable.offsetWidth;
       var stickyScrollHeightProp = this.props.stickyScrollHeight;
-      var stickyScrollHeight = stickyScrollHeightProp === 'auto' ? Object(_utils__WEBPACK_IMPORTED_MODULE_28__["getScrollbarSize"])().height : stickyScrollHeightProp; // stickyScroll.style.marginTop = `-${stickyScrollHeight + 1}px`
+      var stickyScrollHeight = stickyScrollHeightProp === 'auto' ? this.getScrollBarWidth() : stickyScrollHeightProp; // stickyScroll.style.marginTop = `-${stickyScrollHeight + 1}px`
       // 设置滚动条高度
 
       stickyScroll.style.height = "".concat(stickyScrollHeight, "px");
@@ -42376,7 +42384,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_27__["Classes"].verticalScrollPlaceholder,
         style: this.hasScrollY ? {
-          width: Object(_utils__WEBPACK_IMPORTED_MODULE_28__["getScrollbarSize"])().width
+          width: this.getScrollBarWidth()
         } : undefined
       }));
     }
@@ -42485,7 +42493,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_16___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_27__["Classes"].verticalScrollPlaceholder,
         style: this.hasScrollY ? {
-          width: Object(_utils__WEBPACK_IMPORTED_MODULE_28__["getScrollbarSize"])().width,
+          width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
       }));
@@ -42530,6 +42538,11 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         className: _styles__WEBPACK_IMPORTED_MODULE_27__["Classes"].stickyScrollItem
       }));
     }
+  }, {
+    key: "getScrollBarWidth",
+    value: function getScrollBarWidth() {
+      return this.props.scrollbarWidth || Object(_utils__WEBPACK_IMPORTED_MODULE_28__["getScrollbarSize"])().width;
+    }
   }, {
     key: "render",
     value: function render() {
@@ -42704,6 +42717,47 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       })).subscribe(function (sizeAndOffset) {
         _this2.setState(sizeAndOffset);
       }));
+      this.rootSubscription.add(richVisibleRects$.pipe(rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["map"](function (_ref7) {
+        var clipRect = _ref7.clipRect,
+            offsetY = _ref7.offsetY;
+        return {
+          maxRenderHeight: clipRect.bottom - clipRect.top,
+          maxRenderWidth: clipRect.right - clipRect.left,
+          offsetY: offsetY
+        };
+      }), rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["distinctUntilChanged"](function (x, y) {
+        return x.offsetY - y.offsetY === 0;
+      }), // 计算得到当前行索引对应的数据块，blocks改成数组的形式，兼容快速拖动可视区域出现两个数据块的情况
+      rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["map"](function (sizeAndOffset) {
+        var _a;
+
+        var offsetY = sizeAndOffset.offsetY,
+            maxRenderHeight = sizeAndOffset.maxRenderHeight;
+        var scrollDirection = offsetY - _this2.offsetY >= 0 ? 'down' : 'up';
+        _this2.offsetY = offsetY;
+        var rowCount = _this2.props.dataSource.length;
+
+        var vertical = _this2.rowHeightManager.getRenderRange(offsetY, maxRenderHeight, rowCount);
+
+        var topIndex = vertical.topIndex,
+            bottomIndex = vertical.bottomIndex;
+        var blockSize = ((_a = _this2.props.scrollLoad) === null || _a === void 0 ? void 0 : _a.blockSize) || 200;
+        var topBlockStartIndex = Math.floor(Math.max(topIndex - 1, 0) / blockSize) * blockSize;
+        var bottomBlockStartIndex = Math.floor((bottomIndex + 1) / blockSize) * blockSize;
+        return scrollDirection === 'down' ? [topBlockStartIndex, bottomBlockStartIndex] : [bottomBlockStartIndex, topBlockStartIndex];
+      }), rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["distinctUntilChanged"](function (x, y) {
+        return x[0] === y[0] && x[1] === y[1];
+      }), rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["switchMap"](function (startIndexs) {
+        var event$ = Object(rxjs__WEBPACK_IMPORTED_MODULE_17__["from"])(startIndexs);
+        return event$.pipe(rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["map"](function (startIndex) {
+          return startIndex;
+        }));
+      }), // 过滤掉重复掉值
+      rxjs_operators__WEBPACK_IMPORTED_MODULE_18__["distinctUntilChanged"]()).subscribe(function (startIndex) {
+        var _a;
+
+        (_a = _this2.props.scrollLoad) === null || _a === void 0 ? void 0 : _a.callback(startIndex);
+      }));
     }
   }, {
     key: "componentWillUnmount",
@@ -46019,6 +46073,8 @@ function rangeSelection(opts) {
     };
 
     var onKeyDown = function onKeyDown(e) {
+      if (!Object(_utils__WEBPACK_IMPORTED_MODULE_5__["isElementInEventPath"])(tableBody, e.nativeEvent)) return;
+
       if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
         var rowLen = pipeline.getDataSource().length;