feat: plugin-layou实现从rootContainer改为在根路由插入公共布局

好处：
1、布局组件涉及到router-view，需要包裹住router-view，跟rootContainer的默认参数冲突
2、布局组件的内容应该是rootContainer的最底层，但是由于rootContainer的机制，插件循序影响dom结构层级。不能保证布局的内容属于最底层

packages/fes-plugin-layout/package.json

@@ -27,6 +27,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@umijs/utils": "3.3.3"
+  },
   "peerDependencies": {
     "@ant-design/icons-vue": "^5.1.6",
     "@webank/fes": "^2.0.0",

packages/fes-plugin-layout/src/index.js

@@ -1,5 +1,6 @@
 import { readFileSync, copyFileSync, statSync } from 'fs';
 import { join } from 'path';
+import { winPath } from '@umijs/utils';
 
 const namespace = 'plugin-layout';
 
@@ -18,16 +19,18 @@ export default (api) => {
         }
     });
 
-    const absRuntimeFilePath = join(namespace, 'runtime.js');
+    api.addRuntimePluginKey(() => 'layout');
+
+    const absFilePath = join(namespace, 'index.js');
 
     api.onGenerateFiles(() => {
         // 文件写出
         const userConfig = api.config.layout || {};
 
         api.writeTmpFile({
-            path: absRuntimeFilePath,
+            path: absFilePath,
             content: Mustache.render(
-                readFileSync(join(__dirname, 'template/runtime.tpl'), 'utf-8'),
+                readFileSync(join(__dirname, 'template/index.tpl'), 'utf-8'),
                 {
                     REPLACE_USER_CONFIG: JSON.stringify(userConfig),
                     HAS_LOCALE: api.pkg.dependencies?.['@webank/fes-plugin-locale']
@@ -58,7 +61,14 @@ export default (api) => {
         });
     });
 
-    api.addRuntimePluginKey(() => 'layout');
+    // 把BaseLayout插入到路由配置中，作为跟路由
-
+    api.modifyRoutes(routes => [
-    api.addRuntimePlugin(() => `@@/${absRuntimeFilePath}`);
+        {
+            path: '/',
+            component: winPath(
+                join(api.paths.absTmpPath || '', absFilePath)
+            ),
+            children: routes
+        }
+    ]);
 };

packages/fes-plugin-layout/src/template/index.tpl

@@ -0,0 +1,41 @@
+import { reactive, defineComponent } from "vue";
+import { getRoutes, plugin, ApplyPluginsType } from "@@/core/coreExports";
+import BaseLayout from "./views/BaseLayout.vue";
+import { fillMenuData } from "./helpers";
+
+const userConfig = reactive({{{REPLACE_USER_CONFIG}}});
+
+const Layout = defineComponent({
+    name: 'Layout',
+    setup(){
+        const runtimeConfig = plugin.applyPlugins({
+            key: "layout",
+            type: ApplyPluginsType.modify,
+            initialValue: {},
+        });
+        const localeShared = plugin.getShared("locale");
+        const routeConfig = getRoutes();
+        userConfig.menus = fillMenuData(userConfig.menus, routeConfig);
+        return () => {
+            const slots = {
+                userCenter: () => {
+                    if (runtimeConfig.userCenter) {
+                        return (
+                            <runtimeConfig.userCenter></runtimeConfig.userCenter>
+                        );
+                    }
+                    return null;
+                },
+                locale: () => {
+                    if (localeShared) {
+                        return <localeShared.SelectLang></localeShared.SelectLang>;
+                    }
+                    return null;
+                },
+            };
+            return <BaseLayout {...userConfig} v-slots={slots}></BaseLayout>;
+        };
+    }
+})
+
+export default Layout;

packages/fes-plugin-layout/src/template/runtime.tpl

@@ -1,37 +0,0 @@
-import { reactive } from "vue";
-import { getRoutes, plugin, ApplyPluginsType } from "@@/core/coreExports";
-import BaseLayout from "./views/BaseLayout.vue";
-import { fillMenuData } from "./helpers";
-
-const userConfig = reactive({{{REPLACE_USER_CONFIG}}});
-export function rootContainer(childComponent, args) {
-    const runtimeConfig = plugin.applyPlugins({
-        key: "layout",
-        type: ApplyPluginsType.modify,
-        initialValue: {},
-    });
-    const localeShared = plugin.getShared("locale");
-    const routeConfig = getRoutes();
-    userConfig.menus = fillMenuData(userConfig.menus, routeConfig);
-    return () => {
-        const slots = {
-            default: () => <childComponent keepAlive={userConfig.multiTabs}></childComponent>,
-            userCenter: () => {
-                if(runtimeConfig.userCenter){
-                    return (<runtimeConfig.userCenter></runtimeConfig.userCenter>)
-                }
-                return null
-            },
-            locale: () => {
-                if(localeShared){
-                    return (<localeShared.SelectLang></localeShared.SelectLang>)
-                }
-                return null
-            }
-          };
-        return (
-            <BaseLayout {...userConfig} v-slots={slots}>
-            </BaseLayout>
-        );
-    };
-}

packages/fes-plugin-layout/src/views/BaseLayout.vue

@@ -23,24 +23,8 @@
                 <slot name="locale"></slot>
             </a-layout-header>
             <a-layout-content class="layout-content">
-                <template v-if="multiTabs">
+                <MultiTabProvider v-if="multiTabs" />
-                    <a-tabs :activeKey="route.path" @tabClick="switchTab" class="layout-content-tabs" hide-add type="editable-card">
+                <router-view v-else></router-view>
-                        <a-tab-pane v-for="page in openedPageList" :key="page.path" closable>
-                            <template #tab>
-                                {{page.name}}
-                                <ReloadOutlined v-show="route.path === page.path" @click="reloadTab(page.path)" class="layout-tabs-close-icon" />
-                            </template>
-                        </a-tab-pane>
-                    </a-tabs>
-                    <router-view v-slot="{ Component, route }">
-                        <keep-alive>
-                            <component :key="getPageKey(route)" :is="Component" />
-                        </keep-alive>
-                    </router-view>
-                </template>
-                <template v-else>
-                    <router-view></router-view>
-                </template>
             </a-layout-content>
             <a-layout-footer v-if="routeHasLayout" class="layout-footer">
                 Ant Design ©2020 Created by MumbleFe
@@ -51,18 +35,14 @@
 
 <script>
 import {
-    ref, computed, reactive, unref
+    ref, computed
 } from 'vue';
-import { useRoute, useRouter } from '@@/core/coreExports';
+import { useRoute } from '@@/core/coreExports';
 import Layout from 'ant-design-vue/lib/layout';
 import 'ant-design-vue/lib/layout/style';
-import Tabs from 'ant-design-vue/lib/tabs';
-import 'ant-design-vue/lib/tabs/style';
-import { ReloadOutlined } from '@ant-design/icons-vue';
 import Menu from './Menu';
+import MultiTabProvider from './MultiTabProvider';
 
-let i = 0;
-const getKey = () => ++i;
 
 export default {
     components: {
@@ -71,10 +51,8 @@ export default {
         [Layout.Content.name]: Layout.Content,
         [Layout.Header.name]: Layout.Header,
         [Layout.Footer.name]: Layout.Footer,
-        [Tabs.name]: Tabs,
+        Menu,
-        [Tabs.TabPane.name]: Tabs.TabPane,
+        MultiTabProvider
-        ReloadOutlined,
-        Menu
     },
     props: {
         menus: {
@@ -122,53 +100,12 @@ export default {
     },
     setup() {
         const route = useRoute();
-        const router = useRouter();
-        const openedPageList = reactive([]);
         const routeHasLayout = computed(() => {
             const _routeLayout = route.meta.layout;
             return _routeLayout === undefined ? true : _routeLayout;
         });
-        router.beforeEach((to) => {
-            if (!openedPageList.some(page => unref(page.path) === to.path)) {
-                openedPageList.push({
-                    path: to.path,
-                    route: to,
-                    name: to.meta.name,
-                    key: getKey()
-                });
-            }
-            return true;
-        });
-        // 还需要考虑参数
-        const switchTab = (path) => {
-            const selectedRoute = openedPageList.find(item => item.path === path);
-            if (selectedRoute) {
-                router.push({
-                    path,
-                    query: selectedRoute.route.query,
-                    params: selectedRoute.route.params
-                });
-            }
-        };
-        const reloadTab = (path) => {
-            const selectedPage = openedPageList.find(item => item.path === path);
-            if (selectedPage) {
-                selectedPage.key = getKey();
-            }
-        };
-        const getPageKey = (_route) => {
-            const selectedPage = openedPageList.find(item => item.path === _route.path);
-            if (selectedPage) {
-                return selectedPage.key;
-            }
-            return '';
-        };
         return {
-            getPageKey,
-            reloadTab,
-            switchTab,
             route,
-            openedPageList,
             routeHasLayout,
             collapsed: ref(false)
         };
@@ -224,25 +161,6 @@ export default {
     }
     .layout-content {
         position: relative;
-        .layout-content-tabs {
-            background: rgb(255, 255, 255);
-            margin: 0px;
-            padding-top: 6px;
-            width: 100%;
-            .ant-tabs-nav-container {
-                padding-left: 16px;
-                .layout-tabs-close-icon {
-                    vertical-align: middle;
-                    color: rgba(0, 0, 0, 0.45);
-                    font-size: 12px;
-                    margin-left: 6px;
-                    margin-top: -2px;
-                    &:hover{
-                        color: rgba(0, 0, 0, 0.8);
-                    }
-                }
-            }
-        }
     }
     .layout-footer {
         text-align: center;

packages/fes-plugin-layout/src/views/MultiTabProvider.vue

@@ -0,0 +1,111 @@
+<template>
+    <a-tabs :activeKey="route.path" @tabClick="switchTab" class="layout-content-tabs" hide-add type="editable-card">
+        <a-tab-pane v-for="page in openedPageList" :key="page.path" closable>
+            <template #tab>
+                {{page.name}}
+                <ReloadOutlined v-show="route.path === page.path" @click="reloadTab(page.path)" class="layout-tabs-close-icon" />
+            </template>
+        </a-tab-pane>
+    </a-tabs>
+    <router-view v-slot="{ Component, route }">
+        <keep-alive>
+            <component :key="getPageKey(route)" :is="Component" />
+        </keep-alive>
+    </router-view>
+</template>
+<script>
+import {
+    reactive, unref
+} from 'vue';
+import Tabs from 'ant-design-vue/lib/tabs';
+import 'ant-design-vue/lib/tabs/style';
+import { ReloadOutlined } from '@ant-design/icons-vue';
+import { useRouter, useRoute } from '@@/core/coreExports';
+
+let i = 0;
+const getKey = () => ++i;
+export default {
+    components: {
+        [Tabs.name]: Tabs,
+        [Tabs.TabPane.name]: Tabs.TabPane,
+        ReloadOutlined
+    },
+    setup() {
+        const route = useRoute();
+        const router = useRouter();
+        const openedPageList = reactive([{
+            path: unref(route.path),
+            route: {
+                query: unref(route.query),
+                params: unref(route.params)
+            },
+            name: unref(route.meta).name,
+            key: getKey()
+        }]);
+        const findPage = path => openedPageList.find(item => unref(item.path) === path);
+        router.beforeEach((to) => {
+            if (!findPage(to.path)) {
+                openedPageList.push({
+                    path: to.path,
+                    route: to,
+                    name: to.meta.name,
+                    key: getKey()
+                });
+            }
+            return true;
+        });
+        // 还需要考虑参数
+        const switchTab = (path) => {
+            const selectedPage = findPage(path);
+            if (selectedPage) {
+                router.push({
+                    path,
+                    query: selectedPage.route.query,
+                    params: selectedPage.route.params
+                });
+            }
+        };
+        const reloadTab = (path) => {
+            const selectedPage = findPage(path);
+            if (selectedPage) {
+                selectedPage.key = getKey();
+            }
+        };
+        const getPageKey = (_route) => {
+            const selectedPage = findPage(_route.path);
+            if (selectedPage) {
+                return selectedPage.key;
+            }
+            return '';
+        };
+        return {
+            route,
+            openedPageList,
+            getPageKey,
+            reloadTab,
+            switchTab
+        };
+    }
+};
+</script>
+<style lang="less">
+.layout-content-tabs {
+    background: rgb(255, 255, 255);
+    margin: 0px;
+    padding-top: 6px;
+    width: 100%;
+    .ant-tabs-nav-container {
+        padding-left: 16px;
+        .layout-tabs-close-icon {
+            vertical-align: middle;
+            color: rgba(0, 0, 0, 0.45);
+            font-size: 12px;
+            margin-left: 6px;
+            margin-top: -2px;
+            &:hover{
+                color: rgba(0, 0, 0, 0.8);
+            }
+        }
+    }
+}
+</style>

packages/fes-preset-built-in/src/plugins/generateFiles/fes/fes.tpl

@@ -8,7 +8,6 @@ import { plugin } from './core/plugin';
 import './core/pluginRegister';
 import { ApplyPluginsType } from '{{{ runtimePath }}}';
 import { getRoutes } from './core/routes/routes';
-import BaseView from './core/routes/baseView';
 
 {{{ imports }}}
 
@@ -19,9 +18,7 @@ const renderClient = (opts = {}) => {
     const rootContainer = plugin.applyPlugins({
         type: ApplyPluginsType.modify,
         key: 'rootContainer',
-        initialValue: defineComponent((props) => {
+        initialValue: defineComponent(() => () => (<RouterView></RouterView>)),
-            return () => (<BaseView {...props}></BaseView>)
-        }),
         args: {
             routes: routes,
             plugin: plugin

packages/fes-preset-built-in/src/plugins/misc/route/index.js

@@ -250,8 +250,6 @@ export default function (api) {
 
     const absRuntimeFilePath = join(namespace, 'runtime.js');
 
-    const baseViewFilePath = join(namespace, 'baseView.vue');
-
     api.onGenerateFiles(async () => {
         const routesTpl = readFileSync(join(__dirname, 'template/routes.tpl'), 'utf-8');
         const routes = await api.getRoutesJSON();
@@ -269,11 +267,6 @@ export default function (api) {
             path: absRuntimeFilePath,
             content: readFileSync(join(__dirname, 'template/runtime.tpl'), 'utf-8')
         });
-
-        api.writeTmpFile({
-            path: baseViewFilePath,
-            content: readFileSync(join(__dirname, 'template/baseView.vue'), 'utf-8')
-        });
     });
 
     api.addCoreExports(() => [

packages/fes-preset-built-in/src/plugins/misc/route/template/baseView.vue

@@ -1,22 +0,0 @@
-<template>
-    <template v-if="keepAlive">
-        <router-view v-slot="{ Component }">
-            <keep-alive>
-                <component :is="Component" />
-            </keep-alive>
-        </router-view>
-    </template>
-    <template v-else>
-        <router-view></router-view>
-    </template>
-</template>
-<script>
-export default {
-    props: {
-        keepAlive: {
-            type: Boolean,
-            default: false
-        }
-    }
-};
-</script>