diff --git a/mock/apiDemo/routeMenu.ts b/mock/apiDemo/routeMenu.ts index 5e913b2c..be72d766 100644 --- a/mock/apiDemo/routeMenu.ts +++ b/mock/apiDemo/routeMenu.ts @@ -63,21 +63,21 @@ const menu = [ }, { path: 'multilevel', - component: 'LayoutPage', + component: 'Layout', meta: { title: '多级菜单', }, children: [ { path: '1', - component: 'LayoutPage', + component: 'Layout', meta: { title: '多级菜单1', }, children: [ { path: '1-1', - component: 'LayoutPage', + component: 'Layout', meta: { title: '多级菜单1-1', alwaysShow: true, diff --git a/src/layout/components/header/components/tagBar/index.vue b/src/layout/components/header/components/tagBar/index.vue index 7f5e4a69..903dfd4c 100644 --- a/src/layout/components/header/components/tagBar/index.vue +++ b/src/layout/components/header/components/tagBar/index.vue @@ -67,7 +67,7 @@ import contextmenu from './components/contextmenu.vue'; import { isExternal } from '@/utils/validate'; import { resolve } from 'path-browserify'; import $ from 'jquery'; -const { themeConfig } = useSettingStore(); +const { themeConfig } = storeToRefs(useSettingStore()); // 初始化tags const tags = reactive([] as RouteLocationNormalized[]); const resolvePath = (routePath: string, basePath = '') => { diff --git a/src/layout/components/header/components/topBar/components/left.vue b/src/layout/components/header/components/topBar/components/left.vue index 24d178eb..309139fb 100644 --- a/src/layout/components/header/components/topBar/components/left.vue +++ b/src/layout/components/header/components/topBar/components/left.vue @@ -24,17 +24,17 @@ import { mitter, event } from '@/event'; import { useSettingStore, useGlobalStore, useRouteStore } from '@/store'; import { RouteLocationNormalized, RouteRecordRaw } from 'vue-router'; -const { themeConfig } = useSettingStore(); +const { themeConfig } = storeToRefs(useSettingStore()); const globalStore = useGlobalStore(); const setMenuCollapse = () => { - themeConfig.menuCollapse = !themeConfig.menuCollapse; + themeConfig.value.menuCollapse = !themeConfig.value.menuCollapse; }; const breadcrumbList = ref([] as Pick[]); const route = useRoute(); -const { routes } = useRouteStore(); +const { routes } = storeToRefs(useRouteStore()); const setBreadcrumbList = (route: RouteLocationNormalized) => { const list = [] as Pick[]; - let temp = { children: routes } as unknown as RouteRecordRaw; + let temp = { children: routes.value } as unknown as RouteRecordRaw; route.meta.menuIndex!.forEach((item) => { temp = temp.children![item]; if (temp.meta && temp.meta.title && temp.meta.breadcrumb !== false) { diff --git a/src/layout/components/header/components/topBar/components/right/index.vue b/src/layout/components/header/components/topBar/components/right/index.vue index de305954..ef9dd88b 100644 --- a/src/layout/components/header/components/topBar/components/right/index.vue +++ b/src/layout/components/header/components/topBar/components/right/index.vue @@ -15,7 +15,7 @@ import { localeConfig } from '@/config'; import MessageBox from './components/messageBox.vue'; import { useSettingStore } from '@/store'; import User from './components/user.vue'; -const { themeConfig } = useSettingStore(); +const { themeConfig } = storeToRefs(useSettingStore());