wip

tangtanglove · tangtanglove · commit 27bfab2f8710 · 2021-07-14T21:51:48.000+08:00
diff --git a/.umirc.ts b/.umirc.ts
@@ -19,9 +19,9 @@ export default defineConfig({
     { path: '/index', component: '@/pages/Index/index' },
   ],
   fastRefresh: {},
-  // qiankun: {
-  //   master: {
-  //     apps:[]
-  //   }
-  // }
+  qiankun: {
+    master: {
+      apps:[]
+    }
+  }
 });
diff --git a/public/apps/app1.html b/public/apps/app1.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>这是APP1</title>
+  </head>
+  <body>
+    这是微前端测试页，我是APP1！
+  </body>
+</html>
diff --git a/public/config.json b/public/config.json
@@ -3,7 +3,7 @@
   "apps": [
     {
       "name": "app1",
-      "entry": "//www.baidu.com"
+      "entry": "/apps/app1.html"
     }
   ]
 }
diff --git a/src/components/Render.tsx b/src/components/Render.tsx
@@ -124,10 +124,10 @@ const Render: React.FC<any> = (props:any) => {
         key: 'login',
         component: <Login {...body} callback={callback} data={data} />
       },
-      // {
-      //   key: 'microApp',
-      //   component: <MicroApp {...body} callback={callback} data={data} />
-      // },
+      {
+        key: 'microApp',
+        component: <MicroApp {...body} callback={callback} data={data} />
+      },
       {
         key: 'tpl',
         component: <>{ tplEngine(body.body,data) }</>
diff --git a/src/pages/document.ejs b/src/pages/document.ejs
@@ -13,7 +13,7 @@
   </head>
   <body>
     <noscript>Out-of-the-box mid-stage front/design solution!</noscript>
-    <div id="root">
+    <div id="root-master">
       <style>
         html,
         body,

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"apps": [`
`4`	`4`	`{`
`5`	`5`	`"name": "app1",`
`6`		`- "entry": "//www.baidu.com"`
	`6`	`+ "entry": "/apps/app1.html"`
`7`	`7`	`}`
`8`	`8`	`]`
`9`	`9`	`}`