diff --git a/src/components.d.ts b/src/components.d.ts deleted file mode 100644 index d96655b3..00000000 --- a/src/components.d.ts +++ /dev/null @@ -1,30 +0,0 @@ -// generated by unplugin-vue-components -// We suggest you to commit this file into source control -// Read more: https://github.com/vuejs/core/pull/3399 -import '@vue/runtime-core' - -export {} - -declare module '@vue/runtime-core' { - export interface GlobalComponents { - Auth: typeof import('./components/Auth/index.vue')['default'] - AuthAll: typeof import('./components/AuthAll/index.vue')['default'] - BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] - Copyright: typeof import('./components/Copyright/index.vue')['default'] - Editor: typeof import('./components/Editor/index.vue')['default'] - FileUpload: typeof import('./components/FileUpload/index.vue')['default'] - FixedActionBar: typeof import('./components/FixedActionBar/index.vue')['default'] - ImagePreview: typeof import('./components/ImagePreview/index.vue')['default'] - ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] - ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] - PageHeader: typeof import('./components/PageHeader/index.vue')['default'] - PageMain: typeof import('./components/PageMain/index.vue')['default'] - PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] - RouterLink: typeof import('vue-router')['RouterLink'] - RouterView: typeof import('vue-router')['RouterView'] - SearchBar: typeof import('./components/SearchBar/index.vue')['default'] - SvgIcon: typeof import('./components/SvgIcon/index.vue')['default'] - SystemInfo: typeof import('./components/SystemInfo/index.vue')['default'] - Trend: typeof import('./components/Trend/index.vue')['default'] - } -} diff --git a/src/layouts/components/Search/index.vue b/src/layouts/components/Search/index.vue index 142e60ac..44a6b452 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 '@/global' +import type { Menu, Route } from '@/types/global' const router = useRouter() diff --git a/src/layouts/components/SidebarItem/index.vue b/src/layouts/components/SidebarItem/index.vue index e5a0d07c..9181472c 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 '@/global' +import type { Menu } from '@/types/global' const props = defineProps({ item: { diff --git a/src/menu/index.ts b/src/menu/index.ts index aff0e3e5..6f56e08b 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 '@/global' +import type { Menu } from '@/types/global' const menu: Menu.recordMainRaw[] = [ { diff --git a/src/menu/modules/multilevel.menu.example.ts b/src/menu/modules/multilevel.menu.example.ts index d4b23659..f87231a0 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 '@/global' +import type { Menu } from '@/types/global' const menus: Menu.recordRaw = { meta: { diff --git a/src/router/routes.ts b/src/router/routes.ts index 930e165f..c2ff9468 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -11,7 +11,7 @@ import MockExample from './modules/mock.example' import JsxExample from './modules/jsx.example' import ExternalLinkExample from './modules/external.link.example' import EcologyExample from './modules/ecology.example' -import type { Route } from '@/global' +import type { Route } from '@/types/global' import useSettingsStore from '@/store/modules/settings' // 固定路由(默认路由) diff --git a/src/settings.default.ts b/src/settings.default.ts index 0aaa6e26..1cb9ca0b 100644 --- a/src/settings.default.ts +++ b/src/settings.default.ts @@ -1,6 +1,6 @@ // 该文件为系统默认配置,请勿修改!!! -import type { RecursiveRequired, Settings } from './global' +import type { RecursiveRequired, Settings } from '@/types/global' const globalSettingsDefault: RecursiveRequired = { app: { diff --git a/src/settings.ts b/src/settings.ts index 87308b76..4666140d 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -1,4 +1,4 @@ -import type { Settings } from './global' +import type { Settings } from '@/types/global' const globalSettings: Settings.all = { app: { diff --git a/src/store/modules/menu.ts b/src/store/modules/menu.ts index 8eae0e3c..deb62f8c 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 '@/global' +import type { Menu } from '@/types/global' import { resolveRoutePath } from '@/utils' import api from '@/api' diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 51878a21..982a4dc5 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 '@/global' +import type { Route } from '@/types/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 52152dcf..73afdcac 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 '@/global' +import type { RecursiveRequired, Settings } from '@/types/global' import settings from '@/settings' import settingsDefault from '@/settings.default' diff --git a/src/auto-imports.d.ts b/src/types/auto-imports.d.ts similarity index 92% rename from src/auto-imports.d.ts rename to src/types/auto-imports.d.ts index d9a98424..b349e3c6 100644 --- a/src/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -60,13 +60,13 @@ declare global { const triggerRef: typeof import('vue')['triggerRef'] const unref: typeof import('vue')['unref'] const useAttrs: typeof import('vue')['useAttrs'] - const useAuth: typeof import('./utils/composables/useAuth')['default'] + const useAuth: typeof import('../utils/composables/useAuth')['default'] const useCssModule: typeof import('vue')['useCssModule'] const useCssVars: typeof import('vue')['useCssVars'] - const useGlobalProperties: typeof import('./utils/composables/useGlobalProperties')['default'] + const useGlobalProperties: typeof import('../utils/composables/useGlobalProperties')['default'] const useLink: typeof import('vue-router')['useLink'] - const useMainPage: typeof import('./utils/composables/useMainPage')['default'] - const useMenu: typeof import('./utils/composables/useMenu')['default'] + const useMainPage: typeof import('../utils/composables/useMainPage')['default'] + const useMenu: typeof import('../utils/composables/useMenu')['default'] const useRoute: typeof import('vue-router')['useRoute'] const useRouter: typeof import('vue-router')['useRouter'] const useSlots: typeof import('vue')['useSlots'] diff --git a/src/types/components.d.ts b/src/types/components.d.ts new file mode 100644 index 00000000..4771cfea --- /dev/null +++ b/src/types/components.d.ts @@ -0,0 +1,30 @@ +// generated by unplugin-vue-components +// We suggest you to commit this file into source control +// Read more: https://github.com/vuejs/core/pull/3399 +import '@vue/runtime-core' + +export {} + +declare module '@vue/runtime-core' { + export interface GlobalComponents { + Auth: typeof import('./../components/Auth/index.vue')['default'] + AuthAll: typeof import('./../components/AuthAll/index.vue')['default'] + BatchActionBar: typeof import('./../components/BatchActionBar/index.vue')['default'] + Copyright: typeof import('./../components/Copyright/index.vue')['default'] + Editor: typeof import('./../components/Editor/index.vue')['default'] + FileUpload: typeof import('./../components/FileUpload/index.vue')['default'] + FixedActionBar: typeof import('./../components/FixedActionBar/index.vue')['default'] + ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default'] + ImagesUpload: typeof import('./../components/ImagesUpload/index.vue')['default'] + ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default'] + PageHeader: typeof import('./../components/PageHeader/index.vue')['default'] + PageMain: typeof import('./../components/PageMain/index.vue')['default'] + PcasCascader: typeof import('./../components/PcasCascader/index.vue')['default'] + RouterLink: typeof import('vue-router')['RouterLink'] + RouterView: typeof import('vue-router')['RouterView'] + SearchBar: typeof import('./../components/SearchBar/index.vue')['default'] + SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default'] + SystemInfo: typeof import('./../components/SystemInfo/index.vue')['default'] + Trend: typeof import('./../components/Trend/index.vue')['default'] + } +} diff --git a/src/global.d.ts b/src/types/global.d.ts similarity index 100% rename from src/global.d.ts rename to src/types/global.d.ts diff --git a/src/shims.d.ts b/src/types/shims.d.ts similarity index 95% rename from src/shims.d.ts rename to src/types/shims.d.ts index 691ab88a..b6fce1d4 100644 --- a/src/shims.d.ts +++ b/src/types/shims.d.ts @@ -1,19 +1,19 @@ -declare interface Window { - webkitDevicePixelRatio: any - mozDevicePixelRatio: any -} - -declare module '*.vue' { - import { type DefineComponent } from 'vue' - const component: DefineComponent<{}, {}, any> - export default component -} - -declare const __SYSTEM_INFO__: { - pkg: { - version: string - dependencies: Recordable - devDependencies: Recordable - } - lastBuildTime: string -} +declare interface Window { + webkitDevicePixelRatio: any + mozDevicePixelRatio: any +} + +declare module '*.vue' { + import { type DefineComponent } from 'vue' + const component: DefineComponent<{}, {}, any> + export default component +} + +declare const __SYSTEM_INFO__: { + pkg: { + version: string + dependencies: Recordable + devDependencies: Recordable + } + lastBuildTime: string +} diff --git a/vite/plugins/auto-import.ts b/vite/plugins/auto-import.ts index b50e784f..b27bdd5d 100644 --- a/vite/plugins/auto-import.ts +++ b/vite/plugins/auto-import.ts @@ -7,7 +7,7 @@ export default function createAutoImport() { 'vue-router', 'pinia', ], - dts: 'src/auto-imports.d.ts', + dts: './src/types/auto-imports.d.ts', dirs: [ './src/utils/composables/**', ], diff --git a/vite/plugins/components.ts b/vite/plugins/components.ts index c9e5e529..1b0db823 100644 --- a/vite/plugins/components.ts +++ b/vite/plugins/components.ts @@ -4,6 +4,6 @@ export default function createComponents() { return components({ dirs: ['src/components'], include: [/\.vue$/, /\.vue\?vue/, /\.tsx$/], - dts: 'src/components.d.ts', + dts: './src/types/components.d.ts', }) }