From 5a71f2999d91a890c85d8eda81e1cfe0e14430a2 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Mon, 6 Jun 2022 17:40:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B9=BE=E5=9D=A4=E5=A2=9E=E5=8A=A0ent?=
 =?UTF-8?q?ry=E9=85=8D=E7=BD=AE,=E7=94=A8=E4=BA=8E=E5=8C=BA=E5=88=AB?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80name=E4=B8=8D=E5=90=8C=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=94=A8=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/fes-plugin-qiankun/examples/main/.fes.js            | 2 +-
 .../fes-plugin-qiankun/examples/main/src/pages/index.vue     | 1 +
 packages/fes-plugin-qiankun/src/main/modifyRoutes.js         | 5 +++--
 packages/fes-plugin-qiankun/src/main/runtime/MicroApp.tpl    | 3 ++-
 .../src/main/runtime/MicroAppWithMemoHistory.tpl             | 1 +
 .../src/main/runtime/getMicroAppRouteComponent.tpl           | 3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/fes-plugin-qiankun/examples/main/.fes.js b/packages/fes-plugin-qiankun/examples/main/.fes.js
index 3bd8f471..051e0203 100644
--- a/packages/fes-plugin-qiankun/examples/main/.fes.js
+++ b/packages/fes-plugin-qiankun/examples/main/.fes.js
@@ -10,7 +10,7 @@ export default {
     layout: {
         title: "Fes.js",
         footer: 'Created by MumbleFE',
-        multiTabs: true,
+        multiTabs: false,
         navigation: 'mixin',
         menus: [{
             name: 'index',
diff --git a/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue b/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
index 7e91d6fb..c5de2175 100644
--- a/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
+++ b/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
@@ -1,6 +1,7 @@
 <template>
     <div>
         main
+        <input />
         <FTabs v-model="activeKey">
             <FTabPane name="Tab 1" value="1">
                 <MicroAppWithMemoHistory key="1" name="app1" url="/app1" a="1" />
diff --git a/packages/fes-plugin-qiankun/src/main/modifyRoutes.js b/packages/fes-plugin-qiankun/src/main/modifyRoutes.js
index 62f691d7..fbad283d 100644
--- a/packages/fes-plugin-qiankun/src/main/modifyRoutes.js
+++ b/packages/fes-plugin-qiankun/src/main/modifyRoutes.js
@@ -2,11 +2,11 @@ import { defaultHistoryType } from '../constants';
 
 function getMicroApp(options) {
     const {
-        key, microAppName, masterHistoryType, base, namespace, ...normalizedRouteProps
+        key, microAppName, entry, masterHistoryType, base, namespace, ...normalizedRouteProps
     } = options;
     return `(() => {
 const { getMicroAppRouteComponent } = require('@@/${namespace}/getMicroAppRouteComponent');
-return getMicroAppRouteComponent({key: '${key}', appName: '${microAppName}', base: '${base}', masterHistoryType: '${masterHistoryType}', routeProps: ${JSON.stringify(normalizedRouteProps)} })
+return getMicroAppRouteComponent({key: '${key}', appName: '${microAppName}', entry: '${entry}', base: '${base}', masterHistoryType: '${masterHistoryType}', routeProps: ${JSON.stringify(normalizedRouteProps)} })
 })()`;
 }
 
@@ -19,6 +19,7 @@ function modifyRoutesWithAttachMode({
                 if (route.meta && route.meta.microApp) {
                     route.component = getMicroApp({
                         key: route.path,
+                        entry: route.meta.entry ?? route.path,
                         microAppName: route.meta.microApp,
                         masterHistoryType,
                         base,
diff --git a/packages/fes-plugin-qiankun/src/main/runtime/MicroApp.tpl b/packages/fes-plugin-qiankun/src/main/runtime/MicroApp.tpl
index 12d72596..6c479d86 100644
--- a/packages/fes-plugin-qiankun/src/main/runtime/MicroApp.tpl
+++ b/packages/fes-plugin-qiankun/src/main/runtime/MicroApp.tpl
@@ -28,6 +28,7 @@ export const MicroApp = defineComponent({
             type: String,
             required: true
         },
+        entry: String,
         settings: Object,
         props: Object,
         lifeCycles: Object
@@ -80,7 +81,7 @@ export const MicroApp = defineComponent({
             const app = loadMicroApp(
                 {
                     // 保证唯一
-                    name: `${name}`,
+                    name: `${name}_${props.entry || ''}`,
                     entry: entry,
                     container: containerRef.value,
                     props: {...propsConfigRef.value}
diff --git a/packages/fes-plugin-qiankun/src/main/runtime/MicroAppWithMemoHistory.tpl b/packages/fes-plugin-qiankun/src/main/runtime/MicroAppWithMemoHistory.tpl
index f14e748a..58bfe3ac 100644
--- a/packages/fes-plugin-qiankun/src/main/runtime/MicroAppWithMemoHistory.tpl
+++ b/packages/fes-plugin-qiankun/src/main/runtime/MicroAppWithMemoHistory.tpl
@@ -14,6 +14,7 @@ export const MicroAppWithMemoHistory = defineComponent({
             type: String,
             required: true
         },
+        entry: String,
         settings: Object,
         props: Object,
         lifeCycles: Object,
diff --git a/packages/fes-plugin-qiankun/src/main/runtime/getMicroAppRouteComponent.tpl b/packages/fes-plugin-qiankun/src/main/runtime/getMicroAppRouteComponent.tpl
index 074ab2cf..8a674320 100644
--- a/packages/fes-plugin-qiankun/src/main/runtime/getMicroAppRouteComponent.tpl
+++ b/packages/fes-plugin-qiankun/src/main/runtime/getMicroAppRouteComponent.tpl
@@ -3,10 +3,11 @@ import { MicroApp } from './MicroApp';
 export function getMicroAppRouteComponent({
   key,
   appName,
+  entry,
   base,
   masterHistoryType,
   routeProps
 }) {
 
-  return <MicroApp key={key} base={base} masterHistoryType={masterHistoryType} name={appName} {...routeProps} />;
+  return <MicroApp key={key} base={base} masterHistoryType={masterHistoryType} name={appName} entry={entry} {...routeProps} />;
 }