diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index aa8fdca4c..c5dd15fee 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -12,6 +12,7 @@ - 修复环境变量配置失效以及 history 模式下 logo 地址问题 - 修复图表库切换页面导致宽高计算错误 - 修复多语言配置 `Locale.show`导致配置不生效 +- 修复路由类型错误 ## 2.0.0-rc.14 (2020-12-15) diff --git a/src/components/types.ts b/src/components/types.ts index 66ae167b9..b4702bda1 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -1,3 +1,6 @@ import { defineComponent } from 'vue'; -export type Component = ReturnType; +export type Component = + | ReturnType + | (() => Promise) + | (() => Promise); diff --git a/src/router/helper/menuHelper.ts b/src/router/helper/menuHelper.ts index a4d33ff45..226c12f82 100644 --- a/src/router/helper/menuHelper.ts +++ b/src/router/helper/menuHelper.ts @@ -1,4 +1,4 @@ -import { AppRouteModule } from '/@/router/types.d'; +import { AppRouteModule } from '/@/router/types'; import type { MenuModule, Menu, AppRouteRecordRaw } from '/@/router/types'; import { findPath, forEach, treeMap } from '/@/utils/helper/treeHelper'; diff --git a/src/router/menus/modules/dashboard.ts b/src/router/menus/modules/dashboard.ts index 3c3285eae..261c0bef5 100644 --- a/src/router/menus/modules/dashboard.ts +++ b/src/router/menus/modules/dashboard.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/charts.ts b/src/router/menus/modules/demo/charts.ts index 2c2a2e065..bb0b5799f 100644 --- a/src/router/menus/modules/demo/charts.ts +++ b/src/router/menus/modules/demo/charts.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/comp.ts b/src/router/menus/modules/demo/comp.ts index 5c1827a23..4be358c0a 100644 --- a/src/router/menus/modules/demo/comp.ts +++ b/src/router/menus/modules/demo/comp.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/excel.ts b/src/router/menus/modules/demo/excel.ts index 5cf4a6949..d8844daa3 100644 --- a/src/router/menus/modules/demo/excel.ts +++ b/src/router/menus/modules/demo/excel.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/feat.ts b/src/router/menus/modules/demo/feat.ts index 68997fce8..0285217ed 100644 --- a/src/router/menus/modules/demo/feat.ts +++ b/src/router/menus/modules/demo/feat.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/iframe.ts b/src/router/menus/modules/demo/iframe.ts index 0577d4ecc..711f7130c 100644 --- a/src/router/menus/modules/demo/iframe.ts +++ b/src/router/menus/modules/demo/iframe.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/level.ts b/src/router/menus/modules/demo/level.ts index f02944ff7..79c568fe0 100644 --- a/src/router/menus/modules/demo/level.ts +++ b/src/router/menus/modules/demo/level.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/page.ts b/src/router/menus/modules/demo/page.ts index b76cf463e..64a60f2fd 100644 --- a/src/router/menus/modules/demo/page.ts +++ b/src/router/menus/modules/demo/page.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/demo/permission.ts b/src/router/menus/modules/demo/permission.ts index a77202848..1fca9b495 100644 --- a/src/router/menus/modules/demo/permission.ts +++ b/src/router/menus/modules/demo/permission.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/menus/modules/home.ts b/src/router/menus/modules/home.ts index ebe523f18..b58536bd5 100644 --- a/src/router/menus/modules/home.ts +++ b/src/router/menus/modules/home.ts @@ -1,4 +1,4 @@ -import type { MenuModule } from '/@/router/types.d'; +import type { MenuModule } from '/@/router/types'; import { t } from '/@/hooks/web/useI18n'; const menu: MenuModule = { diff --git a/src/router/types.d.ts b/src/router/types.ts similarity index 95% rename from src/router/types.d.ts rename to src/router/types.ts index 2dd457069..844b6f4e3 100644 --- a/src/router/types.d.ts +++ b/src/router/types.ts @@ -1,6 +1,8 @@ import type { RouteRecordRaw } from 'vue-router'; import { RoleEnum } from '/@/enums/roleEnum'; -import Component from '/@/components/types'; + +import type { Component } from '/@/components/types'; + export interface RouteMeta { // title title: string; @@ -30,6 +32,7 @@ export interface RouteMeta { single?: boolean; } +// @ts-ignore export interface AppRouteRecordRaw extends Omit { name: string; meta: RouteMeta;