@qsxy/element-plus-react 1.0.0-next.22 → 1.0.0-next.23

package/dist/Menu/Menu.js

@@ -1,14 +1,14 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _templateObject, _templateObject2;
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -19,7 +19,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
 import { addClass, removeClass } from 'dom-lib';
 import { pick } from 'lodash';
-import React, { Children, forwardRef, useCallback, useImperativeHandle, useRef } from 'react';
+import React, { Children, forwardRef, useCallback, useImperativeHandle, useRef, useState } from 'react';
 import { More } from "../Icon/IconList/More";
 import { mergeDefaultProps } from "../Util";
 import { useClassNames, useControlled } from "../hooks";
@@ -32,10 +32,10 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
   var _props$style;
   props = mergeDefaultProps({
     mode: 'vertical',
-    showTimeout: 300,
+    showTimeout: 150,
     hideTimeout: 300,
     uniqueOpened: false,
-    collapseTransition: false,
+    collapseTransition: true,
     defaultOpeneds: [],
     ellipsis: false,
     router: false
@@ -52,6 +52,7 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
     defaultOpeneds = _props.defaultOpeneds,
     collapseTransition = _props.collapseTransition,
     onSelect = _props.onSelect,
+    onOpen = _props.onOpen,
     onClose = _props.onClose,
     menuTrigger = _props.menuTrigger,
     popperOffset = _props.popperOffset,
@@ -64,12 +65,16 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     active = _useControlled2[0],
     setActive = _useControlled2[1];
-  // const [subMenu, setSubMenu] = useState<SubMenuProvider[]>([]);
+  var _useState = useState(collapse),
+    _useState2 = _slicedToArray(_useState, 2),
+    _collapse = _useState2[0],
+    setCollapse = _useState2[1];
   // const [, setItems] = useState<MenuItemRegistered[]>([]);
 
   var menuRef = useRef(null);
   var menuItemsRef = useRef([]);
   var subMenuRef = useRef([]);
+  var openedMenus = useRef({});
   useCssTransiton({
     nodeRef: menuRef,
     visible: collapse,
@@ -82,34 +87,70 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
     onEnter: onEnter,
     afterEnter: afterEnter,
     done: function done() {
+      setCollapse(collapse);
       if (collapse) {
-        subMenuRef.current.forEach(function (sub) {
-          sub.closeMenu(sub.index, sub.indexPath);
-        });
         addClass(menuRef.current, m(_templateObject || (_templateObject = _taggedTemplateLiteral(["collapse"]))));
       } else {
         removeClass(menuRef.current, m(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["collapse"]))));
+        subMenuRef.current.forEach(function (sub) {
+          sub.closeMenu(sub.index, sub.indexPath);
+        });
+        for (var key in openedMenus.current) {
+          if (Object.prototype.hasOwnProperty.call(openedMenus.current, key)) {
+            var item = openedMenus.current[key];
+            item.openMenu(item.index, item.indexPath);
+          }
+        }
       }
     }
   });
   var _useEllipsis = useEllipsis(menuRef, props),
     sliceIndex = _useEllipsis.sliceIndex;
-  var onOpen = useCallback(function (index, indexPath, item) {
-    var _props$onOpen, _props2;
+  var addItem = useCallback(function (menu) {
+    openedMenus.current = _objectSpread(_objectSpread({}, openedMenus.current), {}, _defineProperty({}, menu.index, menu));
+  }, []);
+  var removeItem = useCallback(function (menu) {
+    delete openedMenus.current[menu.index];
+  }, []);
+  var handleOpenMenu = useCallback(function (index, indexPath, item) {
     if (mode === 'vertical') {
-      subMenuRef.current.forEach(function (sub) {
-        if (sub.index === index) {
-          sub.openMenu(index, indexPath);
-        }
+      // 折叠模式下，index为子菜单，只能向上逐层打开父菜单
+      if (collapse) {
         if (uniqueOpened) {
-          if (sub.index !== index && !indexPath.includes(sub.index)) {
+          subMenuRef.current.forEach(function (sub) {
             sub.closeMenu(index, indexPath);
-          }
+            removeItem(sub);
+          });
         }
-      });
+        indexPath.reduce(function (prev, e) {
+          subMenuRef.current.forEach(function (sub) {
+            if (sub.index === e) {
+              sub.openMenu(e, [].concat(_toConsumableArray(prev), [e]));
+              addItem(sub);
+            }
+          });
+          return [].concat(_toConsumableArray(prev), [e]);
+        }, []);
+      } else {
+        // 正常模式，index为父菜单的index
+        subMenuRef.current.forEach(function (sub) {
+          if (sub.index === index) {
+            sub.openMenu(index, indexPath);
+            addItem(sub);
+          }
+          if (uniqueOpened) {
+            if (sub.index !== index && !indexPath.includes(sub.index)) {
+              sub.closeMenu(index, indexPath);
+              removeItem(sub);
+            }
+          }
+        });
+      }
     }
-    (_props$onOpen = (_props2 = props).onOpen) === null || _props$onOpen === void 0 || _props$onOpen.call(_props2, index, indexPath, item);
-  }, [mode, props, uniqueOpened]);
+    onOpen === null || onOpen === void 0 || onOpen(index, indexPath, item);
+  }, [addItem, collapse, mode, onOpen, removeItem, uniqueOpened]);
+
+  /** 激活菜单项 */
   var activeMenus = useCallback(function () {
     if (defaultActive) {
       var menu = menuItemsRef.current.find(function (item) {
@@ -118,7 +159,7 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
       if (menu && menu.indexPath.length > 1) {
         setActive(menu.indexPath);
         menu.indexPath.reduce(function (prev, item) {
-          onOpen(item, [].concat(_toConsumableArray(prev), [item]), {
+          handleOpenMenu(item, [].concat(_toConsumableArray(prev), [item]), {
             index: item,
             indexPath: [].concat(_toConsumableArray(prev), [item])
           });
@@ -133,11 +174,14 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
         });
         if (sub) {
           sub.openMenu(sub.index, sub.indexPath);
+          addItem(sub);
         }
       });
     }
-  }, [defaultActive, defaultOpeneds, onOpen, setActive]);
-  var addItems = useCallback(function (menu) {
+  }, [addItem, defaultActive, defaultOpeneds, handleOpenMenu, setActive]);
+
+  /** 添加子菜单 */
+  var addMenuItem = useCallback(function (menu) {
     var prev = menuItemsRef.current;
     if (!prev.some(function (item) {
       return item.index === menu.index;
@@ -151,6 +195,8 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
       menuItemsRef.current = prev.splice(idx, 1, menu);
     }
   }, [activeMenus]);
+
+  /** 添加父菜单 */
   var addSubMenu = useCallback(function (sub) {
     var prev = subMenuRef.current;
     if (!prev.some(function (item) {
@@ -160,6 +206,8 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
       activeMenus();
     }
   }, [activeMenus]);
+
+  /** 展开菜单 */
   var open = useCallback(function (index) {
     var menu = subMenuRef.current.find(function (item) {
       return item.index === index;
@@ -167,27 +215,25 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
     if (menu && menu.indexPath.length > 1) {
       // setActive(menu.indexPath);
       menu.indexPath.reduce(function (prev, item) {
-        onOpen(item, [].concat(_toConsumableArray(prev), [item]), {
+        handleOpenMenu(item, [].concat(_toConsumableArray(prev), [item]), {
           index: item,
           indexPath: [].concat(_toConsumableArray(prev), [item])
         });
         return [].concat(_toConsumableArray(prev), [item]);
       }, []);
     }
+  }, [handleOpenMenu]);
 
-    // const sub = subMenuRef.current.find(item => item.index === index);
-    // if (sub) {
-    //     sub.openMenu(sub.index, sub.indexPath);
-    // }
-  }, [onOpen]);
+  /** 折叠菜单 */
   var close = useCallback(function (index) {
     var sub = subMenuRef.current.find(function (item) {
       return item.index === index;
     });
     if (sub) {
       sub.closeMenu(sub.index, sub.indexPath);
+      removeItem(sub);
     }
-  }, []);
+  }, [removeItem]);
   useImperativeHandle(ref, function () {
     return {
       open: open,
@@ -212,13 +258,16 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
         showTimeout: showTimeout,
         hideTimeout: hideTimeout,
         onSelect: onSelect,
-        onOpen: onOpen,
+        onOpen: handleOpenMenu,
         onClose: onClose,
-        addItems: addItems,
+        addMenuItem: addMenuItem,
         addSubMenu: addSubMenu,
+        addItem: addItem,
+        removeItem: removeItem,
         menuTrigger: menuTrigger,
         popperOffset: popperOffset,
         router: router,
+        collapse: _collapse,
         themeStyle: pick((_props$style = props.style) !== null && _props$style !== void 0 ? _props$style : {}, ['--el-menu-active-color', '--el-menu-text-color', '--el-menu-hover-text-color', '--el-menu-bg-color', '--el-menu-hover-bg-color', '--el-menu-item-height', '--el-menu-sub-item-height', '--el-menu-horizontal-height', '--el-menu-horizontal-sub-item-height', '--el-menu-item-font-size', '--el-menu-item-hover-fill', '--el-menu-border-color', '--el-menu-base-level-padding', '--el-menu-level-padding', '--el-menu-icon-width'])
       }
     }, sliceIndex > 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, Children.toArray(props.children).slice(0, sliceIndex), /*#__PURE__*/React.createElement(SubMenu, {
@@ -228,4 +277,5 @@ var Menu = /*#__PURE__*/forwardRef(function (props, ref) {
     }, Children.toArray(props.children).slice(sliceIndex))) : props.children))
   );
 });
+Menu.displayName = 'ElMenu';
 export default Menu;

package/dist/Menu/MenuContext.d.ts

@@ -1,14 +1,16 @@
 import React from 'react';
 import { MenuItemRegistered, MenuProps, SubMenuProvider } from './typings';
-interface MenuContextProps extends Pick<MenuProps, 'menuTrigger' | 'onSelect' | 'onOpen' | 'onClose' | 'showTimeout' | 'hideTimeout' | 'popperOffset' | 'router'> {
+interface MenuContextProps extends Pick<MenuProps, 'menuTrigger' | 'onSelect' | 'onOpen' | 'onClose' | 'showTimeout' | 'hideTimeout' | 'popperOffset' | 'router' | 'collapse'> {
     activeIndex?: string[];
     setActiveIndex?: (value: string[]) => void;
     handleSubMenuClick?: () => void;
     parentIndex?: string[];
-    addItems?: (menu: MenuItemRegistered) => void;
+    addMenuItem?: (menu: MenuItemRegistered) => void;
     addSubMenu?: (sub: SubMenuProvider) => void;
     /** 菜单展示模式 */
     mode?: 'horizontal' | 'vertical';
+    addItem?: (menu: SubMenuProvider) => void;
+    removeItem?: (menu: SubMenuProvider) => void;
     themeStyle?: React.CSSProperties & Partial<Record<'--el-menu-active-color' | '--el-menu-text-color' | '--el-menu-hover-text-color' | '--el-menu-bg-color' | '--el-menu-hover-bg-color' | '--el-menu-item-height' | '--el-menu-sub-item-height' | '--el-menu-horizontal-height' | '--el-menu-horizontal-sub-item-height' | '--el-menu-item-font-size' | '--el-menu-item-hover-fill' | '--el-menu-border-color' | '--el-menu-base-level-padding' | '--el-menu-level-padding' | '--el-menu-icon-width', string>>;
 }
 export declare const MenuContext: React.Context<MenuContextProps>;

package/dist/Menu/MenuContext.js

@@ -9,6 +9,8 @@ export var MenuContext = /*#__PURE__*/createContext({
   onOpen: null,
   onClose: null,
   addSubMenu: null,
+  addItem: null,
+  removeItem: null,
   showTimeout: 300,
   hideTimeout: 300,
   themeStyle: {}

package/dist/Menu/MenuItem.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import { MenuItemProps } from './typings';
-declare const MenuItem: (props: MenuItemProps) => React.JSX.Element;
+declare const MenuItem: {
+    (props: MenuItemProps): React.JSX.Element;
+    displayName: string;
+};
 export default MenuItem;

package/dist/Menu/MenuItem.js

@@ -4,8 +4,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { useMount } from 'ahooks';
 import classNames from 'classnames';
-import React, { useCallback, useLayoutEffect, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useClassNames } from "../hooks";
 import { useMenuContext } from "./MenuContext";
@@ -24,7 +25,7 @@ var MenuItem = function MenuItem(props) {
     activeIndex = _useMenuContext.activeIndex,
     setActiveIndex = _useMenuContext.setActiveIndex,
     parentIndex = _useMenuContext.parentIndex,
-    addItems = _useMenuContext.addItems,
+    addMenuItem = _useMenuContext.addMenuItem,
     onOpen = _useMenuContext.onOpen,
     onSelect = _useMenuContext.onSelect,
     router = _useMenuContext.router;
@@ -56,13 +57,12 @@ var MenuItem = function MenuItem(props) {
       navigate === null || navigate === void 0 || navigate(route !== null && route !== void 0 ? route : index);
     }
   }, [activeIndex, disabled, handleSubMenuClick, index, indexPath, navigate, onClick, onOpen, onSelect, route, router, setActiveIndex]);
-  useLayoutEffect(function () {
-    addItems({
+  useMount(function () {
+    addMenuItem({
       index: index,
       indexPath: indexPath
     });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  });
   return /*#__PURE__*/React.createElement("li", {
     className: classNames(b(), is({
       disabled: disabled,
@@ -73,4 +73,5 @@ var MenuItem = function MenuItem(props) {
     onClick: handleMenuItemClick
   }, props.children);
 };
+MenuItem.displayName = 'ElMenuItem';
 export default MenuItem;

package/dist/Menu/MenuItemGroup.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import { MenuItemGroupProps } from './typings';
-declare const MenuItemGroup: (props: MenuItemGroupProps) => React.JSX.Element;
+declare const MenuItemGroup: {
+    (props: MenuItemGroupProps): React.JSX.Element;
+    displayName: string;
+};
 export default MenuItemGroup;

package/dist/Menu/MenuItemGroup.js

@@ -41,4 +41,5 @@ var MenuItemGroup = function MenuItemGroup(props) {
     className: e(_templateObject || (_templateObject = _taggedTemplateLiteral(["title"])))
   }, title), /*#__PURE__*/React.createElement("ul", null, props.children));
 };
+MenuItemGroup.displayName = 'ElMenuItemGroup';
 export default MenuItemGroup;

package/dist/Menu/SubMenu.d.ts

@@ -1,4 +1,7 @@
 import React from 'react';
 import { SubMenuProps } from './typings';
-declare const SubMenu: (props: SubMenuProps) => React.JSX.Element;
+declare const SubMenu: {
+    (props: SubMenuProps): React.JSX.Element;
+    displayName: string;
+};
 export default SubMenu;

package/dist/Menu/SubMenu.js

@@ -1,6 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
-var _excluded = ["activeIndex", "parentIndex", "mode", "menuTrigger", "onOpen", "onClose", "addItems", "addSubMenu", "handleSubMenuClick", "showTimeout", "hideTimeout", "themeStyle", "popperOffset"];
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _excluded = ["activeIndex", "parentIndex", "mode", "menuTrigger", "onOpen", "onClose", "addMenuItem", "addSubMenu", "handleSubMenuClick", "addItem", "removeItem", "showTimeout", "hideTimeout", "themeStyle", "popperOffset", "collapse"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -19,8 +19,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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; }
+import { useMount } from 'ahooks';
 import classNames from 'classnames';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 import Icon from "../Icon/Icon";
 import Tooltip from "../Tooltip/Tooltip";
 import Transition from "../Transition/Transition";
@@ -53,24 +54,45 @@ var SubMenu = function SubMenu(props) {
     menuTrigger = _useMenuContext.menuTrigger,
     onOpen = _useMenuContext.onOpen,
     onClose = _useMenuContext.onClose,
-    addItems = _useMenuContext.addItems,
+    addMenuItem = _useMenuContext.addMenuItem,
     addSubMenu = _useMenuContext.addSubMenu,
     handleSubMenuClick = _useMenuContext.handleSubMenuClick,
+    addItem = _useMenuContext.addItem,
+    removeItem = _useMenuContext.removeItem,
     showTimeout = _useMenuContext.showTimeout,
     hideTimeout = _useMenuContext.hideTimeout,
     themeStyle = _useMenuContext.themeStyle,
     popperOffset = _useMenuContext.popperOffset,
+    collapse = _useMenuContext.collapse,
     ohter = _objectWithoutProperties(_useMenuContext, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    expand = _useState4[0],
+    setExpand = _useState4[1];
   var indexPath = useMemo(function () {
     return [].concat(_toConsumableArray(parentIndex), [index]);
   }, [index, parentIndex]);
   var level = useMemo(function () {
     return indexPath.length;
   }, [indexPath.length]);
+  var self = useMemo(function () {
+    return {
+      index: index,
+      indexPath: indexPath,
+      openMenu: function openMenu() {
+        setOpen(true);
+        setExpand(true);
+      },
+      closeMenu: function closeMenu() {
+        setOpen(false);
+        setExpand(false);
+      }
+    };
+  }, [index, indexPath]);
   var tooltipRef = useRef();
   var ulRef = useRef(null);
   var inited = useRef(false);
@@ -94,15 +116,29 @@ var SubMenu = function SubMenu(props) {
     var _tooltipRef$current;
     (_tooltipRef$current = tooltipRef.current) === null || _tooltipRef$current === void 0 || _tooltipRef$current.hide();
     handleSubMenuClick === null || handleSubMenuClick === void 0 || handleSubMenuClick();
-  }, [handleSubMenuClick]);
+    // 折叠模式下，index为子菜单，只能向上逐层打开父菜单
+    if (mode === 'vertical' && collapse) {
+      onOpen === null || onOpen === void 0 || onOpen(index, indexPath, {
+        index: index,
+        indexPath: indexPath
+      });
+    }
+  }, [collapse, handleSubMenuClick, index, indexPath, mode, onOpen]);
+
+  /** 点击submenu事件 */
   var handleSubMenuItemClick = useCallback(function (evt) {
     evt.stopPropagation();
     if (disabled) {
       return;
     }
     if (mode === 'vertical') {
-      setOpen(!open);
-      if (!open) {
+      setExpand(!expand);
+      if (!expand) {
+        addItem(self);
+      } else {
+        removeItem(self);
+      }
+      if (!expand) {
         onOpen === null || onOpen === void 0 || onOpen(index, indexPath, {
           index: index,
           indexPath: indexPath
@@ -114,42 +150,41 @@ var SubMenu = function SubMenu(props) {
         });
       }
     }
-  }, [disabled, index, indexPath, mode, onClose, onOpen, open]);
-  useEffect(function () {
+  }, [addItem, disabled, expand, index, indexPath, mode, onClose, onOpen, removeItem, self]);
+  var placement = useMemo(function () {
+    if (mode === 'horizontal') {
+      return level > 1 ? 'right-start' : 'bottom-start';
+    }
+    return 'right-start';
+  }, [level, mode]);
+  var fallbackPlacements = useCallback(function () {
+    if (mode === 'horizontal') {
+      return level > 1 ? ['right-end', 'right', 'left-start', 'left-end', 'left'] : ['bottom-end', 'bottom', 'top-start', 'top-end', 'top'];
+    } else {
+      return ['right-end', 'right', 'left-start', 'left-end', 'left'];
+    }
+  }, [level, mode]);
+  useMount(function () {
     if (!inited.current) {
       inited.current = true;
-      addItems({
+      addMenuItem({
         index: index,
         indexPath: indexPath
       });
-      addSubMenu({
-        index: index,
-        indexPath: indexPath,
-        openMenu: function openMenu(index, indexPath) {
-          // if (mode === 'horizontal') {
-          //     tooltipRef.current?.onOpen();
-          // }
-          setOpen(true);
-        },
-        closeMenu: function closeMenu(index, indexPath) {
-          // if (mode === 'horizontal') {
-          //     tooltipRef.current?.hide();
-          // }
-          setOpen(false);
-        }
-      });
+      addSubMenu(self);
     }
   });
   return /*#__PURE__*/React.createElement("li", {
+    key: index,
     className: classNames(b(), is({
       disabled: disabled,
-      opened: open,
+      opened: open || expand,
       active: activeIndex.includes(index)
     }), _defineProperty({}, e(_templateObject || (_templateObject = _taggedTemplateLiteral(["hide-arrow"]))), index === '__el__more'), props.className),
     onClick: handleSubMenuItemClick,
     style: props.style,
     role: "menuitem"
-  }, mode === 'horizontal' ? /*#__PURE__*/React.createElement(Tooltip, {
+  }, mode === 'horizontal' || collapse ? /*#__PURE__*/React.createElement(Tooltip, {
     ref: tooltipRef,
     disabled: disabled,
     className: e(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["title"]))),
@@ -157,11 +192,12 @@ var SubMenu = function SubMenu(props) {
     popperClass: classNames(is('pure'), popperClass),
     popperStyle: themeStyle,
     offset: popperOffset !== null && popperOffset !== void 0 ? popperOffset : props.popperOffset,
-    showAfter: level > 1 ? 0 : showTimeout !== null && showTimeout !== void 0 ? showTimeout : props.showTimeout,
+    showAfter: level > 1 || mode === 'vertical' ? 0 : showTimeout !== null && showTimeout !== void 0 ? showTimeout : props.showTimeout,
     hideAfter: hideTimeout !== null && hideTimeout !== void 0 ? hideTimeout : props.hideTimeout,
     unmountOnExit: false,
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave,
+    fallbackPlacements: fallbackPlacements,
     content: /*#__PURE__*/React.createElement(MenuContext.Provider, {
       value: _objectSpread({
         activeIndex: activeIndex,
@@ -169,15 +205,20 @@ var SubMenu = function SubMenu(props) {
         mode: mode,
         menuTrigger: menuTrigger,
         handleSubMenuClick: hideSubMenu,
-        addItems: addItems,
+        addMenuItem: addMenuItem,
         addSubMenu: addSubMenu,
+        addItem: addItem,
+        removeItem: removeItem,
         showTimeout: showTimeout,
         hideTimeout: hideTimeout,
         themeStyle: themeStyle,
-        popperOffset: popperOffset
+        popperOffset: popperOffset,
+        collapse: collapse,
+        onOpen: onOpen,
+        onClose: onClose
       }, ohter)
     }, /*#__PURE__*/React.createElement("div", {
-      className: classNames(mm(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["horizontal"]))), mm(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["popup-container"]))))
+      className: classNames(mm(mode), mm(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["popup-container"]))))
     }, /*#__PURE__*/React.createElement("ul", {
       className: "el-menu el-menu--popup el-menu--popup-bottom-start",
       style: {
@@ -185,30 +226,30 @@ var SubMenu = function SubMenu(props) {
       }
     }, props.children))),
     showArrow: false,
-    placement: level > 1 ? 'right-start' : 'bottom-start',
+    placement: placement,
     effect: "light"
   }, /*#__PURE__*/React.createElement("div", null, title, /*#__PURE__*/React.createElement(Icon, {
-    className: e(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["icon-arrow"]))),
+    className: e(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["icon-arrow"]))),
     name: level > 1 ? 'angle-right' : 'angle-down',
     prefix: "fal",
     style: {
       transform: open ? 'rotateZ(180deg)' : 'none'
     }
   }))) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: classNames(e(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["title"]))))
+    className: classNames(e(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["title"]))))
   }, title, /*#__PURE__*/React.createElement(Icon, {
-    className: e(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["icon-arrow"]))),
+    className: e(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["icon-arrow"]))),
     name: "angle-down",
     prefix: "fal",
     style: {
-      transform: open ? 'rotateZ(180deg)' : 'none'
+      transform: expand ? 'rotateZ(180deg)' : 'none'
     }
   })), /*#__PURE__*/React.createElement(Transition, {
     name: "el-menu-collapse",
     nodeRef: ulRef,
     disabled: disabled,
     duration: 300,
-    visible: open,
+    visible: expand,
     beforeEnter: beforeEnter,
     onEnter: onEnter,
     afterEnter: afterEnter,
@@ -217,7 +258,7 @@ var SubMenu = function SubMenu(props) {
     afterLeave: afterLeave
   }, /*#__PURE__*/React.createElement("ul", {
     ref: ulRef,
-    className: classNames(mb(), mm(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["inline"])))),
+    className: classNames(mb(), mm(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["inline"])))),
     style: {
       '--el-menu-level': level
     }
@@ -229,14 +270,18 @@ var SubMenu = function SubMenu(props) {
       menuTrigger: menuTrigger,
       onOpen: onOpen,
       onClose: onClose,
-      addItems: addItems,
+      addMenuItem: addMenuItem,
       addSubMenu: addSubMenu,
       handleSubMenuClick: hideSubMenu,
+      addItem: addItem,
+      removeItem: removeItem,
       showTimeout: showTimeout,
       hideTimeout: hideTimeout,
       themeStyle: themeStyle,
-      popperOffset: popperOffset
+      popperOffset: popperOffset,
+      collapse: collapse
     }, ohter)
   }, props.children)))));
 };
+SubMenu.displayName = 'ElSubMenu';
 export default SubMenu;

package/dist/Message/Message.js

@@ -24,7 +24,7 @@ import Transition from "../Transition/Transition";
 import { PopupManager, mergeDefaultProps } from "../Util";
 import { EVENT_CODE, TypeMap } from "../config/Constants";
 import { useClassNames } from "../hooks";
-// import { ConfigProvider } from '../ConfigProvider';
+// import { useConfigProvider } from '../ConfigProvider/ConfigProviderContext';
 
 var Message = /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function (props, ref) {
   var _props2;

package/dist/Pagination/Options.js

@@ -10,7 +10,7 @@ import classNames from 'classnames';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ElInput } from '..';
-import { useConfigProvider } from "../ConfigProvider";
+import { useConfigProvider } from "../ConfigProvider/ConfigProviderContext";
 import ElOption from "../Select/Option";
 import Select from "../Select/Select";
 import { useClassNames } from "../hooks";

package/dist/Pagination/Pagination.js

@@ -14,7 +14,7 @@ import { useMount } from 'ahooks';
 import classNames from 'classnames';
 import React, { forwardRef, isValidElement, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useConfigProvider } from "../ConfigProvider";
+import { useConfigProvider } from "../ConfigProvider/ConfigProviderContext";
 import Icon from "../Icon/Icon";
 import { isNotEmpty, mergeDefaultProps } from "../Util";
 import { useClassNames, useControlled } from "../hooks";