Merge pull request #180 from sunhao1256/main

fix(projects): not only `/login` claim dynamic path scenario
soybeanjs · Feb 14, 2023 · 960b436 · 960b436 · vercel · Feb 14, 2023
2 parents 3503dff + 6059891
commit 960b436
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/typings/route.d.ts b/src/typings/route.d.ts
@@ -28,11 +28,11 @@ declare namespace AuthRoute {
   type RouteComponentType = 'basic' | 'blank' | 'multi' | 'self';
 
   /** 路由描述 */
-  interface RouteMeta {
+  interface RouteMeta<K extends AuthRoute.RoutePath> {
     /** 路由标题(可用来作document.title或者菜单的名称) */
     title: string;
     /** 路由的动态路径(需要动态路径的页面需要将path添加进范型参数) */
-    dynamicPath?: AuthRouteUtils.GetDynamicPath<'/login'>;
+    dynamicPath?: AuthRouteUtils.GetDynamicPath<K>;
     /** 作为单级路由的父级路由布局组件 */
     singleLayout?: Extract<RouteComponentType, 'basic' | 'blank'>;
     /** 需要登录权限 */
@@ -83,7 +83,7 @@ declare namespace AuthRoute {
         /** 子路由 */
         children?: Route[];
         /** 路由描述 */
-        meta: RouteMeta;
+        meta: RouteMeta<RoutePath<K>>;
       } & Omit<import('vue-router').RouteRecordRaw, 'name' | 'path' | 'redirect' | 'component' | 'children' | 'meta'>
     : never;
 

diff --git a/src/typings/router.d.ts b/src/typings/router.d.ts
@@ -1,5 +1,5 @@
 import 'vue-router';
 
 declare module 'vue-router' {
-  interface RouteMeta extends AuthRoute.RouteMeta {}
+  interface RouteMeta extends AuthRoute.RouteMeta<AuthRoute.RoutePath> {}
 }