@kdcloudjs/table 1.1.1 → 1.1.2-canary.1

package/dist/@kdcloudjs/table.js

@@ -2489,7 +2489,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _colgroup__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./colgroup */ "./components/table/base/colgroup.tsx");
 /* harmony import */ var _helpers_SpanManager__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./helpers/SpanManager */ "./components/table/base/helpers/SpanManager.ts");
 /* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./styles */ "./components/table/base/styles.ts");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./utils */ "./components/table/base/utils.tsx");
 
 
 
@@ -2514,12 +2513,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 
 
-
 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,
@@ -2618,14 +2616,13 @@ function HtmlTable(_ref) {
     rowSpan = Math.max(rowSpan, 1);
     colSpan = Math.max(colSpan, 1);
     var positionStyle = {};
-    var scrollbarWidth = hasScrollY ? Object(_utils__WEBPACK_IMPORTED_MODULE_19__["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_14___default.a.createElement('td', _objectSpread(_objectSpread(_objectSpread({
@@ -2954,14 +2951,14 @@ function renderTableBodyInIE(info, props, extra) {
     primaryKey: primaryKey,
     data: dataSource.slice(topIndex, bottomIndex)
   };
-  var scrollbarWidth = extra.hasScrollY ? Object(_utils__WEBPACK_IMPORTED_MODULE_22__["getScrollbarSize"])().width : 0;
   var fixedRightTableStyle = {
-    right: -scrollbarWidth
+    right: -extra.stickyRightOffset
   };
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", {
     className: classnames__WEBPACK_IMPORTED_MODULE_19___default()(_styles__WEBPACK_IMPORTED_MODULE_21__["Classes"].tableBody, _styles__WEBPACK_IMPORTED_MODULE_21__["Classes"].horizontalScrollContainer)
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", {
-    className: _styles__WEBPACK_IMPORTED_MODULE_21__["Classes"].virtual
+    className: _styles__WEBPACK_IMPORTED_MODULE_21__["Classes"].virtual,
+    tabIndex: -1
   }, topBlank > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", {
     key: "top-blank",
     className: classnames__WEBPACK_IMPORTED_MODULE_19___default()(_styles__WEBPACK_IMPORTED_MODULE_21__["Classes"].virtualBlank, 'top'),
@@ -3021,7 +3018,7 @@ function renderTableBodyInIE(info, props, extra) {
     tbodyHtmlTag: "tbody"
   }, commonProps, {
     tbodyPosition: "right",
-    hasScrollY: extra.hasScrollY,
+    stickyRightOffset: extra.stickyRightOffset,
     horizontalRenderInfo: _objectSpread(_objectSpread({}, info), {}, {
       flat: {
         center: right,
@@ -3595,6 +3592,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           className: classnames__WEBPACK_IMPORTED_MODULE_26___default()(tableBodyClassName, 'empty')
         }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
           className: _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].virtual,
+          tabIndex: -1,
           style: virtualStyle
         }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement(_empty__WEBPACK_IMPORTED_MODULE_31__["EmptyHtmlTable"], {
           descriptors: info.visible,
@@ -3609,6 +3607,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_42__["default"])('body');
 
       if (typeof renderBody === 'function') {
@@ -3617,7 +3616,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
             onMouseEnter: _this.handleRowMouseEnter,
             onMouseLeave: _this.handleRowMouseLeave
           },
-          hasScrollY: _this.hasScrollY
+          stickyRightOffset: stickyRightOffset
         });
       }
 
@@ -3625,6 +3624,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         className: tableBodyClassName
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].virtual,
+        tabIndex: -1,
         style: virtualStyle
       }, topBlank > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         key: "top-blank",
@@ -3637,7 +3637,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         getRowProps: getRowProps,
         primaryKey: primaryKey,
         data: dataSource.slice(topIndex, bottomIndex),
-        hasScrollY: _this.hasScrollY,
+        stickyRightOffset: stickyRightOffset,
         horizontalRenderInfo: info,
         verticalRenderInfo: {
           first: 0,
@@ -3697,7 +3697,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_39__["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");
@@ -3764,7 +3764,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].verticalScrollPlaceholder,
         style: this.hasScrollY ? {
-          width: Object(_utils__WEBPACK_IMPORTED_MODULE_39__["getScrollbarSize"])().width
+          width: this.getScrollBarWidth()
         } : undefined
       }));
     }
@@ -3871,7 +3871,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         className: _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].verticalScrollPlaceholder,
         style: this.hasScrollY ? {
-          width: Object(_utils__WEBPACK_IMPORTED_MODULE_39__["getScrollbarSize"])().width,
+          width: this.getScrollBarWidth(),
           visibility: 'initial'
         } : undefined
       }));
@@ -3916,6 +3916,11 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         className: _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].stickyScrollItem
       }));
     }
+  }, {
+    key: "getScrollBarWidth",
+    value: function getScrollBarWidth() {
+      return this.props.scrollbarWidth || Object(_utils__WEBPACK_IMPORTED_MODULE_39__["getScrollbarSize"])().width;
+    }
   }, {
     key: "render",
     value: function render() {
@@ -7713,6 +7718,8 @@ function rangeSelection(opts) {
     };
 
     var onKeyDown = function onKeyDown(e) {
+      if (!Object(_utils__WEBPACK_IMPORTED_MODULE_11__["isElementInEventPath"])(tableBody, e.nativeEvent)) return;
+
       if ((e.ctrlKey || e.metaKey) && e.key === 'a') {
         var rowLen = pipeline.getDataSource().length;