@kdcloudjs/table 1.2.0-canary.14 → 1.2.0-canary.15

package/dist/@kdcloudjs/table.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.13
+ *   @kdcloudjs/table v1.2.0-canary.14
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.

package/dist/@kdcloudjs/table.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/table v1.2.0-canary.13
+ *   @kdcloudjs/table v1.2.0-canary.14
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -3945,18 +3945,21 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
           hasStickyScroll = _this$props6.hasStickyScroll,
           stickyBottom = _this$props6.stickyBottom;
       var hasScroll = this.state.hasScroll;
+      var isScroll = hasStickyScroll && hasScroll;
+      var stickyScrollContainerStyle = this.getStickyScrollContainerStyle();
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
-        className: classnames__WEBPACK_IMPORTED_MODULE_26___default()(_styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].horizontalScrollContainer, _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].horizontalStickyScrollContainer)
+        className: classnames__WEBPACK_IMPORTED_MODULE_26___default()(_styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].horizontalScrollContainer, _styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].horizontalStickyScrollContainer),
+        style: stickyScrollContainerStyle
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         className: classnames__WEBPACK_IMPORTED_MODULE_26___default()(_styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].horizontalScrollLeftSpacer),
         style: {
           width: info.leftLockTotalWidth,
-          display: hasStickyScroll && hasScroll ? 'block' : 'none'
+          display: isScroll ? 'block' : 'none'
         }
       }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
         className: classnames__WEBPACK_IMPORTED_MODULE_26___default()(_styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].stickyScroll),
         style: {
-          display: hasStickyScroll && hasScroll ? 'block' : 'none',
+          display: isScroll ? 'block' : 'none',
           bottom: stickyBottom
         }
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_27___default.a.createElement("div", {
@@ -3965,7 +3968,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
         className: classnames__WEBPACK_IMPORTED_MODULE_26___default()(_styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].horizontalScrollRightSpacer),
         style: {
           width: info.rightLockTotalWidth,
-          display: hasStickyScroll && hasScroll ? 'block' : 'none'
+          display: isScroll ? 'block' : 'none'
         }
       }));
     }
@@ -3974,6 +3977,22 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
     value: function getScrollBarWidth() {
       return this.props.scrollbarWidth || Object(_utils__WEBPACK_IMPORTED_MODULE_39__["getScrollbarSize"])().width;
     }
+  }, {
+    key: "getStickyScrollContainerStyle",
+    value: function getStickyScrollContainerStyle() {
+      var _this$props7 = this.props,
+          hasStickyScroll = _this$props7.hasStickyScroll,
+          stickyScrollHeight = _this$props7.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() {
@@ -3982,20 +4001,20 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       // console.log('render table')
       var info = Object(_calculations__WEBPACK_IMPORTED_MODULE_30__["calculateRenderInfo"])(this);
       this.lastInfo = info;
-      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 _this$props8 = this.props,
+          dataSource = _this$props8.dataSource,
+          className = _this$props8.className,
+          style = _this$props8.style,
+          hasHeader = _this$props8.hasHeader,
+          useOuterBorder = _this$props8.useOuterBorder,
+          isStickyHead = _this$props8.isStickyHead,
+          isStickyHeader = _this$props8.isStickyHeader,
+          isStickyFooter = _this$props8.isStickyFooter,
+          isLoading = _this$props8.isLoading,
+          getTableProps = _this$props8.getTableProps,
+          footerDataSource = _this$props8.footerDataSource,
+          components = _this$props8.components,
+          bordered = _this$props8.bordered;
       var artTableWrapperClassName = classnames__WEBPACK_IMPORTED_MODULE_26___default()(_styles__WEBPACK_IMPORTED_MODULE_38__["Classes"].artTableWrapper, (_cx = {
         'use-outer-border': useOuterBorder,
         empty: dataSource.length === 0,
@@ -4023,7 +4042,7 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props$setTableW2, _this$props9, _this$props$setTableD, _this$props10, _this$props$setRowHei, _this$props11;
+      var _this$props$setTableW2, _this$props10, _this$props$setTableD, _this$props11, _this$props$setRowHei, _this$props12;
 
       this.rootSubscription = new rxjs__WEBPACK_IMPORTED_MODULE_28__["Subscription"]();
       this.resizeSubject = new rxjs__WEBPACK_IMPORTED_MODULE_28__["Subject"]();
@@ -4032,31 +4051,31 @@ var BaseTable = /*#__PURE__*/function (_React$Component) {
       this.initSubscriptions();
       this.didMountOrUpdate(); // console.log('did mount end')
 
-      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;
       Object(_utils__WEBPACK_IMPORTED_MODULE_39__["cssPolifill"])({
         variables: cssVariables || {},
         enableCSSVariables: enableCSSVariables,
         bordered: bordered
       });
-      (_this$props$setTableW2 = (_this$props9 = this.props).setTableWidth) === null || _this$props$setTableW2 === void 0 ? void 0 : _this$props$setTableW2.call(_this$props9, this.domHelper.tableBody.clientWidth);
-      (_this$props$setTableD = (_this$props10 = this.props).setTableDomHelper) === null || _this$props$setTableD === void 0 ? void 0 : _this$props$setTableD.call(_this$props10, this.domHelper);
-      (_this$props$setRowHei = (_this$props11 = this.props).setRowHeightManager) === null || _this$props$setRowHei === void 0 ? void 0 : _this$props$setRowHei.call(_this$props11, this.rowHeightManager);
+      (_this$props$setTableW2 = (_this$props10 = this.props).setTableWidth) === null || _this$props$setTableW2 === void 0 ? void 0 : _this$props$setTableW2.call(_this$props10, this.domHelper.tableBody.clientWidth);
+      (_this$props$setTableD = (_this$props11 = this.props).setTableDomHelper) === null || _this$props$setTableD === void 0 ? void 0 : _this$props$setTableD.call(_this$props11, this.domHelper);
+      (_this$props$setRowHei = (_this$props12 = this.props).setRowHeightManager) === null || _this$props$setRowHei === void 0 ? void 0 : _this$props$setRowHei.call(_this$props12, this.rowHeightManager);
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      var _this$props13;
+      var _this$props14;
 
       // console.log('did update start')
-      var _this$props12 = this.props,
-          cssVariables = _this$props12.cssVariables,
-          enableCSSVariables = _this$props12.enableCSSVariables,
-          bordered = _this$props12.bordered;
+      var _this$props13 = this.props,
+          cssVariables = _this$props13.cssVariables,
+          enableCSSVariables = _this$props13.enableCSSVariables,
+          bordered = _this$props13.bordered;
 
-      if (!Object(_utils__WEBPACK_IMPORTED_MODULE_39__["shallowEqual"])(prevProps === null || prevProps === void 0 ? void 0 : prevProps.cssVariables, (_this$props13 = this.props) === null || _this$props13 === void 0 ? void 0 : _this$props13.cssVariables)) {
+      if (!Object(_utils__WEBPACK_IMPORTED_MODULE_39__["shallowEqual"])(prevProps === null || prevProps === void 0 ? void 0 : prevProps.cssVariables, (_this$props14 = this.props) === null || _this$props14 === void 0 ? void 0 : _this$props14.cssVariables)) {
         Object(_utils__WEBPACK_IMPORTED_MODULE_39__["cssPolifill"])({
           variables: cssVariables || {},
           enableCSSVariables: enableCSSVariables,