From 4a7bee7506d6f9846deb90cf996ed7dbbd22d5bc Mon Sep 17 00:00:00 2001
From: chenghongxing <1126263215@qq.com>
Date: Sun, 6 Sep 2020 12:16:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20add=20configuration=20for=20width=20of?=
 =?UTF-8?q?=20page=20content;=20=E2=AD=90=20=E6=96=B0=E5=A2=9E=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=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 |  6 +++---
 src/components/page/header/index.less     | 10 ++++------
 src/components/setting/Setting.vue        | 10 +++++-----
 src/config/default/setting.config.js      |  1 +
 src/layouts/PageLayout.vue                |  6 +++---
 src/layouts/header/AdminHeader.vue        |  4 ++--
 src/layouts/header/index.less             |  4 +++-
 src/layouts/tabs/TabsView.vue             | 10 ++++++++--
 src/store/modules/setting.js              |  3 +++
 9 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/components/page/header/PageHeader.vue b/src/components/page/header/PageHeader.vue
index 26dda7b..60fa64b 100644
--- a/src/components/page/header/PageHeader.vue
+++ b/src/components/page/header/PageHeader.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="page-header">
-    <div :class="['page-header-wide', layout]">
+  <div :class="['page-header', layout, pageWidth]">
+    <div class="page-header-wide">
       <div class="breadcrumb">
         <a-breadcrumb>
           <a-breadcrumb-item :key="index" v-for="(item, index) in breadcrumb">
@@ -50,7 +50,7 @@ export default {
     },
   },
   computed: {
-    ...mapState('setting', ['layout', 'showPageTitle'])
+    ...mapState('setting', ['layout', 'showPageTitle', 'pageWidth'])
   }
 }
 </script>
diff --git a/src/components/page/header/index.less b/src/components/page/header/index.less
index ba5b1d5..4d45d73 100644
--- a/src/components/page/header/index.less
+++ b/src/components/page/header/index.less
@@ -1,13 +1,11 @@
 .page-header{
   background: @base-bg-color;
   padding: 16px 24px;
+  &.head.fixed{
+    margin: auto;
+    max-width: 1400px;
+  }
   .page-header-wide{
-    &.head{
-      margin: auto;
-      max-width: 1400px;
-    }
-    &.side{
-    }
     .breadcrumb{
       margin-bottom: 20px;
     }
diff --git a/src/components/setting/Setting.vue b/src/components/setting/Setting.vue
index d4bdd4d..76cb4d1 100644
--- a/src/components/setting/Setting.vue
+++ b/src/components/setting/Setting.vue
@@ -33,9 +33,9 @@
       <a-list :split="false">
         <a-list-item>
           {{$t('navigate.content.title')}}
-          <a-select :getPopupContainer="getPopupContainer" :dropdown-style="{zIndex: 2001}" size="small" defaultValue="1" slot="actions" style="width: 80px">
-            <a-select-option value="1">{{$t('navigate.content.fluid')}}</a-select-option>
-            <a-select-option value="2">{{$t('navigate.content.fixed')}}</a-select-option>
+          <a-select :getPopupContainer="getPopupContainer" :dropdown-style="{zIndex: 2001}" size="small" :defaultValue="pageWidth" @change="setPageWidth" slot="actions" style="width: 80px">
+            <a-select-option value="fluid">{{$t('navigate.content.fluid')}}</a-select-option>
+            <a-select-option value="fixed">{{$t('navigate.content.fixed')}}</a-select-option>
           </a-select>
         </a-list-item>
         <a-list-item>
@@ -132,7 +132,7 @@ export default {
     directions() {
       return this.animates.find(item => item.name == this.animate.name).directions
     },
-    ...mapState('setting', ['theme', 'layout', 'animate', 'animates', 'palettes', 'multiPage', 'weekMode', 'fixedHeader', 'fixedSideBar', 'hideSetting'])
+    ...mapState('setting', ['theme', 'layout', 'animate', 'animates', 'palettes', 'multiPage', 'weekMode', 'fixedHeader', 'fixedSideBar', 'hideSetting', 'pageWidth'])
   },
   watch: {
     'animate.name': function(val) {
@@ -166,7 +166,7 @@ export default {
       })
     },
     ...mapMutations('setting', ['setTheme', 'setLayout', 'setMultiPage', 'setWeekMode',
-      'setFixedSideBar', 'setFixedHeader', 'setAnimate', 'setHideSetting'])
+      'setFixedSideBar', 'setFixedHeader', 'setAnimate', 'setHideSetting', 'setPageWidth'])
   }
 }
 </script>
diff --git a/src/config/default/setting.config.js b/src/config/default/setting.config.js
index bcbf470..b2ef5a7 100644
--- a/src/config/default/setting.config.js
+++ b/src/config/default/setting.config.js
@@ -11,6 +11,7 @@ module.exports = {
   layout: 'side',                       //导航布局，可选 side 和 head，分别为侧边导航和顶部导航
   fixedHeader: false,                   //固定头部状态栏，true:固定，false:不固定
   fixedSideBar: true,                   //固定侧边栏，true:固定，false:不固定
+  pageWidth: 'fixed',                   //内容区域宽度，fixed:固定宽度，fluid:流式宽度
   weekMode: false,                      //色弱模式，true:开启，false:不开启
   multiPage: false,                     //多页签模式，true:开启，false:不开启
   hideSetting: false,                   //隐藏设置抽屉，true:隐藏，false:不隐藏
diff --git a/src/layouts/PageLayout.vue b/src/layouts/PageLayout.vue
index f292e8a..e936145 100644
--- a/src/layouts/PageLayout.vue
+++ b/src/layouts/PageLayout.vue
@@ -13,7 +13,7 @@
       </div>
       <slot v-if="this.$slots.extra" slot="extra" name="extra"></slot>
     </page-header>
-    <div ref="page" :class="['page-content', layout]" >
+    <div ref="page" :class="['page-content', layout, pageWidth]" >
       <slot></slot>
     </div>
   </div>
@@ -60,7 +60,7 @@ export default {
     this.updatePageHeight(0)
   },
   computed: {
-    ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight']),
+    ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth']),
     pageTitle() {
       let pageTitle = this.page && this.page.title
       return pageTitle === undefined ? (this.title || this.routeName) : this.$t(pageTitle)
@@ -130,7 +130,7 @@ export default {
     padding: 24px 0 0;
     &.side{
     }
-    &.head{
+    &.head.fixed{
       margin: 0 auto;
       max-width: 1400px;
     }
diff --git a/src/layouts/header/AdminHeader.vue b/src/layouts/header/AdminHeader.vue
index a65b0ad..8b6b343 100644
--- a/src/layouts/header/AdminHeader.vue
+++ b/src/layouts/header/AdminHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <a-layout-header :class="[headerTheme, 'admin-header']">
-    <div :class="['admin-header-wide', layout]">
+    <div :class="['admin-header-wide', layout, pageWidth]">
       <router-link v-if="isMobile || layout === 'head'" to="/" :class="['logo', isMobile ? null : 'pc', headerTheme]">
         <img width="32" src="@/assets/img/logo.png" />
         <h1 v-if="!isMobile">{{systemName}}</h1>
@@ -54,7 +54,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'lang']),
+    ...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'lang', 'pageWidth']),
     headerTheme () {
       if (this.layout == 'side' && this.theme.mode == 'dark' && !this.isMobile) {
         return 'light'
diff --git a/src/layouts/header/index.less b/src/layouts/header/index.less
index ba90761..d54fca4 100644
--- a/src/layouts/header/index.less
+++ b/src/layouts/header/index.less
@@ -20,9 +20,11 @@
     }
   }
   .admin-header-wide{
-    &.head{
+    padding-left: 24px;
+    &.head.fixed{
       max-width: 1400px;
       margin: auto;
+      padding-left: 0;
     }
     &.side{
       padding-right: 12px;
diff --git a/src/layouts/tabs/TabsView.vue b/src/layouts/tabs/TabsView.vue
index cf33f73..026f270 100644
--- a/src/layouts/tabs/TabsView.vue
+++ b/src/layouts/tabs/TabsView.vue
@@ -5,7 +5,7 @@
       v-if="multiPage"
       type="editable-card"
       :active-key="activePage"
-      :style="`margin: -16px auto 8px; ${layout == 'head' ? 'max-width: 1400px;' : ''}`"
+      :class="['tabs-view', layout, pageWidth]"
       :hide-add="true"
       @change="changePage"
       @edit="editPage"
@@ -48,7 +48,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['multiPage', 'animate', 'layout']),
+    ...mapState('setting', ['multiPage', 'animate', 'layout', 'pageWidth']),
     menuItemList() {
       return [
         { key: '1', icon: 'vertical-right', text: this.$t('closeLeft') },
@@ -206,6 +206,12 @@ function getPageKey (target, depth = 0) {
 </script>
 
 <style scoped lang="less">
+  .tabs-view{
+    margin: -16px auto 8px;
+    &.head.fixed{
+      max-width: 1400px;
+    }
+  }
   .tabs-view-content{
     position: relative;
   }
diff --git a/src/store/modules/setting.js b/src/store/modules/setting.js
index f6d2aed..3e15a67 100644
--- a/src/store/modules/setting.js
+++ b/src/store/modules/setting.js
@@ -82,6 +82,9 @@ export default {
     setAsyncRoutes(state, asyncRoutes) {
       state.asyncRoutes = asyncRoutes
     },
+    setPageWidth(state, pageWidth) {
+      state.pageWidth = pageWidth
+    },
     setActivatedFirst(state, activatedFirst) {
       state.activatedFirst = activatedFirst
     }