shineout 1.8.2 → 1.8.7-beta.1

package/dist/shineout.js

@@ -4538,8 +4538,8 @@ var dropdownPosition = ['bottom-left', 'bottom-right', 'top-left', 'top-right'];
       value: function componentDidUpdate(prevProps) {
         var _this2 = this;
 
-        if (Object(_utils_shallowEqual__WEBPACK_IMPORTED_MODULE_12__["default"])(prevProps.value, this.props.value)) return;
         if (!this.props.focus) this.ajustdoc = false;
+        if (Object(_utils_shallowEqual__WEBPACK_IMPORTED_MODULE_12__["default"])(prevProps.value, this.props.value)) return;
         setTimeout(function () {
           _this2.forceUpdate();
         });
@@ -5654,7 +5654,7 @@ function (_PureComponent) {
         disabled: disabled
       }), this.props.className);
 
-      if (href) {
+      if (href && !disabled) {
         return (
           /*#__PURE__*/
           react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("a", Object.assign({
@@ -19878,17 +19878,22 @@ function (_Component) {
         });
       }
 
+      var cloneProps = {
+        value: value,
+        error: error,
+        onChange: this.handleChange
+      };
+
+      if (disabled !== undefined) {
+        cloneProps.disabled = disabled;
+      }
+
       if (
       /*#__PURE__*/
       Object(react__WEBPACK_IMPORTED_MODULE_6__["isValidElement"])(children)) {
         return (
           /*#__PURE__*/
-          Object(react__WEBPACK_IMPORTED_MODULE_6__["cloneElement"])(children, {
-            value: value,
-            error: error,
-            onChange: this.handleChange,
-            disabled: disabled
-          })
+          Object(react__WEBPACK_IMPORTED_MODULE_6__["cloneElement"])(children, cloneProps)
         );
       }
 
@@ -25890,7 +25895,9 @@ function (_PureComponent) {
 
     var key = _this.getKey(props);
 
-    var _props$bindItem = props.bindItem(_this.id, _this.update.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this)), _this.updateOpen.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this)), _this.updateInPath.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this))),
+    var noop = function noop() {};
+
+    var _props$bindItem = props.bindItem(_this.id, noop, noop, noop),
         _props$bindItem2 = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_slicedToArray__WEBPACK_IMPORTED_MODULE_0__["default"])(_props$bindItem, 3),
         activeUpdate = _props$bindItem2[0],
         openUpdate = _props$bindItem2[1],
@@ -25912,6 +25919,13 @@ function (_PureComponent) {
   }
 
   Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_2__["default"])(Item, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_get__WEBPACK_IMPORTED_MODULE_4__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_7__["default"])(Item.prototype), "componentDidMount", this).call(this);
+
+      this.props.bindItem(this.id, this.update.bind(this), this.updateOpen.bind(this), this.updateInPath.bind(this));
+    }
+  }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_get__WEBPACK_IMPORTED_MODULE_4__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_7__["default"])(Item.prototype), "componentWillUnmount", this).call(this);
@@ -26101,7 +26115,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 182,
+              lineNumber: 184,
               columnNumber: 9
             }
           }),
@@ -26114,7 +26128,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 183,
+              lineNumber: 185,
               columnNumber: 11
             }
           }), item)
@@ -26127,7 +26141,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 190,
+            lineNumber: 192,
             columnNumber: 7
           }
         }), item,
@@ -26140,7 +26154,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 192,
+            lineNumber: 194,
             columnNumber: 9
           }
         }))
@@ -26200,7 +26214,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 250,
+            lineNumber: 252,
             columnNumber: 7
           }
         }), this.renderItem(hasChilds, style), hasChilds &&
@@ -26226,7 +26240,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 253,
+            lineNumber: 255,
             columnNumber: 11
           }
         }))
@@ -33413,6 +33427,7 @@ function (_PureComponent) {
     _this.handleTouchStart = _this.handleTouchStart.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
     _this.handleTouchMove = _this.handleTouchMove.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
     _this.setStartPoint = _this.setStartPoint.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
+    _this.handleInnerScroll = _this.handleInnerScroll.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_3__["default"])(_this));
     return _this;
   }
 
@@ -33431,6 +33446,7 @@ function (_PureComponent) {
       this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
         passive: false
       });
+      this.inner.addEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "componentDidUpdate",
@@ -33449,6 +33465,7 @@ function (_PureComponent) {
       this.wheelElement.removeEventListener('wheel', this.handleWheel);
       this.wheelElement.removeEventListener('touchstart', this.handleTouchStart);
       this.wheelElement.removeEventListener('touchmove', this.handleTouchMove);
+      this.inner.removeEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "getWheelRect",
@@ -33642,23 +33659,41 @@ function (_PureComponent) {
 
       this.setStartPoint(position);
       this.boundleScroll();
-    }
+    } // inner scroll
+
   }, {
-    key: "render",
-    value: function render() {
+    key: "handleInnerScroll",
+    value: function handleInnerScroll(e) {
+      var target = e.target;
       var _this$props6 = this.props,
-          children = _this$props6.children,
-          scrollWidth = _this$props6.scrollWidth,
-          scrollHeight = _this$props6.scrollHeight,
           left = _this$props6.left,
-          top = _this$props6.top,
-          scrollX = _this$props6.scrollX,
-          scrollY = _this$props6.scrollY,
-          style = _this$props6.style;
+          scrollWidth = _this$props6.scrollWidth;
 
       var _this$getWheelRect2 = this.getWheelRect(),
-          width = _this$getWheelRect2.width,
-          height = _this$getWheelRect2.height;
+          width = _this$getWheelRect2.width;
+
+      if (target.scrollLeft) {
+        this.handleScroll(left + target.scrollLeft / (scrollWidth - width), this.props.top, undefined, 0);
+        target.scrollLeft = 0;
+        target.scrollTop = 0;
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props7 = this.props,
+          children = _this$props7.children,
+          scrollWidth = _this$props7.scrollWidth,
+          scrollHeight = _this$props7.scrollHeight,
+          left = _this$props7.left,
+          top = _this$props7.top,
+          scrollX = _this$props7.scrollX,
+          scrollY = _this$props7.scrollY,
+          style = _this$props7.style;
+
+      var _this$getWheelRect3 = this.getWheelRect(),
+          width = _this$getWheelRect3.width,
+          height = _this$getWheelRect3.height;
 
       var rtl = Object(_config__WEBPACK_IMPORTED_MODULE_17__["isRTL"])();
       var className = classnames__WEBPACK_IMPORTED_MODULE_10___default()(Object(_styles__WEBPACK_IMPORTED_MODULE_15__["scrollClass"])('_', scrollX && 'show-x', scrollY && 'show-y', rtl && 'rtl'), this.props.className);
@@ -33674,7 +33709,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 234,
+            lineNumber: 249,
             columnNumber: 7
           }
         },
@@ -33687,7 +33722,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 235,
+            lineNumber: 250,
             columnNumber: 9
           }
         }),
@@ -33697,7 +33732,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 236,
+            lineNumber: 251,
             columnNumber: 9
           }
         }),
@@ -33708,7 +33743,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 237,
+            lineNumber: 252,
             columnNumber: 9
           }
         },
@@ -33722,7 +33757,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 238,
+            lineNumber: 253,
             columnNumber: 11
           }
         }, children)), scrollY &&
@@ -33737,7 +33772,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 241,
+            lineNumber: 256,
             columnNumber: 11
           }
         }), scrollX &&
@@ -33751,7 +33786,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 251,
+            lineNumber: 266,
             columnNumber: 11
           }
         }))
@@ -34835,7 +34870,9 @@ function (_Component) {
     _this.handleBlur = _this.handleBlur.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
     _this.geHandleMax = _this.geHandleMax.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
     _this.handlePaste = _this.handlePaste.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
-    _this.focusInput = _this.focusInput.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this)); // for mutiple select
+    _this.focusInput = _this.focusInput.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
+    _this.handleCompositionStart = _this.handleCompositionStart.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this));
+    _this.handleCompositionEnd = _this.handleCompositionEnd.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this)); // for mutiple select
 
     _this.props.setInputReset(_this.reset.bind(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__["default"])(_this))); // set focus func to Select
 
@@ -34892,7 +34929,7 @@ function (_Component) {
     value: function geHandleMax(e) {
       var maxLength = this.props.maxLength;
 
-      if (!maxLength) {
+      if (!maxLength || this.composition) {
         return true;
       }
 
@@ -35018,6 +35055,17 @@ function (_Component) {
       if (text === txt) return;
       this.props.onInputBlur(text);
     }
+  }, {
+    key: "handleCompositionStart",
+    value: function handleCompositionStart() {
+      this.composition = true;
+    }
+  }, {
+    key: "handleCompositionEnd",
+    value: function handleCompositionEnd(e) {
+      this.composition = false;
+      this.handleInput(e);
+    }
   }, {
     key: "render",
     value: function render() {
@@ -35034,7 +35082,9 @@ function (_Component) {
         contentEditable: focus || this.state.editable,
         onFocus: handleFocus,
         onBlur: this.handleBlur,
-        title: !focus && Object(_utils_is__WEBPACK_IMPORTED_MODULE_12__["isString"])(value) ? value : null
+        title: !focus && Object(_utils_is__WEBPACK_IMPORTED_MODULE_12__["isString"])(value) ? value : null,
+        onCompositionStart: this.handleCompositionStart,
+        onCompositionEnd: this.handleCompositionEnd
       };
 
       if (
@@ -35059,7 +35109,7 @@ function (_Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 192,
+            lineNumber: 205,
             columnNumber: 12
           }
         }))
@@ -41443,6 +41493,23 @@ function (_PureComponent) {
       // }
 
     }
+  }, {
+    key: "setTop",
+    value: function setTop(scrollHeight, fullHeight, top) {
+      var _this2 = this;
+
+      var offsetLeft = this.state.offsetLeft;
+      this.tbody.style.marginTop = "".concat(scrollHeight * top, "px");
+      this.lastScrollTop = fullHeight * top;
+      Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(this.lastScrollTop, "px"));
+      setTimeout(function () {
+        _this2.setState({
+          scrollTop: top
+        });
+
+        _this2.lastScrollArgs[1] = top;
+      });
+    }
   }, {
     key: "checkScrollToIndex",
     value: function checkScrollToIndex(index, outerHeight) {
@@ -41466,7 +41533,7 @@ function (_PureComponent) {
   }, {
     key: "ajustBottom",
     value: function ajustBottom(dataChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       var reachBottom = this.lastScrollArgs[1] === 1;
       var drag = this.lastScrollArgs[8];
@@ -41475,7 +41542,7 @@ function (_PureComponent) {
         if (this.ajustBottomScroll) return;
         this.ajustBottomScroll = true;
         setTimeout(function () {
-          _this2.handleScroll.apply(_this2, Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_this2.lastScrollArgs));
+          _this3.handleScroll.apply(_this3, Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__["default"])(_this3.lastScrollArgs));
         });
       }
     }
@@ -41540,11 +41607,9 @@ function (_PureComponent) {
   }, {
     key: "resetHeight",
     value: function resetHeight() {
-      var _this3 = this;
+      var _this4 = this;
 
-      var _this$state2 = this.state,
-          scrollTop = _this$state2.scrollTop,
-          offsetLeft = _this$state2.offsetLeft;
+      var scrollTop = this.state.scrollTop;
       var _this$props4 = this.props,
           treeColumnsName = _this$props4.treeColumnsName,
           changedByExpand = _this$props4.changedByExpand;
@@ -41575,32 +41640,16 @@ function (_PureComponent) {
             if (fullHeight <= scrollHeight) {
               index = 0;
             } else {
-              this.tbody.style.marginTop = "".concat(scrollHeight, "px");
-              Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(fullHeight, "px"));
-              this.lastScrollTop = fullHeight;
+              this.setTop(scrollHeight, fullHeight, 1);
               return;
             }
           }
         }
 
         if (index === 0) {
-          this.lastScrollTop = 0;
-          setTimeout(function () {
-            _this3.setState({
-              scrollTop: 0
-            });
-          });
-          this.tbody.style.marginTop = '0px';
-          Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), '0px');
+          this.setTop(scrollHeight, fullHeight, 0);
         } else if (fullHeight - this.lastScrollTop < (1 - this.lastScrollArgs[1]) * scrollHeight) {
-          this.tbody.style.marginTop = "".concat(scrollHeight, "px");
-          Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(fullHeight, "px"));
-          this.lastScrollTop = fullHeight;
-          setTimeout(function () {
-            _this3.setState({
-              scrollTop: 1
-            });
-          });
+          this.setTop(scrollHeight, fullHeight, 1);
         } else {
           var keepTop = this.lastScrollTop - this.lastScrollArgs[1] * scrollHeight; // keepTop = scrollTopLength - scrollTopLength/fullHeight * scrollHeight
           // keepTop = (1 - scrollHeight / fullHeight) * scrollTopLength
@@ -41608,18 +41657,14 @@ function (_PureComponent) {
           var scrollTopLength = keepTop / (1 - scrollHeight / fullHeight);
           this.lastScrollTop = scrollTopLength;
           var st = this.lastScrollTop / fullHeight;
-          this.tbody.style.marginTop = "".concat(st * scrollHeight, "px");
-          Object(_utils_dom_translate__WEBPACK_IMPORTED_MODULE_15__["setTranslate"])(this.tbody, "-".concat(offsetLeft, "px"), "-".concat(this.lastScrollTop, "px"));
-          setTimeout(function () {
-            _this3.setState({
-              scrollTop: st
-            });
-          });
+          this.setTop(scrollHeight, fullHeight, st);
         }
       } else if (this.lastScrollTop - height < 1) {
         setTimeout(function () {
-          _this3.setState({
-            scrollTop: _this3.lastScrollTop / fullHeight
+          _this4.lastScrollArgs[1] = _this4.lastScrollTop / fullHeight;
+
+          _this4.setState({
+            scrollTop: _this4.lastScrollTop / fullHeight
           });
         });
       }
@@ -41864,16 +41909,17 @@ function (_PureComponent) {
           rowHeight = _this$props7.rowHeight,
           columnResizable = _this$props7.columnResizable,
           innerScrollAttr = _this$props7.innerScrollAttr,
-          others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_1__["default"])(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr"]);
+          bordered = _this$props7.bordered,
+          others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_1__["default"])(_this$props7, ["data", "rowsInView", "columns", "width", "fixed", "rowHeight", "columnResizable", "innerScrollAttr", "bordered"]);
 
-      var _this$state3 = this.state,
-          colgroup = _this$state3.colgroup,
-          scrollTop = _this$state3.scrollTop,
-          scrollLeft = _this$state3.scrollLeft,
-          offsetLeft = _this$state3.offsetLeft,
-          offsetRight = _this$state3.offsetRight,
-          currentIndex = _this$state3.currentIndex,
-          resize = _this$state3.resize;
+      var _this$state2 = this.state,
+          colgroup = _this$state2.colgroup,
+          scrollTop = _this$state2.scrollTop,
+          scrollLeft = _this$state2.scrollLeft,
+          offsetLeft = _this$state2.offsetLeft,
+          offsetRight = _this$state2.offsetRight,
+          currentIndex = _this$state2.currentIndex,
+          resize = _this$state2.resize;
       var contentWidth = this.getContentWidth();
       var minWidthSup = columns.find(function (d) {
         return d.minWidth;
@@ -41886,7 +41932,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 498,
+              lineNumber: 495,
               columnNumber: 14
             }
           })
@@ -41915,7 +41961,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 511,
+            lineNumber: 508,
             columnNumber: 7
           }
         },
@@ -41929,7 +41975,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 521,
+            lineNumber: 518,
             columnNumber: 9
           }
         },
@@ -41941,13 +41987,13 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 522,
+            lineNumber: 519,
             columnNumber: 11
           }
         }),
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_10___default.a.createElement("table", {
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])(!colgroup && minWidthSup && 'init'),
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
           style: {
             width: width
           },
@@ -41955,7 +42001,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 523,
+            lineNumber: 520,
             columnNumber: 11
           }
         },
@@ -41967,7 +42013,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 524,
+            lineNumber: 525,
             columnNumber: 13
           }
         }),
@@ -41989,7 +42035,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 525,
+            lineNumber: 526,
             columnNumber: 13
           }
         })))))
@@ -42014,7 +42060,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 552,
+          lineNumber: 553,
           columnNumber: 7
         }
       },
@@ -42024,10 +42070,11 @@ function (_PureComponent) {
           width: width
         },
         ref: this.bindThead,
+        className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])('table-bordered'),
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 553,
+          lineNumber: 554,
           columnNumber: 9
         }
       },
@@ -42039,7 +42086,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 554,
+          lineNumber: 555,
           columnNumber: 11
         }
       }),
@@ -42051,7 +42098,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 555,
+          lineNumber: 556,
           columnNumber: 11
         }
       }))));
@@ -42067,7 +42114,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 563,
+              lineNumber: 564,
               columnNumber: 9
             }
           }), header)
@@ -42082,9 +42129,9 @@ function (_PureComponent) {
       var _this$props9 = this.props,
           fixed = _this$props9.fixed,
           hideHeader = _this$props9.hideHeader;
-      var _this$state4 = this.state,
-          scrollLeft = _this$state4.scrollLeft,
-          floatFixed = _this$state4.floatFixed;
+      var _this$state3 = this.state,
+          scrollLeft = _this$state3.scrollLeft,
+          floatFixed = _this$state3.floatFixed;
       var floatClass = [];
 
       if (floatFixed) {
@@ -42109,7 +42156,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 593,
+          lineNumber: 594,
           columnNumber: 7
         }
       }, this.renderBody(floatClass))];
@@ -42367,7 +42414,8 @@ function (_PureComponent) {
           data = _this$props2.data,
           onResize = _this$props2.onResize,
           columnResizable = _this$props2.columnResizable,
-          sticky = _this$props2.sticky;
+          sticky = _this$props2.sticky,
+          bordered = _this$props2.bordered;
       var _this$state = this.state,
           colgroup = _this$state.colgroup,
           scrollAble = _this$state.scrollAble;
@@ -42377,6 +42425,7 @@ function (_PureComponent) {
         style: {
           width: width
         },
+        className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(bordered && 'table-bordered'),
         __self: this,
         __source: {
           fileName: _jsxFileName,
@@ -42454,7 +42503,8 @@ function (_PureComponent) {
           width = _this$props3.width,
           fixed = _this$props3.fixed,
           columnResizable = _this$props3.columnResizable,
-          others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0__["default"])(_this$props3, ["columns", "width", "fixed", "columnResizable"]);
+          bordered = _this$props3.bordered,
+          others = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_0__["default"])(_this$props3, ["columns", "width", "fixed", "columnResizable", "bordered"]);
 
       var _this$state2 = this.state,
           colgroup = _this$state2.colgroup,
@@ -42481,7 +42531,7 @@ function (_PureComponent) {
           style: {
             width: width
           },
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(!colgroup && minWidthSup && 'init'),
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(!colgroup && minWidthSup && 'init', bordered && 'table-bordered'),
           __self: this,
           __source: {
             fileName: _jsxFileName,
@@ -42497,7 +42547,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 139,
+            lineNumber: 142,
             columnNumber: 11
           }
         }),
@@ -42513,7 +42563,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 140,
+            lineNumber: 143,
             columnNumber: 11
           }
         }))))
@@ -42526,18 +42576,20 @@ function (_PureComponent) {
           columns = _this$props4.columns,
           width = _this$props4.width,
           children = _this$props4.children,
-          hideHeader = _this$props4.hideHeader;
+          hideHeader = _this$props4.hideHeader,
+          bordered = _this$props4.bordered;
       if (!columns || columns.length === 0) return (
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("table", {
           style: {
             width: width
           },
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(bordered && 'table-bordered'),
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 156,
-            columnNumber: 50
+            lineNumber: 161,
+            columnNumber: 9
           }
         }, children)
       );
@@ -42559,7 +42611,8 @@ SimpleTable.propTypes = {
   dataChangeResize: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
   columnResizable: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
   sticky: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.oneOfType([prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.object, prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool]),
-  hideHeader: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool
+  hideHeader: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool,
+  bordered: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.bool
 };
 SimpleTable.defaultProps = {
   data: undefined,
@@ -43000,6 +43053,7 @@ function (_Component) {
         }),
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(RenderTable, Object.assign({}, props, {
+          bordered: bordered,
           __self: this,
           __source: {
             fileName: _jsxFileName,
@@ -45003,7 +45057,7 @@ var TREE_TABLE_DEFAULT_INDENT = 15;
         return (
           /*#__PURE__*/
           react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(WrappedComponent, Object.assign({}, this.props, {
-            changedByExpand: this.changedByExpand,
+            changedByExpand: this.changedByExpand || this.props.changedByExpand,
             data: data,
             onTreeExpand: this.handleTreeExpand,
             treeExpandKeys: expandKeys,
@@ -45029,7 +45083,8 @@ var TREE_TABLE_DEFAULT_INDENT = 15;
     treeColumnsName: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.string,
     defaultTreeExpandKeys: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
     treeExpandKeys: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
-    onTreeExpand: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func
+    onTreeExpand: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func,
+    changedByExpand: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.bool
   });
   TreeExpand.defaultProps = {
     defaultTreeExpandKeys: []
@@ -45349,7 +45404,7 @@ function _createSuper2(Derived) {
 
 var TableWithPagination = Object(_hoc_pagable__WEBPACK_IMPORTED_MODULE_11__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
 var TableWithTree = Object(_TreeExpand__WEBPACK_IMPORTED_MODULE_14__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
-var TableWithPT = Object(_utils_func__WEBPACK_IMPORTED_MODULE_13__["compose"])(_TreeExpand__WEBPACK_IMPORTED_MODULE_14__["default"], _hoc_pagable__WEBPACK_IMPORTED_MODULE_11__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
+var TableWithPT = Object(_utils_func__WEBPACK_IMPORTED_MODULE_13__["compose"])(_hoc_pagable__WEBPACK_IMPORTED_MODULE_11__["default"], _TreeExpand__WEBPACK_IMPORTED_MODULE_14__["default"])(_Table__WEBPACK_IMPORTED_MODULE_12__["default"]);
 
 var _default =
 /*#__PURE__*/
@@ -45842,7 +45897,7 @@ function _createSuper2(Derived) {
         var onColumnResize = this.props.onColumnResize;
         var changed = Object(immer__WEBPACK_IMPORTED_MODULE_8__["default"])(this.state, function (draft) {
           var column = draft.columns[index];
-          draft.delta += parseFloat(width - (column.width || 0));
+          draft.delta += parseFloat(width - (column.width || colgroup[index] || 0));
           colgroup[index] = width;
           draft.columns.forEach(function (col, i) {
             var w = colgroup[i];
@@ -60258,7 +60313,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.8.2'
+  version: '1.8.7-beta.1'
 });