@kdcloudjs/kdesign 1.3.7 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/dist/kdesign-complete.less +122 -129
  3. package/dist/kdesign.css +129 -118
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +176 -137
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +3 -3
  8. package/dist/kdesign.min.js +3 -3
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/anchor/anchor.js +3 -3
  11. package/es/anchor/style/index.css +7 -7
  12. package/es/anchor/style/index.less +5 -5
  13. package/es/anchor/style/token.less +1 -1
  14. package/es/config-provider/compDefaultProps.d.ts +1 -0
  15. package/es/config-provider/compDefaultProps.js +2 -1
  16. package/es/menu/menu.js +21 -9
  17. package/es/menu/menuItem.js +13 -3
  18. package/es/menu/style/index.css +119 -107
  19. package/es/menu/style/index.less +54 -76
  20. package/es/menu/style/mixin.less +60 -43
  21. package/es/menu/subMenu.js +23 -16
  22. package/es/select/select.js +6 -4
  23. package/es/switch/style/index.css +1 -1
  24. package/es/switch/style/token.less +1 -1
  25. package/es/table/table.js +2 -0
  26. package/es/tree/style/index.css +1 -2
  27. package/es/tree/style/index.less +1 -2
  28. package/es/tree/style/token.less +0 -1
  29. package/es/tree/tree.js +1 -2
  30. package/es/tree/treeNode.js +1 -1
  31. package/lib/anchor/anchor.js +3 -3
  32. package/lib/anchor/style/index.css +7 -7
  33. package/lib/anchor/style/index.less +5 -5
  34. package/lib/anchor/style/token.less +1 -1
  35. package/lib/config-provider/compDefaultProps.d.ts +1 -0
  36. package/lib/config-provider/compDefaultProps.js +2 -1
  37. package/lib/menu/menu.js +21 -9
  38. package/lib/menu/menuItem.js +15 -3
  39. package/lib/menu/style/index.css +119 -107
  40. package/lib/menu/style/index.less +54 -76
  41. package/lib/menu/style/mixin.less +60 -43
  42. package/lib/menu/subMenu.js +25 -17
  43. package/lib/select/select.js +6 -4
  44. package/lib/switch/style/index.css +1 -1
  45. package/lib/switch/style/token.less +1 -1
  46. package/lib/table/table.js +2 -0
  47. package/lib/tree/style/index.css +1 -2
  48. package/lib/tree/style/index.less +1 -2
  49. package/lib/tree/style/token.less +0 -1
  50. package/lib/tree/tree.js +1 -2
  51. package/lib/tree/treeNode.js +1 -1
  52. package/package.json +1 -1
package/dist/kdesign.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/kdesign v1.3.6
3
+ * @kdcloudjs/kdesign v1.3.9
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -2623,7 +2623,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
2623
2623
 
2624
2624
  var anchorMenuClass = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, "".concat(anchorPrefixCls, "-menu"), true));
2625
2625
  var anchorAdvancedClass = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()({}, "".concat(anchorPrefixCls, "-advanced"), true));
2626
- var inkClass = classnames__WEBPACK_IMPORTED_MODULE_20___default()("".concat(anchorPrefixCls, "-ink-line"), {
2626
+ var inkClass = classnames__WEBPACK_IMPORTED_MODULE_20___default()("".concat(anchorPrefixCls, "-line-slider"), {
2627
2627
  visible: activeLink
2628
2628
  });
2629
2629
  react__WEBPACK_IMPORTED_MODULE_19___default.a.useEffect(function () {
@@ -2770,7 +2770,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
2770
2770
  getScrollContainer().addEventListener('scroll', handleScroll);
2771
2771
  handleScroll();
2772
2772
  return function () {
2773
- return window.removeEventListener('scroll', handleScroll);
2773
+ return getScrollContainer().removeEventListener('scroll', handleScroll);
2774
2774
  };
2775
2775
  }, [handleScroll, getScrollContainer]);
2776
2776
  Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
@@ -2843,7 +2843,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
2843
2843
  width: anchorPosition.width
2844
2844
  } : undefined
2845
2845
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", {
2846
- className: "".concat(anchorPrefixCls, "-ink")
2846
+ className: "".concat(anchorPrefixCls, "-line")
2847
2847
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
2848
2848
  className: inkClass,
2849
2849
  ref: inkRef
@@ -7988,7 +7988,8 @@ var compDefaultProps = {
7988
7988
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["createElement"](_index__WEBPACK_IMPORTED_MODULE_2__["Icon"], {
7989
7989
  type: "arrow-right-solid"
7990
7990
  });
7991
- }
7991
+ },
7992
+ estimatedItemSize: 32
7992
7993
  },
7993
7994
  TreeNode: {},
7994
7995
  ToolTip: {
@@ -21667,7 +21668,7 @@ var Menu = function Menu(props) {
21667
21668
  restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_9___default()(_getCompProps, _excluded);
21668
21669
 
21669
21670
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
21670
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'")); // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
21671
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
21671
21672
 
21672
21673
  var _React$useState = react__WEBPACK_IMPORTED_MODULE_18___default.a.useState(''),
21673
21674
  _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState, 2),
@@ -21676,8 +21677,13 @@ var Menu = function Menu(props) {
21676
21677
 
21677
21678
  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_18___default.a.useState([]),
21678
21679
  _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState3, 2),
21679
- openKeys = _React$useState4[0],
21680
- setOpenKeys = _React$useState4[1];
21680
+ selectedKeyPath = _React$useState4[0],
21681
+ setSelectedKeyPath = _React$useState4[1];
21682
+
21683
+ var _React$useState5 = react__WEBPACK_IMPORTED_MODULE_18___default.a.useState([]),
21684
+ _React$useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState5, 2),
21685
+ openKeys = _React$useState6[0],
21686
+ setOpenKeys = _React$useState6[1];
21681
21687
 
21682
21688
  if (mode === 'inline') {
21683
21689
  restProps.triggerSubMenuAction = 'click';
@@ -21686,6 +21692,7 @@ var Menu = function Menu(props) {
21686
21692
  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
21687
21693
  setOpenKeys([]);
21688
21694
  setSelectedKey('');
21695
+ setSelectedKeyPath([]);
21689
21696
  openSubMenuSet.clear();
21690
21697
  }, [mode]);
21691
21698
  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
@@ -21696,14 +21703,17 @@ var Menu = function Menu(props) {
21696
21703
  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
21697
21704
  if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
21698
21705
  setOpenKeys(userOpenKeys);
21699
- openSubMenuSet.clear();
21700
- userOpenKeys.forEach(function (d) {
21701
- openSubMenuSet.add(d);
21706
+ }
21707
+ }, [userOpenKeys]);
21708
+ Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
21709
+ if (userSelectedKey !== undefined && userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
21710
+ setTimeout(function () {
21711
+ userOpenKeys.forEach(function (d) {
21712
+ openSubMenuSet.add(d);
21713
+ });
21702
21714
  });
21703
21715
  }
21704
- }, [userOpenKeys]); // React.useEffect(() => {
21705
- // setCollapsed(restProps.collapsed)
21706
- // }, [restProps.collapsed])
21716
+ }, []);
21707
21717
 
21708
21718
  var handleOnClick = function handleOnClick(info) {
21709
21719
  if (userSelectedKey === undefined) {
@@ -21712,6 +21722,7 @@ var Menu = function Menu(props) {
21712
21722
 
21713
21723
  if (mode !== 'inline' && openKeys.length > 0) {
21714
21724
  setOpenKeys([]);
21725
+ openSubMenuSet.clear();
21715
21726
  }
21716
21727
 
21717
21728
  onClick && onClick(info);
@@ -21761,6 +21772,8 @@ var Menu = function Menu(props) {
21761
21772
  mode: mode,
21762
21773
  openKeys: openKeys,
21763
21774
  selectedKey: selectedKey,
21775
+ selectedKeyPath: selectedKeyPath,
21776
+ setSelectedKeyPath: setSelectedKeyPath,
21764
21777
  theme: theme,
21765
21778
  triggerSubMenuAction: restProps.triggerSubMenuAction,
21766
21779
  forceSubMenuRender: forceSubMenuRender,
@@ -21810,20 +21823,26 @@ __webpack_require__.r(__webpack_exports__);
21810
21823
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
21811
21824
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
21812
21825
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
21813
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
21814
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__);
21815
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
21816
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
21817
- /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
21818
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
21819
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
21820
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_6__);
21821
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
21822
- /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
21826
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
21827
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__);
21828
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
21829
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__);
21830
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
21831
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__);
21832
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react */ "react");
21833
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
21834
+ /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
21835
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
21836
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
21837
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_8__);
21838
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
21839
+ /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
21823
21840
 
21824
21841
 
21825
21842
 
21826
- var _excluded = ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style"];
21843
+
21844
+ var _excluded = ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "setSelectedKeyPath", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style", "parentPath"];
21845
+
21827
21846
 
21828
21847
 
21829
21848
 
@@ -21835,13 +21854,13 @@ var MENU_ITEM_CONTAINER_NAME = 'menu-item-content-container';
21835
21854
  var InternalMenuItem = function InternalMenuItem(props, ref) {
21836
21855
  var _classNames;
21837
21856
 
21838
- var _React$useContext = react__WEBPACK_IMPORTED_MODULE_3__["useContext"](_config_provider__WEBPACK_IMPORTED_MODULE_4__["ConfigContext"]),
21857
+ var _React$useContext = react__WEBPACK_IMPORTED_MODULE_5__["useContext"](_config_provider__WEBPACK_IMPORTED_MODULE_6__["ConfigContext"]),
21839
21858
  getPrefixCls = _React$useContext.getPrefixCls,
21840
21859
  pkgPrefixCls = _React$useContext.prefixCls,
21841
21860
  userDefaultProps = _React$useContext.compDefaultProps; // 属性需要合并一遍用户定义的默认属性
21842
21861
 
21843
21862
 
21844
- var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getCompProps"])('MenuItem', userDefaultProps, props),
21863
+ var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getCompProps"])('MenuItem', userDefaultProps, props),
21845
21864
  customPrefixcls = _getCompProps.prefixCls,
21846
21865
  icon = _getCompProps.icon,
21847
21866
  mode = _getCompProps.mode,
@@ -21852,6 +21871,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21852
21871
  collapsed = _getCompProps.collapsed,
21853
21872
  keyValue = _getCompProps.keyValue,
21854
21873
  selectedKey = _getCompProps.selectedKey,
21874
+ setSelectedKeyPath = _getCompProps.setSelectedKeyPath,
21855
21875
  subMenuMode = _getCompProps.subMenuMode,
21856
21876
  inlineIndent = _getCompProps.inlineIndent,
21857
21877
  className = _getCompProps.className,
@@ -21859,20 +21879,22 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21859
21879
  _getCompProps$padding = _getCompProps.paddingLeft,
21860
21880
  paddingLeft = _getCompProps$padding === void 0 ? 0 : _getCompProps$padding,
21861
21881
  style = _getCompProps.style,
21862
- restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default()(_getCompProps, _excluded);
21882
+ parentPath = _getCompProps.parentPath,
21883
+ restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default()(_getCompProps, _excluded);
21863
21884
 
21864
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_8__["default"])(!keyValue && keyValue !== 0, 'menuitem', 'cannot found children in Menu.Item');
21885
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_10__["default"])(!keyValue && keyValue !== 0, 'menuitem', 'cannot found children in Menu.Item');
21865
21886
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-item', customPrefixcls);
21866
- var menuItemRef = ref || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createRef"]();
21887
+ var menuItemRef = ref || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createRef"]();
21888
+ var menuItemParentPath = Array.isArray(parentPath) ? [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default()(parentPath), [keyValue]) : [keyValue];
21867
21889
 
21868
21890
  var renderItemChildren = function renderItemChildren(children) {
21869
21891
  if (typeof children === 'string') {
21870
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("span", {
21892
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("span", {
21871
21893
  className: MENU_ITEM_CONTAINER_NAME
21872
21894
  }, children);
21873
21895
  }
21874
21896
 
21875
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("div", {
21897
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("div", {
21876
21898
  className: MENU_ITEM_CONTAINER_NAME
21877
21899
  }, typeof children === 'function' ? children() : children);
21878
21900
  };
@@ -21896,7 +21918,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21896
21918
  e.stopPropagation();
21897
21919
  var info = {
21898
21920
  key: keyValue,
21899
- keyPath: [keyValue],
21921
+ keyPath: menuItemParentPath,
21900
21922
  domEvent: e.nativeEvent
21901
21923
  };
21902
21924
  handleOnClick(info);
@@ -21908,7 +21930,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21908
21930
  }
21909
21931
 
21910
21932
  if (level > 1 && mode !== 'inline') {
21911
- return _util__WEBPACK_IMPORTED_MODULE_7__["DEFAUTL_PADDING"];
21933
+ return _util__WEBPACK_IMPORTED_MODULE_9__["DEFAUTL_PADDING"];
21912
21934
  } // if (level === 1 && icon) {
21913
21935
  // return 0
21914
21936
  // }
@@ -21929,32 +21951,37 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21929
21951
  };
21930
21952
  var titleStyle = {
21931
21953
  paddingLeft: "".concat(getPaddingLeft(), "px"),
21932
- paddingRight: mode !== 'inline' && level > 1 ? "".concat(_util__WEBPACK_IMPORTED_MODULE_7__["DEFAUTL_PADDING"], "px") : 0
21954
+ paddingRight: mode !== 'inline' && level > 1 ? "".concat(_util__WEBPACK_IMPORTED_MODULE_9__["DEFAUTL_PADDING"], "px") : 0
21933
21955
  };
21934
21956
 
21935
21957
  var renderTitle = function renderTitle() {
21936
21958
  if (!icon && collapsed && level === 1 && typeof children === 'string') {
21937
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("p", null, children.charAt(0));
21959
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("p", null, children.charAt(0));
21938
21960
  }
21939
21961
 
21940
21962
  return renderItemChildren(children);
21941
21963
  };
21942
21964
 
21943
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
21965
+ react__WEBPACK_IMPORTED_MODULE_5__["useEffect"](function () {
21966
+ if (selectedKey && selectedKey === keyValue) {
21967
+ setSelectedKeyPath(menuItemParentPath);
21968
+ }
21969
+ }, [selectedKey]);
21970
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
21944
21971
  ref: menuItemRef,
21945
- className: classnames__WEBPACK_IMPORTED_MODULE_6___default()(className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, prefixCls, subMenuMode !== 'horizontal'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),
21972
+ className: classnames__WEBPACK_IMPORTED_MODULE_8___default()(className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, prefixCls, subMenuMode !== 'horizontal'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),
21946
21973
  role: "menuitem",
21947
21974
  style: style,
21948
21975
  key: keyValue
21949
- }, mouseEvent), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("div", {
21950
- className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(prefixCls, "-title")),
21976
+ }, mouseEvent), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("div", {
21977
+ className: classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(prefixCls, "-title")),
21951
21978
  style: titleStyle
21952
- }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["cloneElement"](Object(_util__WEBPACK_IMPORTED_MODULE_7__["renderReactNodeFunction"])(icon), {
21953
- className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(prefixCls, "-icon"))
21979
+ }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["cloneElement"](Object(_util__WEBPACK_IMPORTED_MODULE_9__["renderReactNodeFunction"])(icon), {
21980
+ className: classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(prefixCls, "-icon"))
21954
21981
  }), renderTitle()));
21955
21982
  };
21956
21983
 
21957
- var MenuItem = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](InternalMenuItem);
21984
+ var MenuItem = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["forwardRef"](InternalMenuItem);
21958
21985
  MenuItem.displayName = 'MenuItem';
21959
21986
  /* harmony default export */ __webpack_exports__["default"] = (MenuItem);
21960
21987
 
@@ -22002,33 +22029,36 @@ __webpack_require__.r(__webpack_exports__);
22002
22029
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
22003
22030
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
22004
22031
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__);
22005
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
22006
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__);
22007
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
22008
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
22009
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");
22010
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
22011
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
22012
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__);
22013
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
22014
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_6__);
22015
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react */ "react");
22016
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
22017
- /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
22018
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
22019
- /* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
22020
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
22021
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_11__);
22022
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
22023
- /* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
22024
- /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
22025
- /* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
22026
- /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
22027
- /* harmony import */ var _menuItem__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./menuItem */ "./components/menu/menuItem.tsx");
22032
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
22033
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__);
22034
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
22035
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__);
22036
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
22037
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__);
22038
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
22039
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__);
22040
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");
22041
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__);
22042
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
22043
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_7__);
22044
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react */ "react");
22045
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_8__);
22046
+ /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
22047
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
22048
+ /* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
22049
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
22050
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_12__);
22051
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
22052
+ /* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
22053
+ /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
22054
+ /* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
22055
+ /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
22056
+ /* harmony import */ var _menuItem__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./menuItem */ "./components/menu/menuItem.tsx");
22057
+
22028
22058
 
22029
22059
 
22030
22060
 
22031
- var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"];
22061
+ var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "setSelectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"];
22032
22062
 
22033
22063
 
22034
22064
 
@@ -22048,13 +22078,13 @@ var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "chi
22048
22078
  var SubMenu = function SubMenu(props) {
22049
22079
  var _classNames2, _classNames3;
22050
22080
 
22051
- var _React$useContext = react__WEBPACK_IMPORTED_MODULE_7___default.a.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_8__["ConfigContext"]),
22081
+ var _React$useContext = react__WEBPACK_IMPORTED_MODULE_8___default.a.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_9__["ConfigContext"]),
22052
22082
  getPrefixCls = _React$useContext.getPrefixCls,
22053
22083
  pkgPrefixCls = _React$useContext.prefixCls,
22054
22084
  userDefaultProps = _React$useContext.compDefaultProps; // 属性需要合并一遍用户定义的默认属性
22055
22085
 
22056
22086
 
22057
- var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_9__["getCompProps"])('MenuSubMenu', userDefaultProps, props),
22087
+ var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_10__["getCompProps"])('MenuSubMenu', userDefaultProps, props),
22058
22088
  customPrefixcls = _getCompProps.prefixCls,
22059
22089
  theme = _getCompProps.theme,
22060
22090
  mode = _getCompProps.mode,
@@ -22065,6 +22095,8 @@ var SubMenu = function SubMenu(props) {
22065
22095
  collapsed = _getCompProps.collapsed,
22066
22096
  keyValue = _getCompProps.keyValue,
22067
22097
  selectedKey = _getCompProps.selectedKey,
22098
+ selectedKeyPath = _getCompProps.selectedKeyPath,
22099
+ setSelectedKeyPath = _getCompProps.setSelectedKeyPath,
22068
22100
  openKeys = _getCompProps.openKeys,
22069
22101
  triggerSubMenuAction = _getCompProps.triggerSubMenuAction,
22070
22102
  forceSubMenuRender = _getCompProps.forceSubMenuRender,
@@ -22074,7 +22106,7 @@ var SubMenu = function SubMenu(props) {
22074
22106
  handleOnOpenChange = _getCompProps.handleOnOpenChange,
22075
22107
  _getCompProps$padding = _getCompProps.paddingLeft,
22076
22108
  paddingLeft = _getCompProps$padding === void 0 ? 0 : _getCompProps$padding,
22077
- restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default()(_getCompProps, _excluded);
22109
+ restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default()(_getCompProps, _excluded);
22078
22110
 
22079
22111
  var isVertical = mode === 'vertical'; // 初始化level
22080
22112
 
@@ -22082,25 +22114,31 @@ var SubMenu = function SubMenu(props) {
22082
22114
  restProps.level = 1;
22083
22115
  }
22084
22116
 
22117
+ if (Array.isArray(restProps.parentPath)) {
22118
+ restProps.parentPath = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default()(restProps.parentPath), [keyValue]);
22119
+ } else {
22120
+ restProps.parentPath = [keyValue];
22121
+ }
22122
+
22085
22123
  if (mode === 'inline') {
22086
22124
  restProps.subMenuMode = 'vertical';
22087
22125
  restProps.popupOffset = [];
22088
22126
  }
22089
22127
 
22090
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_16__["default"])(!children, 'submenu', 'cannot found children in Menu.SubMenu'); // className前缀
22128
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_17__["default"])(!children, 'submenu', 'cannot found children in Menu.SubMenu'); // className前缀
22091
22129
 
22092
22130
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-submenu', customPrefixcls);
22093
- var subMenuRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22094
- var subMenuWrapperRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22095
- var subMenuVerticalRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22096
- var subMenuWrapperVerticalRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22131
+ var subMenuRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22132
+ var subMenuWrapperRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22133
+ var subMenuVerticalRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22134
+ var subMenuWrapperVerticalRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22097
22135
  var visible = Array.isArray(openKeys) && openKeys.includes(keyValue);
22098
- react__WEBPACK_IMPORTED_MODULE_7___default.a.useEffect(function () {
22136
+ react__WEBPACK_IMPORTED_MODULE_8___default.a.useEffect(function () {
22099
22137
  if (!visible || isVertical) return;
22100
22138
  var subMenuWrapperEle = subMenuWrapperRef.current;
22101
22139
  var subMenuEle = subMenuRef.current;
22102
22140
 
22103
- if (subMenuWrapperEle && Object(_util__WEBPACK_IMPORTED_MODULE_12__["isElementInViewport"])(subMenuEle)) {
22141
+ if (subMenuWrapperEle && Object(_util__WEBPACK_IMPORTED_MODULE_13__["isElementInViewport"])(subMenuEle)) {
22104
22142
  var position = subMenuWrapperEle.getBoundingClientRect();
22105
22143
  var windowHeight = document.body.offsetHeight;
22106
22144
 
@@ -22115,12 +22153,12 @@ var SubMenu = function SubMenu(props) {
22115
22153
  return 0;
22116
22154
  }
22117
22155
 
22118
- return _util__WEBPACK_IMPORTED_MODULE_12__["DEFAUTL_PADDING"];
22156
+ return _util__WEBPACK_IMPORTED_MODULE_13__["DEFAUTL_PADDING"];
22119
22157
  };
22120
22158
 
22121
22159
  var getPaddingLeft = function getPaddingLeft() {
22122
22160
  if (restProps.level > 1 && mode !== 'inline') {
22123
- return _util__WEBPACK_IMPORTED_MODULE_12__["DEFAUTL_PADDING"];
22161
+ return _util__WEBPACK_IMPORTED_MODULE_13__["DEFAUTL_PADDING"];
22124
22162
  }
22125
22163
 
22126
22164
  if (restProps.level === 1 && icon) {
@@ -22137,7 +22175,7 @@ var SubMenu = function SubMenu(props) {
22137
22175
 
22138
22176
  var curPaddingRight = getPaddingRight();
22139
22177
  var curPaddingLeft = getPaddingLeft();
22140
- var getCurrentStyle = react__WEBPACK_IMPORTED_MODULE_7___default.a.useCallback(function () {
22178
+ var getCurrentStyle = react__WEBPACK_IMPORTED_MODULE_8___default.a.useCallback(function () {
22141
22179
  // 内嵌模式height主要是用来动画的,必须要设置overflow溢出隐藏
22142
22180
  if (mode === 'inline') {
22143
22181
  var _subMenuWrapperRef$cu;
@@ -22193,18 +22231,15 @@ var SubMenu = function SubMenu(props) {
22193
22231
  }; // 点击区域外的地方关闭
22194
22232
 
22195
22233
 
22196
- Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_13__["useOnClickOutside"])([subMenuVerticalRef, subMenuWrapperVerticalRef], function (e) {
22234
+ Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_14__["useOnClickOutside"])([subMenuVerticalRef, subMenuWrapperVerticalRef], function (e) {
22197
22235
  var _e$target;
22198
22236
 
22199
22237
  var className = (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.className) || '';
22200
22238
 
22201
- if (!className.includes(_menuItem__WEBPACK_IMPORTED_MODULE_17__["MENU_ITEM_CONTAINER_NAME"])) {
22239
+ if (!className.includes(_menuItem__WEBPACK_IMPORTED_MODULE_18__["MENU_ITEM_CONTAINER_NAME"])) {
22202
22240
  closeSubMenu();
22203
22241
  }
22204
- }); // // 缩略模式自动关闭子菜单
22205
- // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
22206
- // closeSubMenu()
22207
- // }
22242
+ });
22208
22243
 
22209
22244
  var handleMouseEvent = function handleMouseEvent(status) {
22210
22245
  if (disabled || triggerSubMenuAction === 'click') return;
@@ -22220,9 +22255,6 @@ var SubMenu = function SubMenu(props) {
22220
22255
  };
22221
22256
 
22222
22257
  var handleOnClick = function handleOnClick(info) {
22223
- // 保存路径
22224
- info.keyPath = info.keyPath.concat([keyValue]);
22225
-
22226
22258
  if (triggerSubMenuAction === 'click' && isVertical) {
22227
22259
  closeSubMenu();
22228
22260
  }
@@ -22237,38 +22269,38 @@ var SubMenu = function SubMenu(props) {
22237
22269
  };
22238
22270
 
22239
22271
  var renderItemTitle = function renderItemTitle() {
22240
- if (!icon && collapsed && restProps.level === 1 && Object(_util__WEBPACK_IMPORTED_MODULE_12__["isString"])(title)) {
22241
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("p", null, title.charAt(0));
22272
+ if (!icon && collapsed && restProps.level === 1 && Object(_util__WEBPACK_IMPORTED_MODULE_13__["isString"])(title)) {
22273
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("p", null, title.charAt(0));
22242
22274
  }
22243
22275
 
22244
- if (Object(_util__WEBPACK_IMPORTED_MODULE_12__["isString"])(title)) {
22245
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("span", null, title);
22276
+ if (Object(_util__WEBPACK_IMPORTED_MODULE_13__["isString"])(title)) {
22277
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("span", null, title);
22246
22278
  }
22247
22279
 
22248
- return Object(_util__WEBPACK_IMPORTED_MODULE_12__["renderReactNodeFunction"])(title);
22280
+ return Object(_util__WEBPACK_IMPORTED_MODULE_13__["renderReactNodeFunction"])(title);
22249
22281
  };
22250
22282
 
22251
22283
  var renderItemArrow = function renderItemArrow() {
22252
22284
  if (mode !== 'inline' || collapsed) return null;
22253
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_14__["Icon"], {
22285
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_15__["Icon"], {
22254
22286
  type: "arrow-down",
22255
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-arrow"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(prefixCls, "-arrow-").concat(visible ? 'up' : 'down'), true))
22287
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-arrow"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(prefixCls, "-arrow-").concat(visible ? 'up' : 'down'), true))
22256
22288
  });
22257
22289
  };
22258
22290
 
22259
22291
  if (restProps.subMenuMode === 'horizontal' && restProps.level > 1 && children) {
22260
- var width = Object(_util__WEBPACK_IMPORTED_MODULE_12__["getItemWidth"])(children);
22261
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22262
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-thrid-item")),
22292
+ var width = Object(_util__WEBPACK_IMPORTED_MODULE_13__["getItemWidth"])(children);
22293
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22294
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-thrid-item")),
22263
22295
  style: {
22264
22296
  width: width
22265
22297
  }
22266
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22267
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-thrid-title"))
22268
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("span", null, title)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("ul", {
22269
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-thrid-list"), restProps.popupClassName)
22270
- }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_10__["toArray"])(children).map(function (item, i) {
22271
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(item, {
22298
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22299
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-thrid-title"))
22300
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("span", null, title)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("ul", {
22301
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-thrid-list"), restProps.popupClassName)
22302
+ }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_11__["toArray"])(children).map(function (item, i) {
22303
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(item, {
22272
22304
  level: restProps.level + 1,
22273
22305
  subMenuMode: restProps.subMenuMode,
22274
22306
  keyValue: item && item.key || i,
@@ -22294,20 +22326,20 @@ var SubMenu = function SubMenu(props) {
22294
22326
  paddingLeft: "".concat(curPaddingLeft, "px")
22295
22327
  }; // eslint-disable-next-line react-hooks/rules-of-hooks
22296
22328
 
22297
- var verticalView = Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_15__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("li", {
22298
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "light", theme === 'light'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-hover"), !disabled && visible), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(openKeys) && openKeys.includes(keyValue)), _classNames2)),
22329
+ var verticalView = Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_16__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("li", {
22330
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, className, (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "light", theme === 'light'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-hover"), !disabled && Array.isArray(openKeys) && openKeys.includes(keyValue)), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames2)),
22299
22331
  ref: subMenuVerticalRef,
22300
22332
  key: keyValue // style={Object.assign(style || {}, { display: mode === 'vertical' ? 'list-item' : 'none' })}
22301
22333
  ,
22302
22334
  onMouseLeave: handleOnMouseLeave,
22303
22335
  onMouseEnter: handleOnMouseEnter,
22304
22336
  onClick: handleOnClickSubMenu
22305
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22306
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-title")),
22337
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22338
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-title")),
22307
22339
  style: titleStyle
22308
- }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_12__["renderReactNodeFunction"])(icon), {
22309
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-icon"))
22310
- }), renderItemTitle(), renderItemArrow())), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22340
+ }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_13__["renderReactNodeFunction"])(icon), {
22341
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-icon"))
22342
+ }), renderItemTitle(), renderItemArrow())), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22311
22343
  ref: subMenuWrapperVerticalRef,
22312
22344
  onMouseLeave: function onMouseLeave() {
22313
22345
  handleOnMouseLeave();
@@ -22315,11 +22347,11 @@ var SubMenu = function SubMenu(props) {
22315
22347
  onMouseEnter: function onMouseEnter() {
22316
22348
  handleOnMouseEnter();
22317
22349
  }
22318
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("ul", {
22319
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-sub"), restProps.popupClassName, (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-second"), restProps.level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-third"), restProps.level === 2), _classNames3))
22320
- }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_10__["toArray"])(children).map(function (item, index) {
22350
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("ul", {
22351
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-sub"), restProps.popupClassName, (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-second"), restProps.level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-third"), restProps.level === 2), _classNames3))
22352
+ }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_11__["toArray"])(children).map(function (item, index) {
22321
22353
  var key = item.key || index;
22322
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(item, {
22354
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(item, {
22323
22355
  key: key,
22324
22356
  level: restProps.level + 1,
22325
22357
  keyValue: key,
@@ -22327,19 +22359,21 @@ var SubMenu = function SubMenu(props) {
22327
22359
  mode: mode,
22328
22360
  theme: theme,
22329
22361
  selectedKey: selectedKey,
22362
+ setSelectedKeyPath: setSelectedKeyPath,
22330
22363
  openKeys: openKeys,
22331
22364
  forceSubMenuRender: forceSubMenuRender,
22332
22365
  triggerSubMenuAction: triggerSubMenuAction,
22333
22366
  handleOnOpenChange: handleOnOpenChange,
22334
22367
  handleOnClick: handleOnClick,
22335
22368
  inlineIndent: inlineIndent,
22336
- paddingLeft: curPaddingLeft
22369
+ paddingLeft: curPaddingLeft,
22370
+ parentPath: restProps.parentPath
22337
22371
  });
22338
22372
  }))), {
22339
22373
  arrow: false,
22340
22374
  placement: 'rightTop',
22341
22375
  gap: 0,
22342
- visible: isVertical ? visible : false,
22376
+ visible: isVertical && !disabled ? visible : false,
22343
22377
  disabled: isVertical ? undefined : true,
22344
22378
  prefixCls: 'kd-menu-popper',
22345
22379
  popperClassName: theme === 'light' ? 'light' : ''
@@ -22350,38 +22384,40 @@ var SubMenu = function SubMenu(props) {
22350
22384
  } else {
22351
22385
  var _classNames4;
22352
22386
 
22353
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
22387
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
22354
22388
  ref: subMenuRef,
22355
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _classNames4)),
22389
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, className, (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames4)),
22356
22390
  key: keyValue
22357
22391
  }, mouseEvent, {
22358
22392
  style: style
22359
- }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22360
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-title")),
22393
+ }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22394
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-title")),
22361
22395
  style: titleStyle
22362
- }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_12__["renderReactNodeFunction"])(icon), {
22363
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-icon"))
22364
- }), renderItemTitle(), renderItemArrow()), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22396
+ }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_13__["renderReactNodeFunction"])(icon), {
22397
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-icon"))
22398
+ }), renderItemTitle(), renderItemArrow()), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22365
22399
  style: getCurrentStyle(),
22366
22400
  ref: subMenuWrapperRef
22367
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("ul", {
22368
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-sub"), restProps.popupClassName)
22369
- }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_10__["toArray"])(children).map(function (item, index) {
22401
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("ul", {
22402
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-sub"), restProps.popupClassName)
22403
+ }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_11__["toArray"])(children).map(function (item, index) {
22370
22404
  var key = item.key || index;
22371
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(item, {
22405
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(item, {
22372
22406
  key: key,
22373
22407
  level: restProps.level + 1,
22374
22408
  keyValue: key,
22375
22409
  collapsed: collapsed,
22376
22410
  mode: mode,
22377
22411
  selectedKey: selectedKey,
22412
+ setSelectedKeyPath: setSelectedKeyPath,
22378
22413
  openKeys: openKeys,
22379
22414
  forceSubMenuRender: forceSubMenuRender,
22380
22415
  triggerSubMenuAction: triggerSubMenuAction,
22381
22416
  handleOnOpenChange: handleOnOpenChange,
22382
22417
  handleOnClick: handleOnClick,
22383
22418
  inlineIndent: inlineIndent,
22384
- paddingLeft: curPaddingLeft
22419
+ paddingLeft: curPaddingLeft,
22420
+ parentPath: restProps.parentPath
22385
22421
  });
22386
22422
  }))));
22387
22423
  }
@@ -27615,7 +27651,9 @@ var InternalSelect = function InternalSelect(props, ref) {
27615
27651
  placeholder = selectProps.placeholder,
27616
27652
  dropdownStyle = selectProps.dropdownStyle,
27617
27653
  style = selectProps.style,
27618
- clearIcon = selectProps.clearIcon;
27654
+ clearIcon = selectProps.clearIcon,
27655
+ _selectProps$popperSt = selectProps.popperStyle,
27656
+ popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt;
27619
27657
  var isMultiple = mode === 'multiple'; // 是否多选
27620
27658
 
27621
27659
  var _useMergedState = Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_19__["useMergedState"])(undefined, {
@@ -27676,7 +27714,7 @@ var InternalSelect = function InternalSelect(props, ref) {
27676
27714
 
27677
27715
  var searchCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-search"), true)); // 下拉子项列表样式
27678
27716
 
27679
- var dropContentCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-scroll"), isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10)); // 多选底部样式
27717
+ var dropContentCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-dropdown-scroll"), (isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10) || selectProps.dropdownRender)); // 多选底部样式
27680
27718
 
27681
27719
  var multipleFooterCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选,单选公共样式
27682
27720
 
@@ -28222,10 +28260,10 @@ var InternalSelect = function InternalSelect(props, ref) {
28222
28260
  var _selectRef$current$ge = (_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.getBoundingClientRect(),
28223
28261
  width = _selectRef$current$ge.width;
28224
28262
 
28225
- return {
28263
+ return _objectSpread({
28226
28264
  width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),
28227
28265
  zIndex: 1050
28228
- };
28266
+ }, popperStyle);
28229
28267
  }
28230
28268
  };
28231
28269
 
@@ -31288,6 +31326,8 @@ function Table(props) {
31288
31326
  });
31289
31327
 
31290
31328
  if (footerDataSource) {
31329
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
31330
+ // @ts-ignore
31291
31331
  pipeline.footerDataSource(footerDataSource);
31292
31332
  }
31293
31333
  /* -------------------------------------------------------------------------- */
@@ -34131,8 +34171,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34131
34171
  setTreeNodeClassName = _TreeProps$setTreeNod2 === void 0 ? function () {
34132
34172
  return '';
34133
34173
  } : _TreeProps$setTreeNod2,
34134
- _TreeProps$estimatedI = TreeProps.estimatedItemSize,
34135
- innerEstimatedItemSize = _TreeProps$estimatedI === void 0 ? 28 : _TreeProps$estimatedI,
34174
+ innerEstimatedItemSize = TreeProps.estimatedItemSize,
34136
34175
  style = TreeProps.style;
34137
34176
  var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
34138
34177
 
@@ -34913,7 +34952,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34913
34952
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
34914
34953
  className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-item"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-opened"), expandState), "".concat(treeNodePrefixCls, "-item-").concat(nodeKey), className),
34915
34954
  style: _objectSpread({
34916
- height: "".concat(estimatedItemSize)
34955
+ height: "".concat(estimatedItemSize, "px")
34917
34956
  }, style),
34918
34957
  onClick: handleClick
34919
34958
  }, renderNode());