diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 69ff070..6e96324 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -42,7 +42,7 @@ export const generatedRoutes: GeneratedRoute[] = [ { name: 'about', path: '/about', - component: 'layout.base$view._builtin_about', + component: 'layout.base$view.about', meta: { title: 'about', i18nKey: 'route.about', @@ -171,7 +171,7 @@ export const generatedRoutes: GeneratedRoute[] = [ { name: 'home', path: '/home', - component: 'layout.base$view._builtin_home', + component: 'layout.base$view.home', meta: { title: 'home', i18nKey: 'route.home', diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts index ef237c0..ceb42b5 100644 --- a/src/typings/elegant-router.d.ts +++ b/src/typings/elegant-router.d.ts @@ -36,30 +36,12 @@ declare module "@elegant-router/types" { /** * the first level route key, which contain the layout of the route */ - export type FirstLevelRouteKey = Extract< - RouteKey, - | "403" - | "404" - | "500" - | "about" - | "function" - | "home" - | "login" - | "manage" - | "user" - | "user-center" - | "uui" - >; + export type FirstLevelRouteKey = string; /** * the custom first level route key */ - export type CustomFirstLevelRouteKey = Extract< - CustomRouteKey, - | "root" - | "not-found" - | "exception" - >; + export type CustomFirstLevelRouteKey = string; /** * the last level route key, which has the page file @@ -69,14 +51,7 @@ declare module "@elegant-router/types" { /** * the custom last level route key */ - export type CustomLastLevelRouteKey = Extract< - CustomRouteKey, - | "root" - | "not-found" - | "exception_403" - | "exception_404" - | "exception_500" - >; + export type CustomLastLevelRouteKey = string; /** * the single level route key @@ -123,8 +98,10 @@ declare module "@elegant-router/types" { type SingleLevelRoute = K extends string ? Omit & { name: K; - path: string; - component: `layout.${RouteLayout}$view.${K}`; + path: K; + meta?: Record; + component?: `layout.${RouteLayout}$view.${K}` | `layout.${RouteLayout}` | `view.${K}` ; + children?: SingleLevelRoute[]; } : never; @@ -156,7 +133,7 @@ declare module "@elegant-router/types" { type MultiLevelRoute = K extends string ? ElegantConstRoute & { name: K; - path: string; + path: K; component: `layout.${RouteLayout}`; children: (CenterLevelRoute> | LastLevelRoute>)[]; } diff --git a/src/views/user/vip/index.vue b/src/views/user/vip/index.vue new file mode 100644 index 0000000..e7e3f20 --- /dev/null +++ b/src/views/user/vip/index.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/views/uui/kv/index.vue b/src/views/uui/kv/index.vue deleted file mode 100644 index e69de29..0000000