@kdcloudjs/kdesign 1.3.9 → 1.4.0

package/es/menu/menu.js

@@ -63,7 +63,7 @@ var Menu = function Menu(props) {
       restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed"]);
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
-  devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'")); // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
+  devWarning(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
 
   var _React$useState = React.useState(''),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -102,7 +102,6 @@ var Menu = function Menu(props) {
   }, [userOpenKeys]);
   useEffect(function () {
     if (userSelectedKey !== undefined && userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
-      setSelectedKeyPath(userOpenKeys);
       setTimeout(function () {
         userOpenKeys.forEach(function (d) {
           openSubMenuSet.add(d);
@@ -116,8 +115,6 @@ var Menu = function Menu(props) {
       setSelectedKey(info.key);
     }
 
-    setSelectedKeyPath(info.keyPath);
-
     if (mode !== 'inline' && openKeys.length > 0) {
       setOpenKeys([]);
       openSubMenuSet.clear();
@@ -173,6 +170,7 @@ var Menu = function Menu(props) {
         openKeys: openKeys,
         selectedKey: selectedKey,
         selectedKeyPath: selectedKeyPath,
+        setSelectedKeyPath: setSelectedKeyPath,
         theme: theme,
         triggerSubMenuAction: restProps.triggerSubMenuAction,
         forceSubMenuRender: forceSubMenuRender,

package/es/menu/menuItem.js

@@ -1,6 +1,8 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
@@ -24,7 +26,7 @@ import devWarning from '../_utils/devwarning';
 export var MENU_ITEM_CONTAINER_NAME = 'menu-item-content-container';
 
 var InternalMenuItem = function InternalMenuItem(props, ref) {
-  var _classNames;
+  var _context, _classNames;
 
   var _React$useContext = React.useContext(ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
@@ -43,6 +45,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
       collapsed = _a.collapsed,
       keyValue = _a.keyValue,
       selectedKey = _a.selectedKey,
+      setSelectedKeyPath = _a.setSelectedKeyPath,
       subMenuMode = _a.subMenuMode,
       inlineIndent = _a.inlineIndent,
       className = _a.className,
@@ -50,11 +53,13 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
       _a$paddingLeft = _a.paddingLeft,
       paddingLeft = _a$paddingLeft === void 0 ? 0 : _a$paddingLeft,
       style = _a.style,
-      restProps = __rest(_a, ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style"]);
+      parentPath = _a.parentPath,
+      restProps = __rest(_a, ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "setSelectedKeyPath", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style", "parentPath"]);
 
   devWarning(!keyValue && keyValue !== 0, 'menuitem', 'cannot found children in Menu.Item');
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-item', customPrefixcls);
   var menuItemRef = ref || /*#__PURE__*/React.createRef();
+  var menuItemParentPath = Array.isArray(parentPath) ? _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(parentPath), [keyValue]) : [keyValue];
 
   var renderItemChildren = function renderItemChildren(children) {
     if (typeof children === 'string') {
@@ -87,7 +92,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
     e.stopPropagation();
     var info = {
       key: keyValue,
-      keyPath: [keyValue],
+      keyPath: menuItemParentPath,
       domEvent: e.nativeEvent
     };
     handleOnClick(info);
@@ -131,6 +136,11 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
     return renderItemChildren(children);
   };
 
+  React.useEffect(function () {
+    if (selectedKey && selectedKey === keyValue) {
+      setSelectedKeyPath(menuItemParentPath);
+    }
+  }, [selectedKey]);
   return /*#__PURE__*/React.createElement("li", _extends({
     ref: menuItemRef,
     className: classNames(className, (_classNames = {}, _defineProperty(_classNames, prefixCls, subMenuMode !== 'horizontal'), _defineProperty(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), _defineProperty(_classNames, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),

package/es/menu/style/index.css

@@ -104,65 +104,65 @@
 /* 多行显示省略号 */
 /* 单行显示省略号 */
 /** 浮层箭头样式 **/
-.hover {
+.menu-dark-hover {
   background-color: var(--kd-c-menu-sub-color-background, #121319);
   color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
 }
-.active {
+.menu-dark-active {
   background-color: var(--kd-c-menu-sub-color-background, #121319);
   color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
 }
-.active-inline-title {
-  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff)) !important;
-  background: var(--kd-c-menu-color-background, #343848) !important;
+.menu-dark-active-inline-title {
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+  background: var(--kd-c-menu-color-background, #343848);
   border: none;
 }
-.light {
+.menu-light-base {
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #ffffff;
 }
-.light .kd-menu-item-disabled,
-.light .kd-menu-submenu-disabled {
-  background-color: #fff !important;
+.menu-light-base .kd-menu-item-disabled,
+.menu-light-base .kd-menu-submenu-disabled {
+  background-color: #fff;
 }
-.light .kd-menu-submenu-sub {
+.menu-light-base .kd-menu-submenu-sub {
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
-  background: #FAFAFA;
+  background: #fafafa;
 }
-.light .kd-menu-item:hover {
+.menu-light-base .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
   border: none;
 }
-.light .kd-menu-item-hover,
-.light .kd-menu-submenu-hover {
+.menu-light-base .kd-menu-item-hover,
+.menu-light-base .kd-menu-submenu-hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
   border: none;
 }
-.light .kd-menu-item-active,
-.light .kd-menu-submenu-active {
-  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
-  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
+.menu-light-base .kd-menu-item-active,
+.menu-light-base .kd-menu-submenu-active {
+  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
   border: none;
 }
-.light-default {
+.menu-light-default {
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
   background: #ffffff;
 }
-.light-hover {
+.menu-light-hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
   border: none;
 }
-.light-active {
-  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
-  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
+.menu-light-active {
+  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
   border: none;
 }
-.light-active-inline-title {
-  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
-  background: #ffffff !important;
+.menu-light-active-inline-title {
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
+  background: #ffffff;
   border: none;
 }
 .kd-menu {
@@ -236,8 +236,8 @@
 }
 .kd-menu-item-disabled {
   cursor: not-allowed;
-  color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2)) !important;
-  background-color: var(--kd-c-menu-color-background, #343848) !important;
+  color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  background-color: var(--kd-c-menu-color-background, #343848);
 }
 .kd-menu-item-arrow {
   margin-left: auto;
@@ -310,8 +310,8 @@
 }
 .kd-menu-submenu-disabled {
   cursor: not-allowed;
-  color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2)) !important;
-  background-color: var(--kd-c-menu-color-background, #343848) !important;
+  color: var(--kd-c-menu-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  background-color: var(--kd-c-menu-color-background, #343848);
 }
 .kd-menu-submenu-arrow {
   margin-left: auto;
@@ -436,7 +436,7 @@
 .kd-menu-dark .kd-menu-submenu-sub-third {
   background: var(--kd-c-menu-sub-color-background, #121319);
 }
-.kd-menu-dark .kd-menu-item:hover {
+.kd-menu-dark .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-sub-color-background, #121319);
   color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
 }
@@ -456,13 +456,13 @@
 }
 .kd-menu-inline.kd-menu-dark .kd-menu-item-active .kd-menu-submenu-title,
 .kd-menu-inline.kd-menu-dark .kd-menu-submenu-active .kd-menu-submenu-title {
-  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff)) !important;
-  background: var(--kd-c-menu-color-background, #343848) !important;
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+  background: var(--kd-c-menu-color-background, #343848);
   border: none;
 }
-.kd-menu-inline.kd-menu-dark .kd-menu-submenu:not(.kd-menu-submenu-disabled) > .kd-menu-submenu-title:hover {
-  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff)) !important;
-  background: var(--kd-c-menu-color-background, #343848) !important;
+.kd-menu-inline.kd-menu-dark .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active) > .kd-menu-submenu-title:hover {
+  color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
+  background: var(--kd-c-menu-color-background, #343848);
   border: none;
 }
 .kd-menu-light {
@@ -471,13 +471,13 @@
 }
 .kd-menu-light .kd-menu-item-disabled,
 .kd-menu-light .kd-menu-submenu-disabled {
-  background-color: #fff !important;
+  background-color: #fff;
 }
 .kd-menu-light .kd-menu-submenu-sub {
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
-  background: #FAFAFA;
+  background: #fafafa;
 }
-.kd-menu-light .kd-menu-item:hover {
+.kd-menu-light .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
   border: none;
@@ -490,17 +490,17 @@
 }
 .kd-menu-light .kd-menu-item-active,
 .kd-menu-light .kd-menu-submenu-active {
-  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
-  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
+  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
   border: none;
 }
 .kd-menu-inline.kd-menu-light .kd-menu-item-active .kd-menu-submenu-title,
 .kd-menu-inline.kd-menu-light .kd-menu-submenu-active .kd-menu-submenu-title {
-  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
-  background: #ffffff !important;
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
+  background: #ffffff;
   border: none;
 }
-.kd-menu-popper .kd-menu-submenu:hover,
+.kd-menu-popper .kd-menu-submenu:not(.kd-menu-submenu-disabled):not(.kd-menu-submenu-active):hover,
 .kd-menu-popper .kd-menu-submenu-hover {
   background-color: var(--kd-c-menu-sub-color-background, #121319);
   color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
@@ -527,7 +527,7 @@
   -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
           box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
 }
-.kd-menu-popper .kd-menu-submenu-sub .kd-menu-item:hover,
+.kd-menu-popper .kd-menu-submenu-sub .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover,
 .kd-menu-popper .kd-menu-submenu-sub .kd-menu-item-active {
   background-color: var(--kd-c-menu-sub-color-background, #121319);
   color: var(--kd-c-menu-sub-color-text-hover, var(--kd-g-color-white, #fff));
@@ -563,13 +563,13 @@
 }
 .kd-menu-popper.light .kd-menu-item-disabled,
 .kd-menu-popper.light .kd-menu-submenu-disabled {
-  background-color: #fff !important;
+  background-color: #fff;
 }
 .kd-menu-popper.light .kd-menu-submenu-sub {
   color: var(--kd-c-menu-light-color-text, var(--kd-g-color-text-primary, #212121));
-  background: #FAFAFA;
+  background: #fafafa;
 }
-.kd-menu-popper.light .kd-menu-item:hover {
+.kd-menu-popper.light .kd-menu-item:not(.kd-menu-item-disabled):not(.kd-menu-item-active):hover {
   background-color: var(--kd-c-menu-light-color-background-hover, #f5f5f5);
   color: var(--kd-c-menu-light-color-text-hover, var(--kd-g-color-text-primary, #212121));
   border: none;
@@ -582,7 +582,7 @@
 }
 .kd-menu-popper.light .kd-menu-item-active,
 .kd-menu-popper.light .kd-menu-submenu-active {
-  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff) !important;
-  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3)) !important;
+  background-color: var(--kd-c-menu-light-color-background-active, #e3ebff);
+  color: var(--kd-c-menu-light-color-text-active, var(--kd-g-color-theme, #5582f3));
   border: none;
 }

package/es/menu/style/index.less

@@ -135,55 +135,55 @@
   }
 
   .@{menuitem-prefix-cls} {
-    &:hover {
-      .hover();
+    &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
+      .menu-dark-hover();
     }
 
     &-active {
-      .active()
+      .menu-dark-active()
     }
   }
 
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
-    .active()
+    .menu-dark-active()
   }
 
   .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
-    .hover()
+    .menu-dark-hover()
   }
 }
 
 .@{menu-inline-prefix-cls}.@{menu-dark-prefix-cls} {
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
     .@{submenu-prefix-cls}-title {
-      .active-inline-title()
+      .menu-dark-active-inline-title()
     }
   }
 
-  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled) {
+  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active) {
     > .@{submenu-prefix-cls}-title:hover {
-      .active-inline-title()
+      .menu-dark-active-inline-title()
     }
   }
 }
 
 // light
 .@{menu-light-prefix-cls} {
-  .light();
+  .menu-light-base();
 }
 
 .@{menu-inline-prefix-cls}.@{menu-light-prefix-cls} {
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
     .@{submenu-prefix-cls}-title {
-      .light-active-inline-title()
+      .menu-light-active-inline-title()
     }
   }
 }
 
 .@{menu-popper-prefix-cls} {
-  .@{submenu-prefix-cls}:hover,
+  .@{submenu-prefix-cls}:not(.@{submenu-prefix-cls}-disabled):not(.@{submenu-prefix-cls}-active):hover,
   .@{submenu-prefix-cls}-hover {
-    .hover();
+    .menu-dark-hover();
   }
 
   &.hidden {
@@ -206,9 +206,9 @@
       0 9px 28px 8px rgba(0, 0, 0, 0.05);
 
       .@{menuitem-prefix-cls} {
-        &:hover,
+        &:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover,
         &-active {
-          .hover()
+          .menu-dark-hover()
         }
       }
 
@@ -234,7 +234,7 @@
   }
 
   &.light {
-    .light();
+    .menu-light-base();
   }
 }
 

package/es/menu/style/mixin.less

@@ -24,6 +24,7 @@
     align-items: center;
     height: 50px;
     .ellipsis();
+
     & > span {
       .ellipsis();
       opacity: 1;
@@ -57,8 +58,8 @@
 
   &-disabled {
     cursor: not-allowed;
-    color: @menu-color-disabled !important;
-    background-color: @menu-color-background !important;
+    color: @menu-color-disabled;
+    background-color: @menu-color-background;
   }
 
   &-arrow {
@@ -78,68 +79,67 @@
 }
 
 
-.hover {
+.menu-dark-hover {
   background-color: @menu-sub-color-background;
   color: @menu-sub-color-hover;
 }
 
-.active {
+.menu-dark-active {
   background-color: @menu-sub-color-background;
   color: @menu-sub-color-hover;
 }
 
-.active-inline-title {
-  color: @menu-sub-color-hover !important;
-  background: @menu-color-background !important;
+.menu-dark-active-inline-title {
+  color: @menu-sub-color-hover;
+  background: @menu-color-background;
   border: none;
 }
 
-
-.light {
-  .light-default();
+.menu-light-base {
+  .menu-light-default();
 
   .@{menuitem-prefix-cls}-disabled, .@{submenu-prefix-cls}-disabled {
-    background-color: #fff !important;
+    background-color: #fff;
   }
 
   .@{submenu-prefix-cls}-sub {
     color: @menu-light-color;
-    background: #FAFAFA;
+    background: #fafafa;
   }
 
-  .@{menuitem-prefix-cls}:hover {
-    .light-hover();
+  .@{menuitem-prefix-cls}:not(.@{menuitem-prefix-cls}-disabled):not(.@{menuitem-prefix-cls}-active):hover {
+    .menu-light-hover();
   }
 
   .@{menuitem-prefix-cls}-hover, .@{submenu-prefix-cls}-hover {
-    .light-hover();
+    .menu-light-hover();
   }
 
   .@{menuitem-prefix-cls}-active, .@{submenu-prefix-cls}-active {
-    .light-active();
+    .menu-light-active();
   }
 }
 
-.light-default {
+.menu-light-default {
   color: @menu-light-color;
   background: #ffffff;
 }
 
-.light-hover {
+.menu-light-hover {
   background-color: @menu-light-color-background-hover;
   color: @menu-light-color-hover;
   border: none;
 }
 
-.light-active {
-  background-color: @menu-light-color-background-active !important;
-  color: @menu-light-color-active !important;
+.menu-light-active {
+  background-color: @menu-light-color-background-active;
+  color: @menu-light-color-active;
   border: none;
 }
 
-.light-active-inline-title {
-  color: @menu-light-color-active !important;
-  background: #ffffff !important;
+.menu-light-active-inline-title {
+  color: @menu-light-color-active;
+  background: #ffffff;
   border: none;
 }
 

package/es/menu/subMenu.js

@@ -1,8 +1,9 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 
 var __rest = this && this.__rest || function (s, e) {
@@ -51,6 +52,7 @@ var SubMenu = function SubMenu(props) {
       keyValue = _a.keyValue,
       selectedKey = _a.selectedKey,
       selectedKeyPath = _a.selectedKeyPath,
+      setSelectedKeyPath = _a.setSelectedKeyPath,
       openKeys = _a.openKeys,
       triggerSubMenuAction = _a.triggerSubMenuAction,
       forceSubMenuRender = _a.forceSubMenuRender,
@@ -60,7 +62,7 @@ var SubMenu = function SubMenu(props) {
       handleOnOpenChange = _a.handleOnOpenChange,
       _a$paddingLeft = _a.paddingLeft,
       paddingLeft = _a$paddingLeft === void 0 ? 0 : _a$paddingLeft,
-      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
+      restProps = __rest(_a, ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "setSelectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"]);
 
   var isVertical = mode === 'vertical'; // 初始化level
 
@@ -68,6 +70,14 @@ var SubMenu = function SubMenu(props) {
     restProps.level = 1;
   }
 
+  if (Array.isArray(restProps.parentPath)) {
+    var _context;
+
+    restProps.parentPath = _concatInstanceProperty(_context = []).call(_context, _toConsumableArray(restProps.parentPath), [keyValue]);
+  } else {
+    restProps.parentPath = [keyValue];
+  }
+
   if (mode === 'inline') {
     restProps.subMenuMode = 'vertical';
     restProps.popupOffset = [];
@@ -189,10 +199,7 @@ var SubMenu = function SubMenu(props) {
     if (!_includesInstanceProperty(className).call(className, MENU_ITEM_CONTAINER_NAME)) {
       closeSubMenu();
     }
-  }); // // 缩略模式自动关闭子菜单
-  // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
-  //   closeSubMenu()
-  // }
+  });
 
   var handleMouseEvent = function handleMouseEvent(status) {
     if (disabled || triggerSubMenuAction === 'click') return;
@@ -208,11 +215,6 @@ var SubMenu = function SubMenu(props) {
   };
 
   var handleOnClick = function handleOnClick(info) {
-    var _context;
-
-    // 保存路径
-    info.keyPath = _concatInstanceProperty(_context = info.keyPath).call(_context, [keyValue]);
-
     if (triggerSubMenuAction === 'click' && isVertical) {
       closeSubMenu();
     }
@@ -321,13 +323,15 @@ var SubMenu = function SubMenu(props) {
       mode: mode,
       theme: theme,
       selectedKey: selectedKey,
+      setSelectedKeyPath: setSelectedKeyPath,
       openKeys: openKeys,
       forceSubMenuRender: forceSubMenuRender,
       triggerSubMenuAction: triggerSubMenuAction,
       handleOnOpenChange: handleOnOpenChange,
       handleOnClick: handleOnClick,
       inlineIndent: inlineIndent,
-      paddingLeft: curPaddingLeft
+      paddingLeft: curPaddingLeft,
+      parentPath: restProps.parentPath
     });
   }))), {
     arrow: false,
@@ -369,13 +373,15 @@ var SubMenu = function SubMenu(props) {
         collapsed: collapsed,
         mode: mode,
         selectedKey: selectedKey,
+        setSelectedKeyPath: setSelectedKeyPath,
         openKeys: openKeys,
         forceSubMenuRender: forceSubMenuRender,
         triggerSubMenuAction: triggerSubMenuAction,
         handleOnOpenChange: handleOnOpenChange,
         handleOnClick: handleOnClick,
         inlineIndent: inlineIndent,
-        paddingLeft: curPaddingLeft
+        paddingLeft: curPaddingLeft,
+        parentPath: restProps.parentPath
       });
     }))));
   }

package/lib/menu/menu.js

@@ -96,7 +96,7 @@ var Menu = function Menu(props) {
       restProps = __rest(_b, ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed"]);
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
-  (0, _devwarning.default)(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'")); // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
+  (0, _devwarning.default)(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
 
   var _React$useState = _react.default.useState(''),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
@@ -135,7 +135,6 @@ var Menu = function Menu(props) {
   }, [userOpenKeys]);
   (0, _react.useEffect)(function () {
     if (userSelectedKey !== undefined && userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
-      setSelectedKeyPath(userOpenKeys);
       setTimeout(function () {
         userOpenKeys.forEach(function (d) {
           openSubMenuSet.add(d);
@@ -149,8 +148,6 @@ var Menu = function Menu(props) {
       setSelectedKey(info.key);
     }
 
-    setSelectedKeyPath(info.keyPath);
-
     if (mode !== 'inline' && openKeys.length > 0) {
       setOpenKeys([]);
       openSubMenuSet.clear();
@@ -206,6 +203,7 @@ var Menu = function Menu(props) {
         openKeys: openKeys,
         selectedKey: selectedKey,
         selectedKeyPath: selectedKeyPath,
+        setSelectedKeyPath: setSelectedKeyPath,
         theme: theme,
         triggerSubMenuAction: restProps.triggerSubMenuAction,
         forceSubMenuRender: forceSubMenuRender,