From 3a96bb6fc0bba6419d82f36d889488ae8b374651 Mon Sep 17 00:00:00 2001 From: yuntian001 Date: Wed, 9 Nov 2022 16:57:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlayout=E5=8F=8A?= =?UTF-8?q?=E5=AD=90=E7=BB=84=E4=BB=B6=E6=9B=B4=E6=94=B9=E6=97=B6=E7=83=AD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98(?= =?UTF-8?q?=E5=B0=86layout=20layoutPage=E6=94=B9=E4=B8=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=BC=95=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/constant.ts | 2 ++ src/router/index.ts | 3 ++- src/router/routes/1-dashboard.ts | 2 +- src/router/routes/2-example.ts | 2 +- src/router/routes/example/6-multilevel.ts | 4 ++-- src/router/routes/example/multilevel/1.ts | 4 ++-- src/utils/permission.ts | 3 +-- 7 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 src/router/constant.ts diff --git a/src/router/constant.ts b/src/router/constant.ts new file mode 100644 index 00000000..a59756b4 --- /dev/null +++ b/src/router/constant.ts @@ -0,0 +1,2 @@ +export const Layout = ()=>import('@/layout/index.vue'); +export const LayoutPage = ()=>import('@/layout/components/page.vue'); \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index ed68689e..7f9134d9 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,13 +3,14 @@ import { PageEnum } from '@/enums/pageEnum'; import { App } from 'vue'; import { setupRouterGuard } from './guard'; import { concatObjectValue } from '@/utils/helper'; -import Layout from '@/layout/index.vue'; +import { Layout } from '@/router/constant'; export const asyncRoutes = concatObjectValue( import.meta.glob('./routes/*.ts', { eager: true, import: 'routes' }), ); import { isExternal } from '@/utils/validate'; import { resolve } from 'path-browserify'; + export const constantRoutes: RouteRecordRaw[] = [ { path: '/', diff --git a/src/router/routes/1-dashboard.ts b/src/router/routes/1-dashboard.ts index c8121bd5..57404a81 100644 --- a/src/router/routes/1-dashboard.ts +++ b/src/router/routes/1-dashboard.ts @@ -1,6 +1,6 @@ import { PageEnum } from '@/enums/pageEnum'; import { RouteRecordRaw } from 'vue-router'; -import Layout from '@/layout/index.vue'; +import { Layout } from '@/router/constant'; import { concatObjectValue } from '@/utils/helper'; export const routes: RouteRecordRaw[] = [ { diff --git a/src/router/routes/2-example.ts b/src/router/routes/2-example.ts index 5ccb5758..fed9adc5 100644 --- a/src/router/routes/2-example.ts +++ b/src/router/routes/2-example.ts @@ -1,5 +1,5 @@ import { RouteRecordRaw } from 'vue-router'; -import Layout from '@/layout/index.vue'; +import { Layout } from '@/router/constant'; import { concatObjectValue } from '@/utils/helper'; export const routes: RouteRecordRaw[] = [ { diff --git a/src/router/routes/example/6-multilevel.ts b/src/router/routes/example/6-multilevel.ts index 0d187918..950018a9 100644 --- a/src/router/routes/example/6-multilevel.ts +++ b/src/router/routes/example/6-multilevel.ts @@ -1,5 +1,5 @@ -import { RouteRecordRaw, RouterView } from 'vue-router'; -import LayoutPage from '@/layout/components/page.vue'; +import { RouteRecordRaw } from 'vue-router'; +import {LayoutPage} from '@/router/constant'; import { concatObjectValue } from '@/utils/helper'; export const routes: RouteRecordRaw[] = [ { diff --git a/src/router/routes/example/multilevel/1.ts b/src/router/routes/example/multilevel/1.ts index 6bfcbd3f..968bcba1 100644 --- a/src/router/routes/example/multilevel/1.ts +++ b/src/router/routes/example/multilevel/1.ts @@ -1,5 +1,5 @@ -import { RouteRecordRaw, RouterView } from 'vue-router'; -import LayoutPage from '@/layout/components/page.vue'; +import { RouteRecordRaw } from 'vue-router'; +import {LayoutPage} from '@/router/constant'; export const routes: RouteRecordRaw[] = [ { path: '1', diff --git a/src/utils/permission.ts b/src/utils/permission.ts index 021b5bc5..92ec0dc8 100644 --- a/src/utils/permission.ts +++ b/src/utils/permission.ts @@ -1,5 +1,4 @@ -import Layout from '@/layout/index.vue'; -import LayoutPage from '@/layout/components/page.vue'; +import { Layout,LayoutPage } from '@/router/constant'; import Page404 from '@/views/404.vue'; import { useUserStore } from '@/store'; import { RouteRecordRaw } from 'vue-router';