From 9f034092a9c1ad104ba5ce73e97db7f4a55ef729 Mon Sep 17 00:00:00 2001
From: chenghongxing <1126263215@qq.com>
Date: Tue, 25 Aug 2020 19:22:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20add=20configuration=20of=20hiding=20pag?=
 =?UTF-8?q?e=20title=20in=20PageLayout;=20:star:=20#106=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=9A=90=E8=97=8F=20PageLa?=
 =?UTF-8?q?yout=20=E5=B8=83=E5=B1=80=E4=B8=AD=E9=A1=B5=E9=9D=A2=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/header/PageHeader.vue | 9 ++++-----
 src/config/default/setting.config.js      | 5 +++--
 src/layouts/PageLayout.vue                | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/page/header/PageHeader.vue b/src/components/page/header/PageHeader.vue
index 2ae5e85..26dda7b 100644
--- a/src/components/page/header/PageHeader.vue
+++ b/src/components/page/header/PageHeader.vue
@@ -11,7 +11,7 @@
       <div class="detail">
         <div class="main">
           <div class="row">
-            <h1 v-if="title" class="title">{{title}}</h1>
+            <h1 v-if="showPageTitle && title" class="title">{{title}}</h1>
             <div class="action"><slot name="action"></slot></div>
           </div>
           <div class="row">
@@ -28,11 +28,12 @@
 </template>
 
 <script>
+import {mapState} from 'vuex'
 export default {
   name: 'PageHeader',
   props: {
     title: {
-      type: String,
+      type: [String, Boolean],
       required: false
     },
     breadcrumb: {
@@ -49,9 +50,7 @@ export default {
     },
   },
   computed: {
-    layout () {
-      return this.$store.state.setting.layout
-    }
+    ...mapState('setting', ['layout', 'showPageTitle'])
   }
 }
 </script>
diff --git a/src/config/default/setting.config.js b/src/config/default/setting.config.js
index 58a24a6..6f2c5e8 100644
--- a/src/config/default/setting.config.js
+++ b/src/config/default/setting.config.js
@@ -15,8 +15,9 @@ module.exports = {
   multiPage: false,                     //多页签模式，true:开启，false:不开启
   hideSetting: false,                   //隐藏设置抽屉，true:隐藏，false:不隐藏
   systemName: 'Vue Antd Admin',         //系统名称
-  copyright: '2018 ICZER 工作室出品',    //copyright
-  asyncRoutes: false,                    //异步加载路由，true:开启，false:不开启
+  copyright: '2018 ICZER 工作室出品',     //copyright
+  asyncRoutes: false,                   //异步加载路由，true:开启，false:不开启
+  showPageTitle: true,                  //是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
   animate: {                            //动画设置
     disabled: false,                    //禁用动画，true:禁用，false:启用
     name: 'bounce',                     //动画效果，支持的动画效果可参考 ./animate.config.js
diff --git a/src/layouts/PageLayout.vue b/src/layouts/PageLayout.vue
index 5a33311..f292e8a 100644
--- a/src/layouts/PageLayout.vue
+++ b/src/layouts/PageLayout.vue
@@ -63,7 +63,7 @@ export default {
     ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight']),
     pageTitle() {
       let pageTitle = this.page && this.page.title
-      return this.title || this.$t(pageTitle) || this.routeName
+      return pageTitle === undefined ? (this.title || this.routeName) : this.$t(pageTitle)
     },
     routeName() {
       const route = this.$route