From 7960d9c6a272f03800f4b77095110ea4cff6f46e Mon Sep 17 00:00:00 2001 From: hooray <304327508@qq.com> Date: Fri, 9 Dec 2022 01:01:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=99=20/src/types/=20=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=A2=9E=E5=8A=A0=20`#`=20alias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/components/Search/index.vue | 2 +- src/layouts/components/SidebarItem/index.vue | 2 +- src/menu/index.ts | 2 +- src/menu/modules/multilevel.menu.example.ts | 2 +- src/router/routes.ts | 2 +- src/settings.default.ts | 2 +- src/settings.ts | 2 +- src/store/modules/menu.ts | 2 +- src/store/modules/route.ts | 2 +- src/store/modules/settings.ts | 2 +- tsconfig.json | 3 +++ vite.config.ts | 1 + 12 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/layouts/components/Search/index.vue b/src/layouts/components/Search/index.vue index 44a6b452..a0ca03ca 100644 --- a/src/layouts/components/Search/index.vue +++ b/src/layouts/components/Search/index.vue @@ -6,7 +6,7 @@ import eventBus from '@/utils/eventBus' import useSettingsStore from '@/store/modules/settings' import useRouteStore from '@/store/modules/route' import useMenuStore from '@/store/modules/menu' -import type { Menu, Route } from '@/types/global' +import type { Menu, Route } from '#/global' const router = useRouter() diff --git a/src/layouts/components/SidebarItem/index.vue b/src/layouts/components/SidebarItem/index.vue index 9181472c..88b19ddb 100644 --- a/src/layouts/components/SidebarItem/index.vue +++ b/src/layouts/components/SidebarItem/index.vue @@ -2,7 +2,7 @@ // import SidebarItem from './index.vue' import { resolveRoutePath } from '@/utils' import useSettingsStore from '@/store/modules/settings' -import type { Menu } from '@/types/global' +import type { Menu } from '#/global' const props = defineProps({ item: { diff --git a/src/menu/index.ts b/src/menu/index.ts index 6f56e08b..e536a949 100644 --- a/src/menu/index.ts +++ b/src/menu/index.ts @@ -1,6 +1,6 @@ import MultilevelMenuExample from './modules/multilevel.menu.example' -import type { Menu } from '@/types/global' +import type { Menu } from '#/global' const menu: Menu.recordMainRaw[] = [ { diff --git a/src/menu/modules/multilevel.menu.example.ts b/src/menu/modules/multilevel.menu.example.ts index f87231a0..0c60ce7a 100644 --- a/src/menu/modules/multilevel.menu.example.ts +++ b/src/menu/modules/multilevel.menu.example.ts @@ -1,4 +1,4 @@ -import type { Menu } from '@/types/global' +import type { Menu } from '#/global' const menus: Menu.recordRaw = { meta: { diff --git a/src/router/routes.ts b/src/router/routes.ts index 2008495d..fdc3e1c6 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -3,7 +3,7 @@ import generatedRoutes from 'virtual:generated-pages' import type { RouteRecordRaw } from 'vue-router' import MultilevelMenuExample from './modules/multilevel.menu.example' import BreadcrumbExample from './modules/breadcrumb.example' -import type { Route } from '@/types/global' +import type { Route } from '#/global' import useSettingsStore from '@/store/modules/settings' // 固定路由(默认路由) diff --git a/src/settings.default.ts b/src/settings.default.ts index 1cb9ca0b..0047a9df 100644 --- a/src/settings.default.ts +++ b/src/settings.default.ts @@ -1,6 +1,6 @@ // 该文件为系统默认配置,请勿修改!!! -import type { RecursiveRequired, Settings } from '@/types/global' +import type { RecursiveRequired, Settings } from '#/global' const globalSettingsDefault: RecursiveRequired = { app: { diff --git a/src/settings.ts b/src/settings.ts index 7547a9b3..53605bd7 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,4 +1,4 @@ -import type { Settings } from '@/types/global' +import type { Settings } from '#/global' const globalSettings: Settings.all = {} diff --git a/src/store/modules/menu.ts b/src/store/modules/menu.ts index deb62f8c..d298ea32 100644 --- a/src/store/modules/menu.ts +++ b/src/store/modules/menu.ts @@ -2,7 +2,7 @@ import { cloneDeep } from 'lodash-es' import useSettingsStore from './settings' import useUserStore from './user' import useRouteStore from './route' -import type { Menu } from '@/types/global' +import type { Menu } from '#/global' import { resolveRoutePath } from '@/utils' import api from '@/api' diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 982a4dc5..77f70512 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -5,7 +5,7 @@ import useUserStore from './user' import api from '@/api' import { resolveRoutePath } from '@/utils' import { systemRoutes } from '@/router/routes' -import type { Route } from '@/types/global' +import type { Route } from '#/global' function hasPermission(permissions: string[], route: Route.recordMainRaw | RouteRecordRaw) { let isAuth = false diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts index 73afdcac..efcb656f 100644 --- a/src/store/modules/settings.ts +++ b/src/store/modules/settings.ts @@ -1,6 +1,6 @@ import { defaultsDeep } from 'lodash-es' import type { RouteMeta } from 'vue-router' -import type { RecursiveRequired, Settings } from '@/types/global' +import type { RecursiveRequired, Settings } from '#/global' import settings from '@/settings' import settingsDefault from '@/settings.default' diff --git a/tsconfig.json b/tsconfig.json index fc53447f..07fa675f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,6 +19,9 @@ "paths": { "@/*": [ "src/*" + ], + "#/*": [ + "src/types/*" ] }, "types": [ diff --git a/vite.config.ts b/vite.config.ts index 8589a2e0..a6db6f14 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -53,6 +53,7 @@ export default ({ mode, command }) => { resolve: { alias: { '@': path.resolve(__dirname, 'src'), + '#': path.resolve(__dirname, 'src/types'), }, }, css: {