From 0f3a4e793a05df4fbc169828a116c8b7d7b6ce72 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Thu, 16 Dec 2021 16:25:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(plugin-layout):=20=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=94=AF=E6=8C=81=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .npmrc                                        |  1 +
 docs/reference/plugin/plugins/layout.md       | 34 +++++++++++++++----
 docs/zh/reference/plugin/plugins/layout.md    | 32 ++++++++++++++---
 .../src/runtime/views/BaseLayout.vue          | 22 +++++++-----
 4 files changed, 69 insertions(+), 20 deletions(-)
 create mode 100644 .npmrc

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000..7f082f23
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+registry=https://registry.npmmirror.com
\ No newline at end of file
diff --git a/docs/reference/plugin/plugins/layout.md b/docs/reference/plugin/plugins/layout.md
index 4725b956..9dc05e16 100644
--- a/docs/reference/plugin/plugins/layout.md
+++ b/docs/reference/plugin/plugins/layout.md
@@ -109,35 +109,35 @@ export default {
     },
 ```
 
-### footer
+#### footer
 - **类型**：`String`
   
 - **默认值**：`null`
 
 - **详情**：页面底部的文字。
 
-### theme
+#### theme
 - **类型**：`String`
   
 - **默认值**：`dark`
 
 - **详情**：主题，可选有 `dark`、`light`
 
-### navigation
+#### navigation
 - **类型**：`String`
   
 - **默认值**：`side`
 
 - **详情**：页面布局类型，可选有 `side`、 `top`、 `mixin` 
 
-### fixedHeader
+#### fixedHeader
 - **类型**：`Boolean`
   
 - **默认值**：`false`
 
 - **详情**：是否固定头部，不跟随页面滚动。
 
-### fixedSideBar
+#### fixedSideBar
 - **类型**：`Boolean`
   
 - **默认值**：`true`
@@ -179,7 +179,7 @@ export default {
 
 - **详情**：菜单配置，子项具体配置如下：
   
-  - **name**：菜单的名称。通过匹配 `name` 和路由元信息 [meta](http://localhost:8080/zh/guide/route.html#%E6%89%A9%E5%B1%95%E8%B7%AF%E7%94%B1%E5%85%83%E4%BF%A1%E6%81%AF) 中的 `name`，把菜单和路由关联起来，然后使用路由元信息补充菜单配置，比如 `title`、`path` 等。
+  - **name**：菜单的名称。通过匹配 `name` 和路由元信息 [meta](../../../guide/route.md#扩展路由元信息) 中的 `name`，把菜单和路由关联起来，然后使用路由元信息补充菜单配置，比如 `title`、`path` 等。
   
   - **path**：菜单的路径，可配置第三方地址。
   
@@ -211,6 +211,28 @@ export const layout = {
 };
 
 ```
+
+#### top
+- **类型**：`String`
+  
+- **默认值**：`true`
+
+- **详情**：是否显示 top 区域。
+
+#### side
+- **类型**：`String`
+  
+- **默认值**：`true`
+
+- **详情**：是否显示 side 区域。
+
+#### top
+- **类型**：`String`
+  
+- **默认值**：`true`
+
+- **详情**：是否显示 top 区域。
+
 #### customHeader
 - **类型**：Vue Component
   
diff --git a/docs/zh/reference/plugin/plugins/layout.md b/docs/zh/reference/plugin/plugins/layout.md
index 1d154c87..9dc05e16 100644
--- a/docs/zh/reference/plugin/plugins/layout.md
+++ b/docs/zh/reference/plugin/plugins/layout.md
@@ -109,35 +109,35 @@ export default {
     },
 ```
 
-### footer
+#### footer
 - **类型**：`String`
   
 - **默认值**：`null`
 
 - **详情**：页面底部的文字。
 
-### theme
+#### theme
 - **类型**：`String`
   
 - **默认值**：`dark`
 
 - **详情**：主题，可选有 `dark`、`light`
 
-### navigation
+#### navigation
 - **类型**：`String`
   
 - **默认值**：`side`
 
 - **详情**：页面布局类型，可选有 `side`、 `top`、 `mixin` 
 
-### fixedHeader
+#### fixedHeader
 - **类型**：`Boolean`
   
 - **默认值**：`false`
 
 - **详情**：是否固定头部，不跟随页面滚动。
 
-### fixedSideBar
+#### fixedSideBar
 - **类型**：`Boolean`
   
 - **默认值**：`true`
@@ -211,6 +211,28 @@ export const layout = {
 };
 
 ```
+
+#### top
+- **类型**：`String`
+  
+- **默认值**：`true`
+
+- **详情**：是否显示 top 区域。
+
+#### side
+- **类型**：`String`
+  
+- **默认值**：`true`
+
+- **详情**：是否显示 side 区域。
+
+#### top
+- **类型**：`String`
+  
+- **默认值**：`true`
+
+- **详情**：是否显示 top 区域。
+
 #### customHeader
 - **类型**：Vue Component
   
diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
index 08f30c4f..cd3ae9e8 100644
--- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
+++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
@@ -70,7 +70,7 @@
 
 <script>
 import { ref, computed } from 'vue';
-import { useRoute } from '@@/core/coreExports';
+import { useRoute, plugin, ApplyPluginsType } from '@@/core/coreExports';
 import Layout from 'ant-design-vue/lib/layout';
 import 'ant-design-vue/lib/layout/style/css';
 import Menu from './Menu';
@@ -135,26 +135,30 @@ export default {
     setup(props) {
         const collapsed = ref(false);
         const route = useRoute();
-        const routeLayoutDefault = {
-            side: true,
-            top: true,
-            logo: true
-        };
+        const runtimeConfig = plugin.applyPlugins({
+            key: 'layout',
+            type: ApplyPluginsType.modify,
+            initialValue: {
+                side: true,
+                top: true,
+                logo: true
+            }
+        });
         const routeLayout = computed(() => {
             let config;
             // meta 中 layout 默认为 true
             const metaLayoutConfig = route.meta.layout === undefined ? true : route.meta.layout;
             if (typeof metaLayoutConfig === 'boolean') {
-                config = metaLayoutConfig ? routeLayoutDefault : false;
+                config = metaLayoutConfig ? runtimeConfig : false;
             } else if (typeof metaLayoutConfig === 'object') {
-                config = { ...routeLayoutDefault, ...metaLayoutConfig };
+                config = { ...runtimeConfig, ...metaLayoutConfig };
             } else {
                 console.error('[plugin-layout]: meta layout must be object or boolean！');
             }
             // query 中 layout 默认为 false
             const routeQueryLayoutConfig = route.query.layout && JSON.parse(route.query.layout);
             if (typeof routeQueryLayoutConfig === 'boolean') {
-                config = routeQueryLayoutConfig ? routeLayoutDefault : false;
+                config = routeQueryLayoutConfig ? runtimeConfig : false;
             } else if (typeof routeQueryLayoutConfig === 'object') {
                 config = { ...config, ...routeQueryLayoutConfig };
             } else if (routeQueryLayoutConfig !== undefined) {