diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index c3844893..369813eb 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -22,6 +22,7 @@ import { import { useRouter } from 'vue-router'; import useLayoutStore from '@/store/modules/layout'; import useAppStore from '@/store/modules/app'; +import useCoreStore from '@/store/modules/core'; import useNeStore from '@/store/modules/ne'; import useRouterStore from '@/store/modules/router'; import useTabsStore from '@/store/modules/tabs'; @@ -35,7 +36,6 @@ import { parseUrlPath } from '@/plugins/file-static-url'; const { proConfig, waterMarkContent } = useLayoutStore(); const { t, currentLocale } = useI18n(); const routerStore = useRouterStore(); -const neListStore = useNeStore(); const tabsStore = useTabsStore(); const appStore = useAppStore(); const router = useRouter(); @@ -80,9 +80,12 @@ const menuData = computed(() => { rootRoute.children = children; } } - const neTypes = neListStore.getNeSelectOtions.map(v => v.value); let routes = clearMenuItem(router.getRoutes()); - routes = routerStore.clearMenuItemByNeList(routes, neTypes); + const coreUid = useCoreStore().getCurrentCoreUid; + const neTypes = useNeStore() + .fnNeSelectOtions(coreUid) + .map(v => v.value); + routes = routerStore.clearMenuItemByNeList(routes, coreUid, neTypes); const { menuData } = getMenuData(routes); return menuData; }); @@ -311,7 +314,7 @@ onUnmounted(() => { -