fix: #1415 修复cache router 无效问题

remaxjs · Dec 4, 2020 · fc188c7 · fc188c7
1 parent 13680af
commit fc188c7
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/packages/remax-web/src/createApp.tsx b/packages/remax-web/src/createApp.tsx
@@ -15,6 +15,17 @@ export default function createApp(options: BootstrapOptions, history: History) {
 
   const pluginDriver = new PluginDriver(plugins.map(plugin => plugin.default || plugin));
   RuntimeOptions.apply({ pluginDriver });
+
+  const pageComponentsHoc = pages.map((page, i) => {
+    const pageComponent = async
+      ? loadable<any>(() =>
+          (pageComponents[i]() as Promise<{ default: React.ComponentType }>).then(({ default: c }) =>
+            createPageConfig(c, page.route)
+          )
+        )
+      : createPageConfig(pageComponents[i]() as React.ComponentType, page.route);
+    return pageComponent;
+  });
   return (
     <Router history={history as any}>
       <AppConfig>
@@ -26,13 +37,7 @@ export default function createApp(options: BootstrapOptions, history: History) {
             return (
               <CacheRoute key={page.route} className="remax-cached-router-wrapper" path={`/${page.route}`} exact={true}>
                 {(props: any) => {
-                  const pageComponent = async
-                    ? loadable<any>(() =>
-                        (pageComponents[i]() as Promise<{ default: React.ComponentType }>).then(({ default: c }) =>
-                          createPageConfig(c, page.route)
-                        )
-                      )
-                    : createPageConfig(pageComponents[i]() as React.ComponentType, page.route);
+                  const pageComponent = pageComponentsHoc[i];
                   return React.createElement(pageComponent, {
                     ...props,
                     pageConfig: {