@titaui/pc 1.7.18 → 1.7.22

package/lib/components/cascader/index.css

@@ -16,39 +16,66 @@
   color: #3F4755;
 }
 
-.titaui-cascader .tu-icon-caret-down {
-  font-size: 16px;
-  transform: scale(0.5);
-}
-
-.rc-cascader-dropdown {
+.titaui-cascader-popup {
   z-index: 2000;
   box-shadow: 0px 4px 12px 0px rgba(127, 145, 180, 0.2);
   border: 1px solid #F0F2F5;
+  border-radius: 12px;
+  overflow: hidden;
 }
 
-.rc-cascader-menu {
+.titaui-cascader-popup .rc-cascader-menu {
   width: 139px;
   box-sizing: border-box;
   border: 1px solid #F0F2F5;
-  padding: 16px 6px;
+  padding: 16px 0 16px 6px;
+}
+
+.titaui-cascader-popup .rc-cascader-menu::-webkit-scrollbar {
+  width: 6px !important;
 }
 
-.rc-cascader-menu-item-active {
+.titaui-cascader-popup .rc-cascader-menu-item-active {
   background: unset;
   color: #2879ff;
 }
 
-.rc-cascader-menu-item {
+.titaui-cascader-popup .rc-cascader-menu-item {
   box-sizing: border-box;
   cursor: pointer;
   padding: 0 6px;
   height: 36px;
   align-items: center;
+  color: #3F4755;
 }
 
-.rc-cascader-menu-item:hover {
+.titaui-cascader-popup .rc-cascader-menu-item:hover {
   color: #2879ff;
   background: #F7F8FA;
   border-radius: 8px;
 }
+
+.titaui-cascader-popup .rc-cascader-menu-item-disabled {
+  opacity: 1;
+  cursor: auto;
+}
+
+.titaui-cascader-popup .rc-cascader-menu-item-disabled:hover {
+  color: #3F4755;
+  background: #FFFFFF;
+  border-radius: 8px;
+}
+
+.titaui-cascader-popup .rc-cascader-menu-item-expand-icon {
+  display: none;
+}
+
+.titaui-cascader .tu-icon-caret-down {
+  font-size: 16px;
+  transform: scale(0.5);
+}
+
+.titaui-cascader-time-popup .rc-cascader-menu {
+  width: 80px;
+  text-align: center;
+}

package/lib/components/cascader/index.js

@@ -11,11 +11,13 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _rcCascader = _interopRequireDefault(require("rc-cascader"));
 
+var _time = _interopRequireDefault(require("./time"));
+
 require("rc-cascader/assets/index.less");
 
 require("./index.css");
 
-var _excluded = ["value", "initText", "options", "onChange", "style", "placeholder", "splitSymbol"];
+var _excluded = ["value", "initText", "options", "onChange", "style", "placeholder", "splitSymbol", "popupClassName"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -57,6 +59,8 @@ var Cascader = function Cascader(_ref) {
       placeholder = _ref$placeholder === void 0 ? "请选择" : _ref$placeholder,
       _ref$splitSymbol = _ref.splitSymbol,
       splitSymbol = _ref$splitSymbol === void 0 ? "" : _ref$splitSymbol,
+      _ref$popupClassName = _ref.popupClassName,
+      popupClassName = _ref$popupClassName === void 0 ? "" : _ref$popupClassName,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var _useState = (0, _react.useState)(value),
@@ -70,7 +74,6 @@ var Cascader = function Cascader(_ref) {
       setInputValue = _useState4[1];
 
   var handleChange = function handleChange(value, selectedOptions) {
-    console.log(value, selectedOptions);
     onChange && onChange(value, selectedOptions);
     setSelectValue(value);
     var str = selectedOptions.map(function (o) {
@@ -82,10 +85,11 @@ var Cascader = function Cascader(_ref) {
   (0, _react.useEffect)(function () {
     setSelectValue(value);
   }, [value]);
-  return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_rcCascader["default"], _extends({
+  return /*#__PURE__*/_react["default"].createElement(_rcCascader["default"], _extends({
     options: options,
     onChange: handleChange,
-    value: selectValue
+    value: selectValue,
+    popupClassName: "".concat(preCls, "-popup ").concat(popupClassName)
   }, restProps), /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls,
     style: style
@@ -93,8 +97,9 @@ var Cascader = function Cascader(_ref) {
     className: "".concat(preCls, "-text")
   }, inputValue ? inputValue : placeholder), /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-caret-down"
-  }))));
+  })));
 };
 
+Cascader.TimeCascader = _time["default"];
 var _default = Cascader;
 exports["default"] = _default;

package/lib/components/cascader/time.js

@@ -0,0 +1,31 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _index = _interopRequireDefault(require("./index"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var TimeCascader = function TimeCascader(_ref) {
+  var restProps = _extends({}, _ref);
+
+  return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_index["default"], _extends({
+    popupClassName: ' titaui-cascader-time-popup'
+  }, restProps)));
+};
+
+var _default = TimeCascader;
+exports["default"] = _default;

package/lib/components/create-okr-modal/index.js

@@ -106,8 +106,8 @@ function CreateOkrModal(_ref, ref) {
   var initCycle = _ref.initCycle,
       userInfo = _ref.userInfo,
       onSuccess = _ref.onSuccess,
-      _ref$isPerformance = _ref.isPerformance,
-      isPerformance = _ref$isPerformance === void 0 ? false : _ref$isPerformance,
+      _ref$isHiddenCreatedC = _ref.isHiddenCreatedCard,
+      isHiddenCreatedCard = _ref$isHiddenCreatedC === void 0 ? false : _ref$isHiddenCreatedC,
       _ref$handleCreatedClo = _ref.handleCreatedClose,
       handleCreatedClose = _ref$handleCreatedClo === void 0 ? function () {} : _ref$handleCreatedClo,
       _ref$visible = _ref.visible,
@@ -355,7 +355,7 @@ function CreateOkrModal(_ref, ref) {
     data.userAvatarBase64Url = userAvatarBase64Url;
     setCreatedSuccessInfo(data);
 
-    if (!localStorage.getItem("dontShowValue".concat(userId)) && !isPerformance && !isApplyTpl) {
+    if (!localStorage.getItem("dontShowValue".concat(userId)) && !isHiddenCreatedCard && !isApplyTpl) {
       setShowCreatedSuccessInfo(true);
       setTipIndex(Math.floor(Math.random() * 6));
     } else {
@@ -514,7 +514,7 @@ function CreateOkrModal(_ref, ref) {
             case 28:
               hideCreateOkrModal();
 
-              if (onSuccess || !isPerformance) {
+              if (onSuccess || !isHiddenCreatedCard) {
                 // 带上超过创建okr人数的计算值
                 krNum = krDatas.length;
                 krTotalLength = 0;
@@ -903,14 +903,14 @@ function CreateOkrModal(_ref, ref) {
     className: "teach-suggest teach-suggest__kr",
     src: _hand["default"],
     onClick: handleShowKrSuggest
-  })))), !isApplyTpl && !isPerformance && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement(_createSuccessCmpWrapper["default"], null, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
+  })))), !isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement(_createSuccessCmpWrapper["default"], null, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
     tipIndex: tipIndex,
     createdSuccessInfo: createdSuccessInfo,
     isDownload: false,
     onCloseModel: handleCloseShowSuccessInfo,
     onShowDetail: handleCloseAndShowDetail,
     downLoadRef: downloadDomRef
-  })) : null, !isApplyTpl && !isPerformance && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement("div", {
+  })) : null, !isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "download-dom--hidden"
   }, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
     tipIndex: tipIndex,

package/lib/components/form/form-fields/group/index.js

@@ -26,12 +26,13 @@ var FieldGroup = function FieldGroup(props, ref) {
       label = _props$label === void 0 ? "" : _props$label,
       _props$direction = props.direction,
       direction = _props$direction === void 0 ? "vertical" : _props$direction,
+      className = props.className,
       children = props.children;
   (0, _react.useImperativeHandle)(ref, function () {
     return {};
   });
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(precls, "".concat(precls, "--").concat(direction))
+    className: (0, _classnames["default"])(precls, className, "".concat(precls, "--").concat(direction))
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__label")
   }, label), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/menus/components/menu-tree/index.css

@@ -25,6 +25,10 @@
   font-weight: 500;
 }
 
+.titaui-menus-tree .rc-tree-treenode-selected .titaui-menus-tree__sub-menu-item-node-title {
+  color: #2879ff;
+}
+
 .titaui-menus-tree .rc-tree-indent {
   display: none;
 }

package/lib/components/nav-top/components/user-own-menu/utils.js

@@ -38,7 +38,7 @@ var getOwnSet = function getOwnSet() {
     id: "role",
     url: "tu-icon-gongsi",
     title: "企业管理规定",
-    objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home#/enterprise/manage")
+    objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home#/enterprise/manage?reactRouterName=okr")
   }];
   var exit = [{
     id: "Logout",

package/lib/components/okr-detail/e-list/index.css

@@ -4,6 +4,24 @@
 
 .okr-detail-e .e__divider {
   height: 8px;
-  background: #F0F2F5;
+  background: #f0f2f5;
   margin: 10px 32px;
 }
+
+.okr-detail-e__empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 117px;
+  font-size: 14px;
+}
+
+.okr-detail-e__empty-img {
+  width: 128px;
+}
+
+.okr-detail-e__empty-text {
+  color: #3f4755;
+  line-height: 22px;
+  margin-top: 20px;
+}

package/lib/components/okr-detail/e-list/index.js

@@ -25,6 +25,10 @@ var _loading = _interopRequireDefault(require("../loading"));
 
 var _bsGlobal = require("../../../utils/bs-global");
 
+var _conditionRender = _interopRequireDefault(require("../../condition-render"));
+
+var _eListEmpty = _interopRequireDefault(require("./images/e-list-empty.png"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,7 +49,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var preCls = 'okr-detail-e';
+var preCls = "okr-detail-e";
 
 var _default = function _default(props) {
   var okrId = props.okrId;
@@ -67,7 +71,7 @@ var _default = function _default(props) {
       selectUsers = _useState6[0],
       setSelectUsers = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(hasCondition ? localStorage.getItem("okrDrawerESelectName".concat(loginUser)) : 'orderBySystem'),
+  var _useState7 = (0, _react.useState)(hasCondition ? localStorage.getItem("okrDrawerESelectName".concat(loginUser)) : "orderBySystem"),
       _useState8 = _slicedToArray(_useState7, 2),
       selectName = _useState8[0],
       setSelectName = _useState8[1];
@@ -102,20 +106,25 @@ var _default = function _default(props) {
       loading = _useState20[0],
       setLoading = _useState20[1];
 
+  var _useState21 = (0, _react.useState)(0),
+      _useState22 = _slicedToArray(_useState21, 2),
+      totalDataNum = _useState22[0],
+      setTotalDataNum = _useState22[1];
+
   var getKrEsData = function getKrEsData() {
     setLoading(true);
     (0, _requestApis.getKrsByCondition)({
       okrId: okrId,
-      'condition': (0, _util.formatCondition)({
+      "condition": (0, _util.formatCondition)({
         okrId: okrId,
         noteOrder: noteOrder,
         selectName: selectName,
         checkedStatus: checkedStatus,
         users: selectUsers,
-        'keyWord': searchKey
+        "keyWord": searchKey
       })
     }).then(function (krs) {
-      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId);
+      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
       var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
       });
@@ -133,9 +142,13 @@ var _default = function _default(props) {
   (0, _react.useEffect)(function () {
     getKrEsData();
   }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
+  (0, _react.useEffect)(function () {
+    var oElistLength = oEList[0] && oEList[0].length || 0;
+    setTotalDataNum(krList.length + oElistLength);
+  }, [krList, oEList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
-      'refreshEList': getKrEsData
+      "refreshEList": getKrEsData
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
@@ -150,7 +163,9 @@ var _default = function _default(props) {
     selectUsers: selectUsers,
     setSelectUsers: setSelectUsers,
     okrId: okrId
-  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, krList.map(function (kr, index) {
+  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: totalDataNum !== 0
+  }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: "0 32px 0 18px"
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
@@ -167,7 +182,16 @@ var _default = function _default(props) {
       data: kr,
       defaultExpandedKeys: expandedOEs
     }));
-  })) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: totalDataNum === 0
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__empty")
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    className: "".concat(preCls, "__empty-img"),
+    src: _eListEmpty["default"]
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__empty-text")
+  }, "\u6CA1\u6709\u641C\u7D22\u5230\u7B26\u5408\u6761\u4EF6\u7684E-\u6267\u884C")))) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     type: "panel"
   })));
 };

package/lib/components/okr-detail/e-list/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toTree = exports.getETreeNode = exports.formatTreeDataToNode = exports.formatEListDataToSelectTree = exports.formatCondition = void 0;
+exports.toTree = exports.getIfInitCondition = exports.getETreeNode = exports.formatTreeDataToNode = exports.formatEListDataToSelectTree = exports.formatCondition = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("clone-deep"));
 
@@ -75,24 +75,43 @@ var getETreeNode = function getETreeNode(tasks, isFirstLevel, createUserId, krUs
 
 exports.getETreeNode = getETreeNode;
 
-var formatTreeDataToNode = function formatTreeDataToNode(tree) {
-  return tree.map(function (item, index) {
-    return {
-      'key': item.mileStoneId,
-      'index': index,
-      'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
-      'nodeType': 'e-kr',
-      'isLeaf': false,
-      'children': getETreeNode(item.tasks, true, item.createUserId, item.user),
-      'data': _objectSpread({}, item),
-      'isOTask': item.mileStoneId === 0
-    };
-  });
+var formatTreeDataToNode = function formatTreeDataToNode(tree, isInitCondition) {
+  if (isInitCondition) {
+    return tree.map(function (item, index) {
+      return {
+        'key': item.mileStoneId,
+        'index': index,
+        'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
+        'nodeType': 'e-kr',
+        'isLeaf': false,
+        'children': getETreeNode(item.tasks, true, item.createUserId, item.user),
+        'data': _objectSpread({}, item),
+        'isOTask': item.mileStoneId === 0
+      };
+    });
+  } else {
+    var result = [];
+    tree.forEach(function (item, index) {
+      if (item.tasks && item.tasks.length > 0) {
+        result.push({
+          'key': item.mileStoneId,
+          'index': index,
+          'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
+          'nodeType': 'e-kr',
+          'isLeaf': false,
+          'children': getETreeNode(item.tasks, true, item.createUserId, item.user),
+          'data': _objectSpread({}, item),
+          'isOTask': item.mileStoneId === 0
+        });
+      }
+    });
+    return result;
+  }
 };
 
 exports.formatTreeDataToNode = formatTreeDataToNode;
 
-var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, workId) {
+var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, workId, isInitCondition) {
   var tree = data.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
       'tasks': toTree(item.tasks)
@@ -100,15 +119,13 @@ var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, wor
   });
   var formatKrsTreeDataToNode = formatTreeDataToNode(tree.filter(function (d) {
     return d.mileStoneId !== 0;
-  }));
+  }), isInitCondition);
   var formatOTreeDataToNode = formatTreeDataToNode(tree.filter(function (d) {
     return d.mileStoneId === 0;
-  }));
+  }), isInitCondition);
   var result = {
     'krsEList': formatKrsTreeDataToNode,
-    'oEList': formatOTreeDataToNode.length > 0 ? [formatTreeDataToNode(tree.filter(function (d) {
-      return d.mileStoneId === 0;
-    }))] : [[{
+    'oEList': isInitCondition && formatOTreeDataToNode.length === 0 ? [[{
       'key': 0,
       'index': 0,
       'title': '目标下的其他执行',
@@ -128,7 +145,7 @@ var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, wor
         mileStoneId: 0
       },
       'isOTask': true
-    }]]
+    }]] : [formatOTreeDataToNode]
   };
   return result;
 };
@@ -182,4 +199,14 @@ var formatCondition = function formatCondition(_ref) {
   };
 };
 
-exports.formatCondition = formatCondition;
+exports.formatCondition = formatCondition;
+
+var getIfInitCondition = function getIfInitCondition(selectName, checkedStatus, users, keyWord) {
+  if (keyWord || selectName !== 'orderBySystem' || checkedStatus.length !== 0 || users.length !== 0) {
+    return false;
+  }
+
+  return true;
+};
+
+exports.getIfInitCondition = getIfInitCondition;

package/lib/components/scrollbar/index.js

@@ -13,19 +13,29 @@ var _simplebarReact = _interopRequireDefault(require("./simplebar-react"));
 
 require("./index.css");
 
+var _excluded = ["children", "style"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 var preCls = 'titaui-scrollbar';
 
 var _default = function _default(props) {
   var children = props.children,
-      style = props.style; // @ts-ignore
+      style = props.style,
+      restProps = _objectWithoutProperties(props, _excluded); // @ts-ignore
+
 
-  return /*#__PURE__*/_react["default"].createElement(_simplebarReact["default"], {
+  return /*#__PURE__*/_react["default"].createElement(_simplebarReact["default"], _extends({
     className: (0, _classnames["default"])(preCls),
     timeout: 800,
     style: style
-  }, children);
+  }, restProps), children);
 };
 
 exports["default"] = _default;