diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index f8f35a9..a2cb766 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -192,8 +192,8 @@ export const generatedRoutes: GeneratedRoute[] = [ { name: 'login', path: '/login', - component: 'layout.blank', - redirectTo: 'pwd-login', + component: 'layout.undefined', + redirect: 'pwd-login', layout: 'blank', meta: { title: 'login', diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index a9b288c..3d135d5 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -9,8 +9,8 @@ import type { LazyRouteFunction, RouteObject,IndexRouteObject } from "react-rout import type { FunctionComponent } from "react"; import type { ElegantConstRoute } from '@ohh-889/react-auto-route'; import type { RouteMap, RouteKey, RoutePath } from '@elegant-router/types'; -import { redirect } from 'react-router-dom' -import ErrorBoundary from '../../../ErrorBoundary.tsx' +import { redirect as redirectTo } from 'react-router-dom' +import ErrorBoundary from "../../../ErrorBoundary.tsx" type CustomRouteObject = Omit & { @@ -94,7 +94,7 @@ export function transformElegantRouteToReactRoute( } - const { name,props, path,meta, component, children,redirectTo,layout,loader, ...rest } = route; + const { name,props, path,meta, component, children,redirect,layout,loader, ...rest } = route; const reactRoute = {id:name, path,handle: { ...meta @@ -172,15 +172,15 @@ export function transformElegantRouteToReactRoute( if (children?.length) { reactRoute.children = children.flatMap(child => transformElegantRouteToReactRoute(child, layouts, views)); - const defaultRedirectPath = redirectTo || getRedirectPath(path as string, children[0].path as string); + const defaultRedirectPath = redirect || getRedirectPath(path as string, children[0].path as string); reactRoute.children.unshift({ index: true, - loader: () => redirect(defaultRedirectPath), + loader: () => redirectTo(defaultRedirectPath), ...rest }); - }else if (redirectTo) { - reactRoute.loader=()=>redirect(redirectTo) + }else if (redirect) { + reactRoute.loader=()=>redirectTo(redirect) } if (loader) { diff --git a/src/router/routes/builtin.ts b/src/router/routes/builtin.ts index 71b6930..e43541b 100644 --- a/src/router/routes/builtin.ts +++ b/src/router/routes/builtin.ts @@ -5,7 +5,7 @@ import { getRoutePath } from '../elegant/transform'; export const ROOT_ROUTE: CustomRoute = { name: 'root', path: '/', - redirectTo: getRoutePath(import.meta.env.VITE_ROUTE_HOME) || '/home', + redirect: getRoutePath(import.meta.env.VITE_ROUTE_HOME) || '/home', meta: { title: 'root', constant: true