From b6e5c3f625f3e30b1fa7433e57b1294a8ce8d04b Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Wed, 23 Dec 2020 21:51:22 +0800
Subject: [PATCH] fix(types): fix routing type error #145

---
 CHANGELOG.zh_CN.md                          | 1 +
 src/components/types.ts                     | 5 ++++-
 src/router/helper/menuHelper.ts             | 2 +-
 src/router/menus/modules/dashboard.ts       | 2 +-
 src/router/menus/modules/demo/charts.ts     | 2 +-
 src/router/menus/modules/demo/comp.ts       | 2 +-
 src/router/menus/modules/demo/excel.ts      | 2 +-
 src/router/menus/modules/demo/feat.ts       | 2 +-
 src/router/menus/modules/demo/iframe.ts     | 2 +-
 src/router/menus/modules/demo/level.ts      | 2 +-
 src/router/menus/modules/demo/page.ts       | 2 +-
 src/router/menus/modules/demo/permission.ts | 2 +-
 src/router/menus/modules/home.ts            | 2 +-
 src/router/{types.d.ts => types.ts}         | 5 ++++-
 14 files changed, 20 insertions(+), 13 deletions(-)
 rename src/router/{types.d.ts => types.ts} (95%)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index aa8fdca4..c5dd15fe 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 66ae167b..b4702bda 100644
--- a/src/components/types.ts
+++ b/src/components/types.ts
@@ -1,3 +1,6 @@
 import { defineComponent } from 'vue';
 
-export type Component = ReturnType<typeof defineComponent>;
+export type Component<T extends any = any> =
+  | ReturnType<typeof defineComponent>
+  | (() => Promise<typeof import('*.vue')>)
+  | (() => Promise<T>);
diff --git a/src/router/helper/menuHelper.ts b/src/router/helper/menuHelper.ts
index a4d33ff4..226c12f8 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 3c3285ea..261c0bef 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 2c2a2e06..bb0b5799 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 5c1827a2..4be358c0 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 5cf4a694..d8844daa 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 68997fce..0285217e 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 0577d4ec..711f7130 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 f02944ff..79c568fe 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 b76cf463..64a60f2f 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 a7720284..1fca9b49 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 ebe523f1..b58536bd 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 2dd45706..844b6f4e 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<RouteRecordRaw, 'meta'> {
   name: string;
   meta: RouteMeta;
-- 
GitLab