shineout 1.8.0 → 1.8.4

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({
@@ -10162,19 +10162,20 @@ function (_PureComponent) {
           compressed = _this$props8.compressed,
           multiple = _this$props8.multiple;
       var result = value.length === 0 ? this.renderPlaceholder() : this.renderResult();
+      var clearEl = this.renderClear();
       return (
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
           ref: this.bindResult,
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_12__["cascaderClass"])('result', multiple && compressed && 'compressed'),
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_12__["cascaderClass"])('result', multiple && compressed && 'compressed', clearEl && 'result-clearable'),
           style: style,
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 265,
+            lineNumber: 266,
             columnNumber: 7
           }
-        }, result, this.renderIndicator(), this.renderClear())
+        }, result, this.renderIndicator(), clearEl)
       );
     }
   }]);
@@ -10973,7 +10974,8 @@ function (_PureComponent) {
           data = _this$props2.data,
           datum = _this$props2.datum,
           keygen = _this$props2.keygen,
-          children = _this$props2.children;
+          children = _this$props2.children,
+          style = _this$props2.style;
       var className = classnames__WEBPACK_IMPORTED_MODULE_10___default()(Object(_styles__WEBPACK_IMPORTED_MODULE_17__["checkinputClass"])('group', ['no-block', 'block'][Number(block)]), this.props.className);
 
       if (data === undefined) {
@@ -10981,10 +10983,11 @@ function (_PureComponent) {
           /*#__PURE__*/
           react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
             className: className,
+            style: style,
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 72,
+              lineNumber: 71,
               columnNumber: 9
             }
           },
@@ -10997,7 +11000,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 73,
+              lineNumber: 72,
               columnNumber: 11
             }
           }, children))
@@ -11008,10 +11011,11 @@ function (_PureComponent) {
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
           className: className,
+          style: style,
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 81,
+            lineNumber: 80,
             columnNumber: 7
           }
         }, data.map(function (d, i) {
@@ -11027,7 +11031,7 @@ function (_PureComponent) {
               __self: _this2,
               __source: {
                 fileName: _jsxFileName,
-                lineNumber: 83,
+                lineNumber: 82,
                 columnNumber: 11
               }
             }, _this2.getContent(d))
@@ -13799,12 +13803,17 @@ function (_PureComponent) {
           type = _this$props3.type,
           current = _this$props3.current,
           index = _this$props3.index,
-          rangeDate = _this$props3.rangeDate;
+          rangeDate = _this$props3.rangeDate,
+          max = _this$props3.max;
       var date = _utils__WEBPACK_IMPORTED_MODULE_11__["default"].toDate(MONTHBASE);
       date.setMonth(i);
       date.setFullYear(current.getFullYear());
       var isDisabled = min && _utils__WEBPACK_IMPORTED_MODULE_11__["default"].compareMonth(min, date, 1) >= 0;
 
+      if (!isDisabled) {
+        isDisabled = max && _utils__WEBPACK_IMPORTED_MODULE_11__["default"].compareMonth(date, max, 1) >= 0;
+      }
+
       if (!isDisabled && type === 'month' && typeof disabled === 'function') {
         isDisabled = disabled(date);
       }
@@ -13831,7 +13840,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 66,
+            lineNumber: 69,
             columnNumber: 7
           }
         }, m)
@@ -13848,7 +13857,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 76,
+            lineNumber: 79,
             columnNumber: 7
           }
         },
@@ -13858,7 +13867,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 77,
+            lineNumber: 80,
             columnNumber: 9
           }
         },
@@ -13870,7 +13879,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 78,
+            lineNumber: 81,
             columnNumber: 11
           }
         }),
@@ -13881,7 +13890,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 80,
+            lineNumber: 83,
             columnNumber: 11
           }
         }, current.getFullYear()),
@@ -13893,7 +13902,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 84,
+            lineNumber: 87,
             columnNumber: 11
           }
         })),
@@ -13903,7 +13912,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 87,
+            lineNumber: 90,
             columnNumber: 9
           }
         }, Object(_locale__WEBPACK_IMPORTED_MODULE_12__["getLocale"])('monthValues.short').map(this.renderMonth.bind(this))))
@@ -13918,6 +13927,7 @@ Month.propTypes = {
   current: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.object.isRequired,
   disabled: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.func,
   // max: PropTypes.object,
+  max: 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.string]),
   min: 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.string]),
   onChange: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.func.isRequired,
   onModeChange: prop_types__WEBPACK_IMPORTED_MODULE_8___default.a.func.isRequired,
@@ -17809,7 +17819,8 @@ function () {
         var id = _this5.getKey(d, path[path.length - 1], i);
 
         if (_this5.dataMap.get(id)) {
-          console.warn("There is already a key \"".concat(id, "\" exists. The key must be unique."));
+          console.error("There is already a key \"".concat(id, "\" exists. The key must be unique."));
+          return;
         }
 
         _this5.dataMap.set(id, d);
@@ -25879,7 +25890,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],
@@ -25901,6 +25914,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);
@@ -26090,7 +26110,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 182,
+              lineNumber: 184,
               columnNumber: 9
             }
           }),
@@ -26103,7 +26123,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 183,
+              lineNumber: 185,
               columnNumber: 11
             }
           }), item)
@@ -26116,7 +26136,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 190,
+            lineNumber: 192,
             columnNumber: 7
           }
         }), item,
@@ -26129,7 +26149,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 192,
+            lineNumber: 194,
             columnNumber: 9
           }
         }))
@@ -26189,7 +26209,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 250,
+            lineNumber: 252,
             columnNumber: 7
           }
         }), this.renderItem(hasChilds, style), hasChilds &&
@@ -26215,7 +26235,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 253,
+            lineNumber: 255,
             columnNumber: 11
           }
         }))
@@ -26455,25 +26475,28 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_classCallCheck__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/classCallCheck */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/classCallCheck.js");
 /* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/createClass */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/createClass.js");
 /* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_assertThisInitialized__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/assertThisInitialized */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js");
-/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_inherits__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/inherits */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/inherits.js");
-/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_possibleConstructorReturn__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js");
-/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/getPrototypeOf */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! prop-types */ "prop-types");
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var immer__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! immer */ "./node_modules/immer/dist/immer.module.js");
-/* harmony import */ var _utils_uid__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../utils/uid */ "./src/utils/uid.js");
-/* harmony import */ var _utils_proptypes__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/proptypes */ "./src/utils/proptypes.js");
-/* harmony import */ var _utils_dom_normalizeWheel__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/dom/normalizeWheel */ "./src/utils/dom/normalizeWheel.js");
-/* harmony import */ var _Scroll_Bar__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../Scroll/Bar */ "./src/Scroll/Bar.js");
-/* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./styles */ "./src/Menu/styles/index.js");
-/* harmony import */ var _List__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./List */ "./src/Menu/List.js");
-/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./context */ "./src/Menu/context.js");
-/* harmony import */ var _utils_is__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../utils/is */ "./src/utils/is.js");
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../config */ "./src/config.js");
+/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_get__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/get */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/get.js");
+/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_inherits__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/inherits */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/inherits.js");
+/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_possibleConstructorReturn__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js");
+/* harmony import */ var _Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/getPrototypeOf */ "./node_modules/babel-preset-react-app/node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! prop-types */ "prop-types");
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var immer__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! immer */ "./node_modules/immer/dist/immer.module.js");
+/* harmony import */ var _utils_uid__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/uid */ "./src/utils/uid.js");
+/* harmony import */ var _utils_proptypes__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/proptypes */ "./src/utils/proptypes.js");
+/* harmony import */ var _utils_dom_normalizeWheel__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../utils/dom/normalizeWheel */ "./src/utils/dom/normalizeWheel.js");
+/* harmony import */ var _Scroll_Bar__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../Scroll/Bar */ "./src/Scroll/Bar.js");
+/* harmony import */ var _styles__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./styles */ "./src/Menu/styles/index.js");
+/* harmony import */ var _List__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./List */ "./src/Menu/List.js");
+/* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./context */ "./src/Menu/context.js");
+/* harmony import */ var _utils_is__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ../utils/is */ "./src/utils/is.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../config */ "./src/config.js");
+/* harmony import */ var _component__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ../component */ "./src/component.js");
+
 
 
 
@@ -26499,18 +26522,18 @@ function _createSuper2(Derived) {
   }
 
   return function () {
-    var Super = 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"])(Derived),
+    var Super = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_8__["default"])(Derived),
         result;
 
     if (isNativeReflectConstruct()) {
-      var NewTarget = 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"])(this).constructor;
+      var NewTarget = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_getPrototypeOf__WEBPACK_IMPORTED_MODULE_8__["default"])(this).constructor;
 
       result = Reflect.construct(Super, arguments, NewTarget);
     } else {
       result = Super.apply(this, arguments);
     }
 
-    return Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_possibleConstructorReturn__WEBPACK_IMPORTED_MODULE_6__["default"])(this, result);
+    return Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_possibleConstructorReturn__WEBPACK_IMPORTED_MODULE_7__["default"])(this, result);
   };
 }
 
@@ -26527,6 +26550,7 @@ function _createSuper2(Derived) {
 
 
 
+
 var modeDirection = {
   'vertical-auto': 'y',
   vertical: 'y',
@@ -26562,8 +26586,8 @@ function keyToMap() {
 
 var Root =
 /*#__PURE__*/
-function (_React$Component) {
-  Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_inherits__WEBPACK_IMPORTED_MODULE_5__["default"])(Root, _React$Component);
+function (_Component) {
+  Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_inherits__WEBPACK_IMPORTED_MODULE_6__["default"])(Root, _Component);
 
   var _super = _createSuper2(Root);
 
@@ -26603,6 +26627,8 @@ function (_React$Component) {
   Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_createClass__WEBPACK_IMPORTED_MODULE_3__["default"])(Root, [{
     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_5__["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_8__["default"])(Root.prototype), "componentDidMount", this).call(this);
+
       this.updateState();
     }
   }, {
@@ -26614,6 +26640,8 @@ function (_React$Component) {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.container.removeEventListener('wheel', this.handleWheel);
+
+      Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_get__WEBPACK_IMPORTED_MODULE_5__["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_8__["default"])(Root.prototype), "componentWillUnmount", this).call(this);
     }
   }, {
     key: "getOpenKeys",
@@ -26629,8 +26657,8 @@ function (_React$Component) {
     value: function bindRootElement(el) {
       this.container = el;
       if (!el) return;
-      this.wrapper = el.querySelector(".".concat(Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('wrapper')));
-      this.rootElement = el.querySelector(".".concat(Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('root')));
+      this.wrapper = el.querySelector(".".concat(Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('wrapper')));
+      this.rootElement = el.querySelector(".".concat(Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('root')));
     }
   }, {
     key: "bindItem",
@@ -26665,7 +26693,7 @@ function (_React$Component) {
     value: function checkOpen(id) {
       var openKeys = this.getOpenKeys();
 
-      if (Object(_utils_is__WEBPACK_IMPORTED_MODULE_19__["isArray"])(openKeys)) {
+      if (Object(_utils_is__WEBPACK_IMPORTED_MODULE_20__["isArray"])(openKeys)) {
         return openKeys.indexOf(id) > -1;
       }
 
@@ -26715,7 +26743,7 @@ function (_React$Component) {
       });
       var hasOpen = this.getOpenKeys().filter(function (k) {
         return data.find(function (d, i) {
-          return Object(_utils_uid__WEBPACK_IMPORTED_MODULE_12__["getKey"])(d, keygen, i) === k;
+          return Object(_utils_uid__WEBPACK_IMPORTED_MODULE_13__["getKey"])(d, keygen, i) === k;
         });
       }).length > 0;
 
@@ -26738,7 +26766,7 @@ function (_React$Component) {
   }, {
     key: "toggleOpenKeys",
     value: function toggleOpenKeys(id, open) {
-      var newOpenKeys = Object(immer__WEBPACK_IMPORTED_MODULE_11__["default"])(keyToMap(this.getOpenKeys()), function (draft) {
+      var newOpenKeys = Object(immer__WEBPACK_IMPORTED_MODULE_12__["default"])(keyToMap(this.getOpenKeys()), function (draft) {
         if (open) {
           draft.set(id, true);
         } else draft["delete"](id);
@@ -26793,7 +26821,7 @@ function (_React$Component) {
           pos = _getOption.pos,
           direction = _getOption.direction;
 
-      var wheel = Object(_utils_dom_normalizeWheel__WEBPACK_IMPORTED_MODULE_14__["default"])(e);
+      var wheel = Object(_utils_dom_normalizeWheel__WEBPACK_IMPORTED_MODULE_15__["default"])(e);
       var size = this.container.getBoundingClientRect()[key]; // const size = this.rootElement.getBoundingClientRect()[key] - this.container.getBoundingClientRect()[key]
 
       this.wrapper["scroll".concat(pos)] += wheel["pixel".concat(direction)];
@@ -26835,8 +26863,8 @@ function (_React$Component) {
         if (scrollWidth <= width) return null;
         return (
           /*#__PURE__*/
-          react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_Scroll_Bar__WEBPACK_IMPORTED_MODULE_15__["default"], {
-            className: Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('bar'),
+          react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_Scroll_Bar__WEBPACK_IMPORTED_MODULE_16__["default"], {
+            className: Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('bar'),
             length: width,
             scrollLength: scrollWidth,
             offset: this.state.scrollLeft,
@@ -26845,7 +26873,7 @@ function (_React$Component) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 251,
+              lineNumber: 255,
               columnNumber: 9
             }
           })
@@ -26857,8 +26885,8 @@ function (_React$Component) {
       if (scrollHeight < length) return null;
       return (
         /*#__PURE__*/
-        react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_Scroll_Bar__WEBPACK_IMPORTED_MODULE_15__["default"], {
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('bar'),
+        react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_Scroll_Bar__WEBPACK_IMPORTED_MODULE_16__["default"], {
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('bar'),
           forceHeight: length,
           length: length,
           scrollLength: scrollHeight,
@@ -26867,7 +26895,7 @@ function (_React$Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 267,
+            lineNumber: 271,
             columnNumber: 7
           }
         })
@@ -26894,8 +26922,8 @@ function (_React$Component) {
           caretColor = _this$props4.caretColor;
       var isVertical = mode.indexOf('vertical') === 0;
       var showScroll = (style.height || height) && isVertical || mode === 'horizontal';
-      var rtl = Object(_config__WEBPACK_IMPORTED_MODULE_20__["isRTL"])();
-      var className = classnames__WEBPACK_IMPORTED_MODULE_10___default()(Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('_', isVertical ? 'vertical' : mode, theme === 'dark' && 'dark', showScroll && 'scroll', this.state.hasOpen && 'has-open', rtl && 'rtl'), this.props.className);
+      var rtl = Object(_config__WEBPACK_IMPORTED_MODULE_21__["isRTL"])();
+      var className = classnames__WEBPACK_IMPORTED_MODULE_11___default()(Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('_', isVertical ? 'vertical' : mode, theme === 'dark' && 'dark', showScroll && 'scroll', this.state.hasOpen && 'has-open', rtl && 'rtl'), this.props.className);
       var rootStyle = {};
       if (style.width && mode !== 'horizontal') rootStyle.width = style.width;
       var bottomLine = 0;
@@ -26909,40 +26937,40 @@ function (_React$Component) {
 
       return (
         /*#__PURE__*/
-        react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
+        react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("div", {
           className: className,
           ref: this.bindRootElement,
           style: style,
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 325,
+            lineNumber: 329,
             columnNumber: 7
           }
         },
         /*#__PURE__*/
-        react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('wrapper'),
+        react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("div", {
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('wrapper'),
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 326,
+            lineNumber: 330,
             columnNumber: 9
           }
         },
         /*#__PURE__*/
-        react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_context__WEBPACK_IMPORTED_MODULE_18__["Provider"], {
+        react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_context__WEBPACK_IMPORTED_MODULE_19__["Provider"], {
           value: this.providerValue,
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 327,
+            lineNumber: 331,
             columnNumber: 11
           }
         },
         /*#__PURE__*/
-        react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_List__WEBPACK_IMPORTED_MODULE_17__["default"], {
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_16__["menuClass"])('root'),
+        react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_List__WEBPACK_IMPORTED_MODULE_18__["default"], {
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_17__["menuClass"])('root'),
           data: data,
           disabled: disabled,
           inlineIndent: inlineIndent,
@@ -26967,7 +26995,7 @@ function (_React$Component) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 328,
+            lineNumber: 332,
             columnNumber: 13
           }
         }))), showScroll && this.renderScrollBar())
@@ -26976,25 +27004,25 @@ function (_React$Component) {
   }]);
 
   return Root;
-}(react__WEBPACK_IMPORTED_MODULE_8___default.a.Component);
+}(_component__WEBPACK_IMPORTED_MODULE_22__["Component"]);
 
-Root.propTypes = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])({}, Object(_utils_proptypes__WEBPACK_IMPORTED_MODULE_13__["getProps"])(prop_types__WEBPACK_IMPORTED_MODULE_9___default.a, 'style', 'keygen')), {}, {
-  active: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func,
-  data: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
-  defaultOpenKeys: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
-  openKeys: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.array,
-  disabled: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func,
-  inlineIndent: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.number,
-  mode: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.oneOf(['inline', 'vertical', 'horizontal', 'vertical-auto']),
-  onClick: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func,
-  renderItem: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.oneOfType([prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.string, prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func]),
-  onOpenChange: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.func,
-  toggleDuration: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.number,
-  frontCaret: prop_types__WEBPACK_IMPORTED_MODULE_9___default.a.bool,
-  frontCaretType: _List__WEBPACK_IMPORTED_MODULE_17__["default"].propTypes.frontCaretType,
-  caretColor: _List__WEBPACK_IMPORTED_MODULE_17__["default"].propTypes.caretColor
+Root.propTypes = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])({}, Object(_utils_proptypes__WEBPACK_IMPORTED_MODULE_14__["getProps"])(prop_types__WEBPACK_IMPORTED_MODULE_10___default.a, 'style', 'keygen')), {}, {
+  active: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.func,
+  data: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.array,
+  defaultOpenKeys: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.array,
+  openKeys: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.array,
+  disabled: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.func,
+  inlineIndent: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.number,
+  mode: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.oneOf(['inline', 'vertical', 'horizontal', 'vertical-auto']),
+  onClick: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.func,
+  renderItem: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.oneOfType([prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.string, prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.func]),
+  onOpenChange: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.func,
+  toggleDuration: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.number,
+  frontCaret: prop_types__WEBPACK_IMPORTED_MODULE_10___default.a.bool,
+  frontCaretType: _List__WEBPACK_IMPORTED_MODULE_18__["default"].propTypes.frontCaretType,
+  caretColor: _List__WEBPACK_IMPORTED_MODULE_18__["default"].propTypes.caretColor
 });
-Root.defaultProps = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])({}, _utils_proptypes__WEBPACK_IMPORTED_MODULE_13__["defaultProps"]), {}, {
+Root.defaultProps = Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])(Object(_Users_10008649_Desktop_workspace_fe_shein_shineout_node_modules_babel_preset_react_app_node_modules_babel_runtime_helpers_esm_objectSpread__WEBPACK_IMPORTED_MODULE_0__["default"])({}, _utils_proptypes__WEBPACK_IMPORTED_MODULE_14__["defaultProps"]), {}, {
   data: [],
   disabled: function disabled(d) {
     return d.disabled;
@@ -28452,10 +28480,13 @@ function open(props, isPortal) {
   div.style.display = 'block';
   var parsed = parseInt(zIndex, 10);
   if (!Number.isNaN(parsed)) div.style.zIndex = parsed;
-  var scrollWidth = window.innerWidth - _utils_dom_document__WEBPACK_IMPORTED_MODULE_17__["docSize"].width;
   var doc = document.body.parentNode;
-  doc.style.overflow = 'hidden';
-  doc.style.paddingRight = "".concat(scrollWidth, "px");
+
+  if (!doc.style.paddingRight) {
+    var scrollWidth = window.innerWidth - _utils_dom_document__WEBPACK_IMPORTED_MODULE_17__["docSize"].width;
+    doc.style.overflow = 'hidden';
+    doc.style.paddingRight = "".concat(scrollWidth, "px");
+  }
 
   var handleClose = function handleClose() {
     if (onClose) onClose();
@@ -33391,6 +33422,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;
   }
 
@@ -33409,6 +33441,7 @@ function (_PureComponent) {
       this.wheelElement.addEventListener('touchmove', this.handleTouchMove, {
         passive: false
       });
+      this.inner.addEventListener('scroll', this.handleInnerScroll);
     }
   }, {
     key: "componentDidUpdate",
@@ -33427,6 +33460,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",
@@ -33620,23 +33654,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);
@@ -33652,7 +33704,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 234,
+            lineNumber: 249,
             columnNumber: 7
           }
         },
@@ -33665,7 +33717,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 235,
+            lineNumber: 250,
             columnNumber: 9
           }
         }),
@@ -33675,7 +33727,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 236,
+            lineNumber: 251,
             columnNumber: 9
           }
         }),
@@ -33686,7 +33738,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 237,
+            lineNumber: 252,
             columnNumber: 9
           }
         },
@@ -33700,7 +33752,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 238,
+            lineNumber: 253,
             columnNumber: 11
           }
         }, children)), scrollY &&
@@ -33715,7 +33767,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 241,
+            lineNumber: 256,
             columnNumber: 11
           }
         }), scrollX &&
@@ -33729,7 +33781,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 251,
+            lineNumber: 266,
             columnNumber: 11
           }
         }))
@@ -36792,20 +36844,21 @@ function (_PureComponent) {
       var showPlaceholder = this.isEmptyResult();
       var result = showPlaceholder ? this.renderPlaceholder() : this.renderResult();
       var rtl = Object(_config__WEBPACK_IMPORTED_MODULE_15__["isRTL"])();
+      var clearEl = this.renderClear();
 
       if (rtl) {
         return (
           /*#__PURE__*/
           react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
             ref: this.bindResult,
-            className: Object(_styles__WEBPACK_IMPORTED_MODULE_9__["selectClass"])('result', compressed && 'compressed', showPlaceholder && 'empty'),
+            className: Object(_styles__WEBPACK_IMPORTED_MODULE_9__["selectClass"])('result', compressed && 'compressed', showPlaceholder && 'empty', clearEl && 'result-clearable'),
             __self: this,
             __source: {
               fileName: _jsxFileName,
               lineNumber: 307,
               columnNumber: 9
             }
-          }, this.renderClear(), this.renderIndicator(), result)
+          }, clearEl, this.renderIndicator(), result)
         );
       }
 
@@ -36813,14 +36866,14 @@ function (_PureComponent) {
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement("div", {
           ref: this.bindResult,
-          className: Object(_styles__WEBPACK_IMPORTED_MODULE_9__["selectClass"])('result', compressed && 'compressed', showPlaceholder && 'empty'),
+          className: Object(_styles__WEBPACK_IMPORTED_MODULE_9__["selectClass"])('result', compressed && 'compressed', showPlaceholder && 'empty', clearEl && 'result-clearable'),
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 319,
+            lineNumber: 324,
             columnNumber: 7
           }
-        }, result, this.renderIndicator(), this.renderClear())
+        }, result, this.renderIndicator(), clearEl)
       );
     }
   }]);
@@ -41547,13 +41600,17 @@ function (_PureComponent) {
 
 
         if (treeColumnsName && changedByExpand) {
+          // Blank space may appear after clicking the top or bottom collapse button
           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;
+            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;
+              return;
+            }
           }
-
-          return;
         }
 
         if (index === 0) {
@@ -41837,7 +41894,8 @@ 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,
@@ -41859,7 +41917,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 493,
+              lineNumber: 499,
               columnNumber: 14
             }
           })
@@ -41888,7 +41946,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 506,
+            lineNumber: 512,
             columnNumber: 7
           }
         },
@@ -41902,7 +41960,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 516,
+            lineNumber: 522,
             columnNumber: 9
           }
         },
@@ -41914,13 +41972,13 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 517,
+            lineNumber: 523,
             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
           },
@@ -41928,7 +41986,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 518,
+            lineNumber: 524,
             columnNumber: 11
           }
         },
@@ -41940,7 +41998,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 519,
+            lineNumber: 529,
             columnNumber: 13
           }
         }),
@@ -41962,7 +42020,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 520,
+            lineNumber: 530,
             columnNumber: 13
           }
         })))))
@@ -41987,7 +42045,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 547,
+          lineNumber: 557,
           columnNumber: 7
         }
       },
@@ -41997,10 +42055,11 @@ function (_PureComponent) {
           width: width
         },
         ref: this.bindThead,
+        className: Object(_styles__WEBPACK_IMPORTED_MODULE_19__["tableClass"])('table-bordered'),
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 548,
+          lineNumber: 558,
           columnNumber: 9
         }
       },
@@ -42012,7 +42071,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 549,
+          lineNumber: 559,
           columnNumber: 11
         }
       }),
@@ -42024,7 +42083,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 550,
+          lineNumber: 560,
           columnNumber: 11
         }
       }))));
@@ -42040,7 +42099,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 558,
+              lineNumber: 568,
               columnNumber: 9
             }
           }), header)
@@ -42082,7 +42141,7 @@ function (_PureComponent) {
         __self: this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 588,
+          lineNumber: 598,
           columnNumber: 7
         }
       }, this.renderBody(floatClass))];
@@ -42340,7 +42399,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;
@@ -42350,6 +42410,7 @@ function (_PureComponent) {
         style: {
           width: width
         },
+        className: Object(_styles__WEBPACK_IMPORTED_MODULE_10__["tableClass"])(bordered && 'table-bordered'),
         __self: this,
         __source: {
           fileName: _jsxFileName,
@@ -42427,7 +42488,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,
@@ -42454,7 +42516,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,
@@ -42470,7 +42532,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 139,
+            lineNumber: 142,
             columnNumber: 11
           }
         }),
@@ -42486,7 +42548,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 140,
+            lineNumber: 143,
             columnNumber: 11
           }
         }))))
@@ -42499,18 +42561,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)
       );
@@ -42532,7 +42596,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,
@@ -42973,6 +43038,7 @@ function (_Component) {
         }),
         /*#__PURE__*/
         react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(RenderTable, Object.assign({}, props, {
+          bordered: bordered,
           __self: this,
           __source: {
             fileName: _jsxFileName,
@@ -45815,7 +45881,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];
@@ -60231,7 +60297,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.8.0'
+  version: '1.8.4'
 });