From 5b2fbfb6ce4054ece60c851c45baf60f3a07a4db Mon Sep 17 00:00:00 2001 From: Vben Date: Tue, 9 Mar 2021 23:39:21 +0800 Subject: [PATCH] fix(menu): fix hideMenu not working close #338 --- src/components/Menu/src/components/BasicSubMenuItem.vue | 4 +--- src/components/SimpleMenu/src/SimpleMenu.vue | 2 +- src/components/SimpleMenu/src/SimpleSubMenu.vue | 5 +---- src/router/routes/modules/demo/feat.ts | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/Menu/src/components/BasicSubMenuItem.vue b/src/components/Menu/src/components/BasicSubMenuItem.vue index c5e0be95..bc6cee70 100644 --- a/src/components/Menu/src/components/BasicSubMenuItem.vue +++ b/src/components/Menu/src/components/BasicSubMenuItem.vue @@ -36,9 +36,7 @@ setup(props) { const { prefixCls } = useDesign('basic-menu-item'); - const getShowMenu = computed(() => { - return !props.item.meta?.hideMenu; - }); + const getShowMenu = computed(() => !props.item.meta?.hideMenu); function menuHasChildren(menuTreeItem: MenuType): boolean { return ( Reflect.has(menuTreeItem, 'children') && diff --git a/src/components/SimpleMenu/src/SimpleMenu.vue b/src/components/SimpleMenu/src/SimpleMenu.vue index 0f5c77eb..b341adb6 100644 --- a/src/components/SimpleMenu/src/SimpleMenu.vue +++ b/src/components/SimpleMenu/src/SimpleMenu.vue @@ -94,7 +94,7 @@ listenerLastChangeTab((route) => { if (route.name === REDIRECT_NAME) return; - currentActiveMenu.value = route.meta?.currentActiveMenu; + currentActiveMenu.value = route.meta?.currentActiveMenu as string; handleMenuChange(route); if (unref(currentActiveMenu)) { diff --git a/src/components/SimpleMenu/src/SimpleSubMenu.vue b/src/components/SimpleMenu/src/SimpleSubMenu.vue index f67f0f16..47467fb7 100644 --- a/src/components/SimpleMenu/src/SimpleSubMenu.vue +++ b/src/components/SimpleMenu/src/SimpleSubMenu.vue @@ -75,10 +75,7 @@ const { t } = useI18n(); const { prefixCls } = useDesign('simple-menu'); - const getShowMenu = computed(() => { - return !props.item?.hideMenu; - }); - + const getShowMenu = computed(() => !props.item?.meta?.hideMenu); const getIcon = computed(() => props.item?.icon); const getI18nName = computed(() => t(props.item?.name)); const getShowSubTitle = computed(() => !props.collapse || !props.parent); diff --git a/src/router/routes/modules/demo/feat.ts b/src/router/routes/modules/demo/feat.ts index 882e267b..bf0e5b4e 100644 --- a/src/router/routes/modules/demo/feat.ts +++ b/src/router/routes/modules/demo/feat.ts @@ -92,7 +92,7 @@ const feat: AppRouteModule = { currentActiveMenu: '/feat/breadcrumb/children', title: t('routes.demo.feat.breadcrumbChildrenDetail'), hideTab: true, - hideMenu: true, + // hideMenu: true, }, }, ], -- GitLab