Merge branch 'vue3' of https://github.com/WeBankFinTech/fes.js into vue3

2025-04-05 19:41:57 +08:00 · 2021-05-26 14:53:18 +08:00 · 2021-05-26 14:53:18 +08:00 · e15a350f6c
commit e15a350f6c
parent f9f735c3a6 be7c534e24
14 changed files with 59 additions and 35 deletions
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-rc.25",
+  "version": "2.0.0-rc.26",
  "changelog": {
    "repo": "WeBankFinTech/fes.js",
    "cacheDir": ".changelog",
--- a/packages/create-fes-app/package.json
+++ b/packages/create-fes-app/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/create-fes-app",
-  "version": "2.0.0-rc.23",
+  "version": "2.0.0-rc.26",
  "description": "create a app base on fes.js",
  "main": "lib/index.js",
  "files": [
--- a/packages/fes-plugin-qiankun/examples/app1/src/app.js
+++ b/packages/fes-plugin-qiankun/examples/app1/src/app.js
@ -10,3 +10,22 @@ export const beforeRender = {
        });
    }
 };
+
+export const qiankun = {
+    // 应用加载之前
+    async bootstrap(props) {
+        console.log('app1 bootstrap', props);
+    },
+    // 应用 render 之前触发
+    async mount(props) {
+        console.log('app1 mount', props);
+    },
+    // 当 props 更新时触发
+    async update(props) {
+        console.log('app1 update', props);
+    },
+    // 应用卸载之后触发
+    async unmount(props) {
+        console.log('app1 unmount', props);
+    }
+};
--- a/packages/fes-plugin-qiankun/examples/app1/src/pages/app1/test.vue
+++ b/packages/fes-plugin-qiankun/examples/app1/src/pages/app1/test.vue
@ -5,8 +5,8 @@
 </template>
 <config>
 {
-    "name": "index",
-    "title": "home"
+    "name": "test",
+    "title": "test"
 }
 </config>
 <script>
--- a/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
+++ b/packages/fes-plugin-qiankun/examples/main/src/pages/index.vue
@ -2,7 +2,7 @@
    <div>
        main
        <a-tabs v-model:activeKey="activeKey">
-            <a-tab-pane key="1" tab="Tab 1"> <MicroAppWithMemoHistory key="1" name="app1" url="/app1" /></a-tab-pane>
+            <a-tab-pane key="1" tab="Tab 1"><MicroAppWithMemoHistory key="1" name="app1" url="/app1" /></a-tab-pane>
            <a-tab-pane key="2" tab="Tab 2"><MicroAppWithMemoHistory key="2" name="app1" url="/app1/test" /></a-tab-pane>
            <a-tab-pane key="3" tab="Tab 3">Content of Tab Pane 3</a-tab-pane>
        </a-tabs>
--- a/packages/fes-plugin-qiankun/package.json
+++ b/packages/fes-plugin-qiankun/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-qiankun",
-  "version": "2.0.0-rc.24",
+  "version": "2.0.0-rc.26",
  "description": "@fesjs/plugin-qiankun",
  "main": "lib/index.js",
  "files": [
--- a/packages/fes-plugin-qiankun/src/micro/runtime/lifecycles.tpl
+++ b/packages/fes-plugin-qiankun/src/micro/runtime/lifecycles.tpl
@ -38,9 +38,11 @@ function getSlaveRuntime() {
 // 子应用生命周期钩子Bootstrap
 export function genBootstrap(oldRender, appPromise) {
    return async (props) => {
-        const slaveRuntime = getSlaveRuntime();
-        if (slaveRuntime.bootstrap) {
-            await slaveRuntime.bootstrap(props);
+        if (typeof props !== 'undefined') {
+            const slaveRuntime = getSlaveRuntime();
+            if (slaveRuntime.bootstrap) {
+                await slaveRuntime.bootstrap(props);
+            }
        }
        render = oldRender;
        if (isPromise(appPromise)) {
@ -61,23 +63,22 @@ export function genMount(mountElementId) {
            if (slaveRuntime.mount) {
                await slaveRuntime.mount(props);
            }
-        }
+             // 更新 clientRender 配置
+            const clientRenderOpts = {
+                // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
+                // 避免多个子应用出现在同一主应用时出现 mount 冲突
+                rootElement:
+                    props?.container?.querySelector(mountElementId) || mountElementId
+            };

-        // 更新 clientRender 配置
-        const clientRenderOpts = {
-            // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
-            // 避免多个子应用出现在同一主应用时出现 mount 冲突
-            rootElement:
-                props?.container?.querySelector(mountElementId) || mountElementId
-        };
+            clientRenderOptsStack.push(clientRenderOpts);

-        clientRenderOptsStack.push(clientRenderOpts);
-
-        if(props.url){
-            history.url = props.url || '/';
-        }
-        if(props.onRouterInit){
-            history.onRouterInit = props.onRouterInit;
+            if(props.url){
+                history.url = props.url || '/';
+            }
+            if(props.onRouterInit){
+                history.onRouterInit = props.onRouterInit;
+            }
        }

        // 第一次 mount 会自动触发 render，非第一次 mount 则需手动触发
--- a/packages/fes-plugin-request/package.json
+++ b/packages/fes-plugin-request/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/plugin-request",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.26",
  "description": "@fesjs/plugin-request",
  "main": "lib/index.js",
  "files": [
@ -34,4 +34,4 @@
    "axios": "0.21.1",
    "@fesjs/compiler": "^2.0.0-rc.5"
  }
-}
+}
--- a/packages/fes-preset-built-in/package.json
+++ b/packages/fes-preset-built-in/package.json
@ -1,6 +1,6 @@
 {
  "name": "@fesjs/preset-built-in",
-  "version": "2.0.0-rc.24",
+  "version": "2.0.0-rc.26",
  "description": "@fesjs/preset-built-in",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@ -72,4 +72,4 @@
    "webpack-dev-server": "^3.11.2",
    "webpackbar": "^5.0.0-3"
  }
-}
+}
--- a/packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl
+++ b/packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl
@ -31,7 +31,7 @@ const renderClient = (opts = {}) => {
    plugin.applyPlugins({
        key: 'onAppCreated',
        type: ApplyPluginsType.event,
-        args: { app },
+        args: { app, routes },
    });

    if (rootElement) {
--- a/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl
+++ b/packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl
@ -16,7 +16,7 @@ export function getRoutes() {
 const ROUTER_BASE = '{{{ routerBase }}}';
 let router = null;
 let history = null;
-export const createRouter = () => {
+export const createRouter = (routes) => {
  if (router) {
    return router;
  }
@ -27,7 +27,7 @@ export const createRouter = () => {
  });
  router = createVueRouter({
    history,
-    routes: getRoutes()
+    routes
  });

  plugin.applyPlugins({
--- a/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl
+++ b/packages/fes-preset-built-in/src/plugins/misc/route/template/runtime.tpl
@ -1,6 +1,6 @@
 import { createRouter } from "./routes";

-export function onAppCreated({ app }) {
-    const router = createRouter();
+export function onAppCreated({ app, routes }) {
+    const router = createRouter(routes);
    app.use(router);
 }
--- a/packages/fes-template-h5/src/app.js
+++ b/packages/fes-template-h5/src/app.js
@ -12,3 +12,7 @@ export const request = {
        }
    }
 };
+
+export function patchRoutes() {
+    console.log('patchRoutes');
+}
--- a/packages/fes/package.json
+++ b/packages/fes/package.json
@ -1,6 +1,6 @@
 {
    "name": "@fesjs/fes",
-    "version": "2.0.0-rc.24",
+    "version": "2.0.0-rc.26",
    "description": "一个好用的前端管理台快速开发框架",
    "preferGlobal": true,
    "scripts": {
@ -40,7 +40,7 @@
    ],
    "dependencies": {
        "@fesjs/compiler": "^2.0.0-rc.5",
-        "@fesjs/preset-built-in": "^2.0.0-rc.24",
+        "@fesjs/preset-built-in": "^2.0.0-rc.26",
        "@fesjs/runtime": "^2.0.0-rc.5",
        "@umijs/utils": "3.3.3",
        "resolve-cwd": "^3.0.0"