From bddff450b76f519867923aa88abfe21e777e2af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AC=E6=B5=B7?= <445436867@qq.com>
Date: Thu, 30 Mar 2023 14:57:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(built-in):=20=20=E8=A7=84=E8=8C=83=20before?=
 =?UTF-8?q?Render=20=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=EF=BC=8C=E5=88=99=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=90=8E=E7=BB=AD=E7=9A=84=20router.beforeEach=20(#17?=
 =?UTF-8?q?9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复watermark插件类型问题

* fix(built-in): 避免在beforeRender action中操作路由或者location.href，构建后会出现卡死

* feat: 换更合理的方式
---
 .../plugins/route/template/routeExports.tpl   | 57 ++++++++++---------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl b/packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl
index 504f7ef9..8c94fe41 100644
--- a/packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl
+++ b/packages/fes-preset-built-in/src/plugins/route/template/routeExports.tpl
@@ -39,34 +39,37 @@ export const createRouter = (routes) => {
 
   let isInit = false
   router.beforeEach(async (to, from, next) => {
-    if(!isInit) {
-      isInit = true
-      const beforeRenderConfig = plugin.applyPlugins({
-        key: "beforeRender",
-        type: ApplyPluginsType.modify,
-        initialValue: {
-            loading: null,
-            action: null
-        },
-      });
-      if (typeof beforeRenderConfig.action === "function") {
-          const rootElement = document.createElement('div');
-          document.body.appendChild(rootElement)
-          const app = createApp(beforeRenderConfig.loading);
-          app.mount(rootElement);
-          try {
-              const initialState = await beforeRenderConfig.action({router, history});
-              updateInitialState(initialState || {})
-          } catch(e){
-              console.error(`[fes] beforeRender执行出现异常：`);
-              console.error(e);
-          }
-          app.unmount();
-          app._container.innerHTML = '';
-          document.body.removeChild(rootElement);
-      }
+    if(isInit){
+      return next()
     }
-    next();
+    isInit = true
+    const beforeRenderConfig = plugin.applyPlugins({
+      key: "beforeRender",
+      type: ApplyPluginsType.modify,
+      initialValue: {
+          loading: null,
+          action: null
+      },
+    });
+    if (typeof beforeRenderConfig.action !== "function") {
+      return next();
+    }
+    const rootElement = document.createElement('div');
+    document.body.appendChild(rootElement)
+    const app = createApp(beforeRenderConfig.loading);
+    app.mount(rootElement);
+    try {
+        const initialState = await beforeRenderConfig.action({router, history});
+        updateInitialState(initialState || {})
+        next();
+    } catch(e){
+        next(false);
+        console.error(`[fes] beforeRender执行出现异常：`);
+        console.error(e);
+    }
+    app.unmount();
+    app._container.innerHTML = '';
+    document.body.removeChild(rootElement);
   })
 
   plugin.applyPlugins({