From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期四, 14 十二月 2023 16:17:12 +0800 Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/types/router.d.ts | 45 ++++++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/types/router.d.ts b/src/types/router.d.ts index b60b831..f920921 100644 --- a/src/types/router.d.ts +++ b/src/types/router.d.ts @@ -1,36 +1,35 @@ -import { RouteRecordRaw } from 'vue-router'; - +import { LocationQuery, type RouteMeta as VRouteMeta } from 'vue-router'; declare module 'vue-router' { - type RouteOption = { - hidden?: boolean; + interface RouteMeta extends VRouteMeta { + link?: string; + title?: string; + affix?: boolean; + noCache?: boolean; + activeMenu?: string; + icon?: string; + breadcrumb?: boolean; + } + + interface _RouteRecordBase { + hidden?: boolean | string | number; permissions?: string[]; roles?: string[]; - component?: any; - children?: RouteOption[]; alwaysShow?: boolean; - parentPath?: string; - meta?: { - title: string; - icon: string; - }; query?: string; - } & RouteRecordRaw; + parentPath?: string; + } interface _RouteLocationBase { - children?: RouteOption[]; + children?: _RouteRecordBase[]; + path?: string; } - interface RouteLocationOptions { + interface TagView { fullPath?: string; - } - - interface TagView extends Partial<_RouteLocationBase> { + name?: string; + path?: string; title?: string; - meta?: { - link?: string; - title?: string; - affix?: boolean; - noCache?: boolean; - }; + meta?: RouteMeta; + query?: LocationQuery; } } -- Gitblit v1.9.3