Commit 5b2fbfb6ce4054ece60c851c45baf60f3a07a4db
1 parent
53867a84
fix(menu): fix hideMenu not working close #338
Showing
4 changed files
with
4 additions
and
9 deletions
src/components/Menu/src/components/BasicSubMenuItem.vue
@@ -36,9 +36,7 @@ | @@ -36,9 +36,7 @@ | ||
36 | setup(props) { | 36 | setup(props) { |
37 | const { prefixCls } = useDesign('basic-menu-item'); | 37 | const { prefixCls } = useDesign('basic-menu-item'); |
38 | 38 | ||
39 | - const getShowMenu = computed(() => { | ||
40 | - return !props.item.meta?.hideMenu; | ||
41 | - }); | 39 | + const getShowMenu = computed(() => !props.item.meta?.hideMenu); |
42 | function menuHasChildren(menuTreeItem: MenuType): boolean { | 40 | function menuHasChildren(menuTreeItem: MenuType): boolean { |
43 | return ( | 41 | return ( |
44 | Reflect.has(menuTreeItem, 'children') && | 42 | Reflect.has(menuTreeItem, 'children') && |
src/components/SimpleMenu/src/SimpleMenu.vue
@@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
94 | listenerLastChangeTab((route) => { | 94 | listenerLastChangeTab((route) => { |
95 | if (route.name === REDIRECT_NAME) return; | 95 | if (route.name === REDIRECT_NAME) return; |
96 | 96 | ||
97 | - currentActiveMenu.value = route.meta?.currentActiveMenu; | 97 | + currentActiveMenu.value = route.meta?.currentActiveMenu as string; |
98 | handleMenuChange(route); | 98 | handleMenuChange(route); |
99 | 99 | ||
100 | if (unref(currentActiveMenu)) { | 100 | if (unref(currentActiveMenu)) { |
src/components/SimpleMenu/src/SimpleSubMenu.vue
@@ -75,10 +75,7 @@ | @@ -75,10 +75,7 @@ | ||
75 | const { t } = useI18n(); | 75 | const { t } = useI18n(); |
76 | const { prefixCls } = useDesign('simple-menu'); | 76 | const { prefixCls } = useDesign('simple-menu'); |
77 | 77 | ||
78 | - const getShowMenu = computed(() => { | ||
79 | - return !props.item?.hideMenu; | ||
80 | - }); | ||
81 | - | 78 | + const getShowMenu = computed(() => !props.item?.meta?.hideMenu); |
82 | const getIcon = computed(() => props.item?.icon); | 79 | const getIcon = computed(() => props.item?.icon); |
83 | const getI18nName = computed(() => t(props.item?.name)); | 80 | const getI18nName = computed(() => t(props.item?.name)); |
84 | const getShowSubTitle = computed(() => !props.collapse || !props.parent); | 81 | const getShowSubTitle = computed(() => !props.collapse || !props.parent); |
src/router/routes/modules/demo/feat.ts
@@ -92,7 +92,7 @@ const feat: AppRouteModule = { | @@ -92,7 +92,7 @@ const feat: AppRouteModule = { | ||
92 | currentActiveMenu: '/feat/breadcrumb/children', | 92 | currentActiveMenu: '/feat/breadcrumb/children', |
93 | title: t('routes.demo.feat.breadcrumbChildrenDetail'), | 93 | title: t('routes.demo.feat.breadcrumbChildrenDetail'), |
94 | hideTab: true, | 94 | hideTab: true, |
95 | - hideMenu: true, | 95 | + // hideMenu: true, |
96 | }, | 96 | }, |
97 | }, | 97 | }, |
98 | ], | 98 | ], |