From e90ef54dec3d703a39a67b350ff984b7a073ae48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=BD=E8=83=9C=E5=AE=87?= Date: Fri, 17 Dec 2021 14:38:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(qiankun):=20=E8=BF=90=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=94=AF=E6=8C=81insert=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=86=99=E5=85=A5=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=B5=8C=E5=A5=97?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=A4=E7=A7=8D=E5=86=99=E5=85=A5=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20(#751)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-qiankun/src/master/masterRuntimePlugin.ts.tpl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/plugin-qiankun/src/master/masterRuntimePlugin.ts.tpl b/packages/plugin-qiankun/src/master/masterRuntimePlugin.ts.tpl index c7939961..f352ed85 100644 --- a/packages/plugin-qiankun/src/master/masterRuntimePlugin.ts.tpl +++ b/packages/plugin-qiankun/src/master/masterRuntimePlugin.ts.tpl @@ -29,9 +29,14 @@ async function getMasterRuntime() { // modify route with "microApp" attribute to use real component function patchMicroAppRouteComponent(routes: IRouteProps[]) { + const { routeBindingAlias, base, masterHistoryType } = getMasterOptions() as MasterOptions; + const insertRoutes = microAppRuntimeRoutes.filter(r => r.insert); // 先处理 insert 配置 insertRoutes.forEach(route => { + // 转化insert配置变更成 micro组件 + patchMicroAppRoute(route, getMicroAppRouteComponent, { base, masterHistoryType, routeBindingAlias }); + // 将转换后的micro组件，插入对应路由 insertRoute(routes, route); }); @@ -51,7 +56,6 @@ function patchMicroAppRouteComponent(routes: IRouteProps[]) { const rootRoutes = getRootRoutes(routes); if (rootRoutes) { - const { routeBindingAlias, base, masterHistoryType } = getMasterOptions() as MasterOptions; const microAppAttachedRoutes = microAppRuntimeRoutes.filter(r => !r.insert); microAppAttachedRoutes.reverse().forEach(microAppRoute => { const patchRoute = (route: IRouteProps) => {