github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-27 14:13:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(types): fix routing type error #145

Browse Source
This commit is contained in:
vben
2020-12-23 21:51:22 +08:00
parent 7db0c5c49f
commit b6e5c3f625
14 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/types.ts
View File

@@ -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>);

2
src/router/helper/menuHelper.ts
View File

@@ -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';

2
src/router/menus/modules/dashboard.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/charts.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/comp.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/excel.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/feat.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/iframe.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/level.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/page.ts
View File

@@ -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 = {

2
src/router/menus/modules/demo/permission.ts
View File

@@ -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 = {

2
src/router/menus/modules/home.ts
View File

@@ -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 = {

5
src/router/types.d.ts → src/router/types.ts
View File

@@ -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;