diff --git a/src/router/modules/able.ts b/src/router/modules/able.ts index 6852c9665..9e99aadfd 100644 --- a/src/router/modules/able.ts +++ b/src/router/modules/able.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const ableRouter: RouteConfigsTable = { path: "/able", - component: Layout, redirect: "/able/watermark", meta: { icon: "ubuntu-fill", diff --git a/src/router/modules/about.ts b/src/router/modules/about.ts index 7a617f62b..bcf33e1fa 100644 --- a/src/router/modules/about.ts +++ b/src/router/modules/about.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const aboutRouter: RouteConfigsTable = { path: "/about", - component: Layout, redirect: "/about/index", meta: { // icon: "question-line", diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts index 38ea8c673..b594f32e0 100644 --- a/src/router/modules/components.ts +++ b/src/router/modules/components.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const componentsRouter: RouteConfigsTable = { path: "/components", - component: Layout, redirect: "/components/video", meta: { icon: "menu", diff --git a/src/router/modules/editor.ts b/src/router/modules/editor.ts index 4d980ef7a..ee1500e92 100644 --- a/src/router/modules/editor.ts +++ b/src/router/modules/editor.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const editorRouter: RouteConfigsTable = { path: "/editor", - component: Layout, redirect: "/editor/index", meta: { icon: "edit", diff --git a/src/router/modules/error.ts b/src/router/modules/error.ts index b92ba739a..f652a1464 100644 --- a/src/router/modules/error.ts +++ b/src/router/modules/error.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const errorRouter: RouteConfigsTable = { path: "/error", - component: Layout, redirect: "/error/403", meta: { icon: "information-line", diff --git a/src/router/modules/flowchart.ts b/src/router/modules/flowchart.ts index 178528f25..590489d02 100644 --- a/src/router/modules/flowchart.ts +++ b/src/router/modules/flowchart.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const flowChartRouter: RouteConfigsTable = { path: "/flowChart", - component: Layout, redirect: "/flowChart/index", meta: { icon: "set-up", diff --git a/src/router/modules/formdesign.ts b/src/router/modules/formdesign.ts index e4c71dce4..313d659ea 100644 --- a/src/router/modules/formdesign.ts +++ b/src/router/modules/formdesign.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const formDesignRouter: RouteConfigsTable = { path: "/formDesign", - component: Layout, redirect: "/formDesign/index", meta: { icon: "terminal-window-line", diff --git a/src/router/modules/guide.ts b/src/router/modules/guide.ts index c701c9c1f..38a68f6da 100644 --- a/src/router/modules/guide.ts +++ b/src/router/modules/guide.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const guideRouter: RouteConfigsTable = { path: "/guide", - component: Layout, redirect: "/guide/index", meta: { icon: "guide", diff --git a/src/router/modules/list.ts b/src/router/modules/list.ts index c91369c7c..d24e1451e 100644 --- a/src/router/modules/list.ts +++ b/src/router/modules/list.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const ableRouter: RouteConfigsTable = { path: "/list", - component: Layout, redirect: "/list/card", meta: { icon: "list-check", diff --git a/src/router/modules/nested.ts b/src/router/modules/nested.ts index 30e695d59..70c33fa01 100644 --- a/src/router/modules/nested.ts +++ b/src/router/modules/nested.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const nestedRouter: RouteConfigsTable = { path: "/nested", - component: Layout, redirect: "/nested/menu1/menu1-1", meta: { title: $t("menus.hsmenus"), diff --git a/src/router/modules/ppt.ts b/src/router/modules/ppt.ts index bee3c71e6..113f0f4ea 100644 --- a/src/router/modules/ppt.ts +++ b/src/router/modules/ppt.ts @@ -1,10 +1,8 @@ import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const IFrame = () => import("/@/layout/frameView.vue"); const pptRouter: RouteConfigsTable = { path: "/ppt", - component: Layout, redirect: "/ppt/index", meta: { icon: "ppt", diff --git a/src/router/modules/result.ts b/src/router/modules/result.ts index 29d6389f7..525ba72fd 100644 --- a/src/router/modules/result.ts +++ b/src/router/modules/result.ts @@ -1,10 +1,8 @@ import { $t } from "/@/plugins/i18n"; import type { RouteConfigsTable } from "/#/index"; -const Layout = () => import("/@/layout/index.vue"); const resultRouter: RouteConfigsTable = { path: "/result", - component: Layout, redirect: "/result/success", meta: { icon: "checkbox-circle-line", diff --git a/src/router/utils.ts b/src/router/utils.ts index 926292605..1d35c3861 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -13,7 +13,6 @@ import { useTimeoutFn } from "@vueuse/core"; import { RouteConfigs } from "/@/layout/types"; import { buildHierarchyTree } from "@pureadmin/utils"; import { usePermissionStoreHook } from "/@/store/modules/permission"; -const Layout = () => import("/@/layout/index.vue"); const IFrame = () => import("/@/layout/frameView.vue"); // https://cn.vitejs.dev/guide/features.html#glob-import const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}"); @@ -229,12 +228,10 @@ function addAsyncRoutes(arrRoutes: Array) { arrRoutes.forEach((v: RouteRecordRaw) => { // 将backstage属性加入meta,标识此路由为后端返回路由 v.meta.backstage = true; - if (v.redirect) { - v.component = Layout; - } else if (v.meta?.frameSrc) { + if (v.meta?.frameSrc) { v.component = IFrame; } else { - // 对后端传component组件路径和不传做兼容(如果后端传component组件路径,那么path可以随便写,如果不传,component组件路径会根path保持一致) + // 对后端传component组件路径和不传做兼容(如果后端传component组件路径,那么path可以随便写,如果不传,component组件路径会跟path保持一致) const index = v?.component ? modulesRoutesKeys.findIndex(ev => ev.includes(v.component as any)) : modulesRoutesKeys.findIndex(ev => ev.includes(v.path));