github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: menu mode error

sendya-refactor/v3/rate
tanjinzhou 2021-05-31 12:59:33 +08:00
parent f9ccbfd321
commit b8c52b34cb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/menu/src/Menu.tsx
View File

@ -226,7 +226,7 @@ export default defineComponent({
const mergedInlineCollapsed = ref(false); const mergedInlineCollapsed = ref(false);
watchEffect(() => { watchEffect(() => {
if (props.mode === 'inline' && inlineCollapsed.value) { if ((props.mode === 'inline' || props.mode === 'vertical') && inlineCollapsed.value) {
mergedMode.value = 'vertical'; mergedMode.value = 'vertical';
mergedInlineCollapsed.value = inlineCollapsed.value; mergedInlineCollapsed.value = inlineCollapsed.value;
} else { } else {

7
components/menu/src/SubMenu.tsx
View File

@ -266,7 +266,12 @@ export default defineComponent({
onVisibleChange={onPopupVisibleChange} onVisibleChange={onPopupVisibleChange}
v-slots={{ v-slots={{
popup: ({ visible }) => ( popup: ({ visible }) => (
<MenuContextProvider props={{ mode: triggerModeRef, isRootMenu: false }}> <MenuContextProvider
props={{
mode: computed(() => (triggerMode === 'horizontal' ? 'vertical' : triggerMode)),
isRootMenu: false,
}}
>
<Transition {...mergedMotion.value}> <Transition {...mergedMotion.value}>
<SubMenuList v-show={visible} id={popupId} ref={popupRef}> <SubMenuList v-show={visible} id={popupId} ref={popupRef}>
{slots.default?.()} {slots.default?.()}