diff --git a/components/menu/src/InlineSubMenuList.tsx b/components/menu/src/InlineSubMenuList.tsx index fdb681a84..4b42a6008 100644 --- a/components/menu/src/InlineSubMenuList.tsx +++ b/components/menu/src/InlineSubMenuList.tsx @@ -1,5 +1,5 @@ import { computed, defineComponent, ref, watch } from '@vue/runtime-core'; -import Transition from 'ant-design-vue/es/_util/transition'; +import Transition from '../../_util/transition'; import { useInjectMenu, MenuContextProvider } from './hooks/useMenuContext'; import SubMenuList from './SubMenuList'; diff --git a/components/menu/src/Menu.tsx b/components/menu/src/Menu.tsx index b8f5fdffc..6582e57d2 100644 --- a/components/menu/src/Menu.tsx +++ b/components/menu/src/Menu.tsx @@ -11,6 +11,7 @@ import { reactive, onMounted, toRaw, + unref, } from 'vue'; import shallowEqual from '../../_util/shallowequal'; import useProvideMenu, { StoreMenuInfo, useProvideFirstLevel } from './hooks/useMenuContext'; @@ -23,8 +24,8 @@ import { MenuInfo, SelectInfo, } from './interface'; -import devWarning from 'ant-design-vue/es/vc-util/devWarning'; -import { collapseMotion, CSSMotionProps } from 'ant-design-vue/es/_util/transition'; +import devWarning from '../../vc-util/devWarning'; +import { collapseMotion, CSSMotionProps } from '../../_util/transition'; import uniq from 'lodash-es/uniq'; export const menuProps = { @@ -67,7 +68,6 @@ export default defineComponent({ computed(() => undefined), ); const inlineCollapsed = computed(() => { - console.log('siderCollapsed.value', siderCollapsed.value); if (siderCollapsed.value !== undefined) { return siderCollapsed.value; } @@ -111,7 +111,7 @@ export default defineComponent({ let subMenuParentEventKeys = []; (Object.values(toRaw(store)) as any).forEach((menuInfo: StoreMenuInfo) => { if (mergedSelectedKeys.value.includes(menuInfo.key)) { - subMenuParentEventKeys.push(...menuInfo.parentEventKeys.value); + subMenuParentEventKeys.push(...unref(menuInfo.parentEventKeys)); } }); @@ -275,7 +275,6 @@ export default defineComponent({ } else if (mergedMode.value !== 'inline') { // We need find all related popup to close const subPathKeys = getChildrenKeys(childrenEventKeys); - console.log('subPathKeys', eventKey, childrenEventKeys, subPathKeys); newOpenKeys = newOpenKeys.filter(k => !subPathKeys.includes(k)); } diff --git a/components/menu/src/SubMenu.tsx b/components/menu/src/SubMenu.tsx index 9be235df6..4f3a03bcb 100644 --- a/components/menu/src/SubMenu.tsx +++ b/components/menu/src/SubMenu.tsx @@ -10,13 +10,13 @@ import { } from 'vue'; import useProvideKeyPath, { useInjectKeyPath } from './hooks/useKeyPath'; import { useInjectMenu, useProvideFirstLevel, MenuContextProvider } from './hooks/useMenuContext'; -import { getPropsSlot, isValidElement } from 'ant-design-vue/es/_util/props-util'; -import classNames from 'ant-design-vue/es/_util/classNames'; +import { getPropsSlot, isValidElement } from '../../_util/props-util'; +import classNames from '../../_util/classNames'; import useDirectionStyle from './hooks/useDirectionStyle'; import PopupTrigger from './PopupTrigger'; import SubMenuList from './SubMenuList'; import InlineSubMenuList from './InlineSubMenuList'; -import Transition, { getTransitionProps } from 'ant-design-vue/es/_util/transition'; +import Transition, { getTransitionProps } from '../../_util/transition'; let indexGuid = 0; export default defineComponent({ @@ -281,7 +281,7 @@ export default defineComponent({ {titleNode} {/* Inline mode */} - {!overflowDisabled.value && mode.value !== 'vertical' && ( + {!overflowDisabled.value && ( {slots.default?.()} diff --git a/components/menu/src/interface.ts b/components/menu/src/interface.ts index 02c2f992e..14a153c18 100644 --- a/components/menu/src/interface.ts +++ b/components/menu/src/interface.ts @@ -1,4 +1,4 @@ -import { Key } from 'ant-design-vue/es/_util/type'; +import { Key } from '../../_util/type'; export type MenuTheme = 'light' | 'dark'; diff --git a/v2-doc b/v2-doc index a7013ae87..d19705328 160000 --- a/v2-doc +++ b/v2-doc @@ -1 +1 @@ -Subproject commit a7013ae87f69dcbcf547f4b023255b8a7a775557 +Subproject commit d197053285b81e77718621c0b5b94cb3b21831a2