From 56df1fba3bfcb4a25b7b57936f915c01cfe1d174 Mon Sep 17 00:00:00 2001
From: harrywan <harrywan@webank.com>
Date: Tue, 15 Sep 2020 16:39:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20layout=E5=B8=83=E5=B1=80=E7=9A=84FesHead?=
 =?UTF-8?q?er=E5=92=8CFesLeft=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fes-core：
FesHeader和FesLeft遵循就近原则，自己 > 父级 > 默认
---
 packages/fes-core/src/instance/page.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/fes-core/src/instance/page.js b/packages/fes-core/src/instance/page.js
index b0b72a30..7a42d7e7 100644
--- a/packages/fes-core/src/instance/page.js
+++ b/packages/fes-core/src/instance/page.js
@@ -8,6 +8,18 @@ import fesConfig from '../config';
 
 const fesDataCache = {};
 
+const certainConfig = function (matchPages, prop, n = 1) {
+    const length = matchPages.length;
+    if (n > length) {
+        return matchPages[0].components.default[prop];
+    }
+    const matchPage = matchPages[length - n].components.default;
+    if (typeof matchPage[prop] === 'boolean') {
+        return matchPage[prop];
+    }
+    return certainConfig(matchPages, prop, n + 1);
+};
+
 const Page = {
     install(Vue, App) {
         Vue.mixin({
@@ -44,20 +56,22 @@ const Page = {
                 return data;
             },
             created() {
+                const defaultHeader = fesConfig.FesHeader === undefined ? false : fesConfig.FesHeader;
+                const defaultLeft = fesConfig.FesLeft === undefined ? true : fesConfig.FesLeft;
                 // route切换时，重新设置为初始值
                 const comp = (this.$route && this.$route.matched) || [];
                 if (comp.length > 0) {
                     const matchPage = comp[comp.length - 1].components.default;
                     if (this.$options.__file === matchPage.__file) {
-                        const defaultHeader = fesConfig.FesHeader === undefined ? false : fesConfig.FesHeader;
-                        const defaultLeft = fesConfig.FesLeft === undefined ? true : fesConfig.FesLeft;
-                        if (typeof matchPage.FesHeader === 'boolean') {
-                            this.$root.header = matchPage.FesHeader;
+                        const header = certainConfig(comp, 'FesHeader');
+                        if (typeof header === 'boolean') {
+                            this.$root.header = header;
                         } else {
                             this.$root.header = defaultHeader;
                         }
-                        if (typeof matchPage.FesLeft === 'boolean') {
-                            this.$root.left = matchPage.FesLeft;
+                        const left = certainConfig(comp, 'FesLeft');
+                        if (typeof left === 'boolean') {
+                            this.$root.left = left;
                         } else {
                             this.$root.left = defaultLeft;
                         }