From b8c52b34cb0597270b9979d8a222efc93f3725a5 Mon Sep 17 00:00:00 2001
From: tanjinzhou <415800467@qq.com>
Date: Mon, 31 May 2021 12:59:33 +0800
Subject: [PATCH] fix: menu mode error

---
 components/menu/src/Menu.tsx    | 2 +-
 components/menu/src/SubMenu.tsx | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/menu/src/Menu.tsx b/components/menu/src/Menu.tsx
index ed38addfa..f9e8e7ef0 100644
--- a/components/menu/src/Menu.tsx
+++ b/components/menu/src/Menu.tsx
@@ -226,7 +226,7 @@ export default defineComponent({
     const mergedInlineCollapsed = ref(false);
 
     watchEffect(() => {
-      if (props.mode === 'inline' && inlineCollapsed.value) {
+      if ((props.mode === 'inline' || props.mode === 'vertical') && inlineCollapsed.value) {
         mergedMode.value = 'vertical';
         mergedInlineCollapsed.value = inlineCollapsed.value;
       } else {
diff --git a/components/menu/src/SubMenu.tsx b/components/menu/src/SubMenu.tsx
index f51064417..3386a6d74 100644
--- a/components/menu/src/SubMenu.tsx
+++ b/components/menu/src/SubMenu.tsx
@@ -266,7 +266,12 @@ export default defineComponent({
             onVisibleChange={onPopupVisibleChange}
             v-slots={{
               popup: ({ visible }) => (
-                <MenuContextProvider props={{ mode: triggerModeRef, isRootMenu: false }}>
+                <MenuContextProvider
+                  props={{
+                    mode: computed(() => (triggerMode === 'horizontal' ? 'vertical' : triggerMode)),
+                    isRootMenu: false,
+                  }}
+                >
                   <Transition {...mergedMotion.value}>
                     <SubMenuList v-show={visible} id={popupId} ref={popupRef}>
                       {slots.default?.()}