fix(projects): fixed hook not being used in routing files with parame…

…ters & component layout appears undefined
mufeng889 · Aug 26, 2024 · 1cdc3bc · 1cdc3bc
1 parent 0e9496a
commit 1cdc3bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/route-core/const.ts b/src/route-core/const.ts
@@ -121,8 +121,11 @@ export const generatedRoutes: GeneratedRoute[] = [];
 
 
 
-    if (config.layout||oldRoute.layout) {
-      updatedRoute.component = 'layout.'+ config.layout||oldRoute.layout;
+
+    if (config.layout || oldRoute.layout) {
+      const layout = config.layout || oldRoute.layout;
+
+      updatedRoute.component = `layout.${layout}`;
     }else if (oldRoute.component && component) {
       if (isFirstLevel) {
         const { layoutName: oldLayoutName } = resolveFirstLevelRouteComponent(oldRoute.component);

diff --git a/src/route-core/transform.ts b/src/route-core/transform.ts
@@ -176,7 +176,7 @@ export function transformElegantRouteToReactRoute(
           reactRoute.lazy = async () => {
            const data= (await views[viewName]()).Component as FunctionComponent
             return {
-            element: data(props) ,
+            Component: ()=>data(props) ,
             ErrorBoundary: null
             }
           }