From 9704b00cc29ddbdb2ee2225826a79bc9754f8106 Mon Sep 17 00:00:00 2001
From: Ryan Wang <i@ryanc.cc>
Date: Fri, 18 Feb 2022 15:43:12 +0800
Subject: [PATCH] refactor: admin layout settings (#441)

Signed-off-by: Ryan Wang <i@ryanc.cc>
---
 .../SettingDrawer/SettingDrawer.vue           | 141 ++++++++++--------
 src/config/defaultSettings.js                 |   4 +-
 src/store/modules/app.js                      |   3 -
 3 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/src/components/SettingDrawer/SettingDrawer.vue b/src/components/SettingDrawer/SettingDrawer.vue
index e3e28d50..255db097 100644
--- a/src/components/SettingDrawer/SettingDrawer.vue
+++ b/src/components/SettingDrawer/SettingDrawer.vue
@@ -6,8 +6,8 @@
           <h3 class="setting-drawer-index-title">整体风格设置</h3>
           <div class="setting-drawer-index-blockChecbox">
             <a-tooltip>
-              <template slot="title">暗色菜单风格</template>
-              <div class="setting-drawer-index-item" @click="handleMenuTheme('dark')">
+              <template #title>暗色菜单风格</template>
+              <div class="setting-drawer-index-item" @click="handleSetMenuTheme('dark')">
                 <img alt="dark" src="/images/dark.svg" />
                 <div v-if="navTheme === 'dark'" class="setting-drawer-index-selectIcon">
                   <a-icon type="check" />
@@ -16,8 +16,8 @@
             </a-tooltip>
 
             <a-tooltip>
-              <template slot="title">亮色菜单风格</template>
-              <div class="setting-drawer-index-item" @click="handleMenuTheme('light')">
+              <template #title>亮色菜单风格</template>
+              <div class="setting-drawer-index-item" @click="handleSetMenuTheme('light')">
                 <img alt="light" src="/images/dark.svg" />
                 <div v-if="navTheme !== 'dark'" class="setting-drawer-index-selectIcon">
                   <a-icon type="check" />
@@ -31,8 +31,8 @@
           <h3 class="setting-drawer-index-title">主题色</h3>
           <div class="h-5">
             <a-tooltip v-for="(item, index) in colorList" :key="index" class="setting-drawer-theme-color-colorBlock">
-              <template slot="title">{{ item.key }}</template>
-              <a-tag :color="item.color" @click="changeColor(item.color)">
+              <template #title>{{ item.key }}</template>
+              <a-tag :color="item.color" @click="handleChangeColor(item.color)">
                 <a-icon v-if="item.color === primaryColor" type="check"></a-icon>
               </a-tag>
             </a-tooltip>
@@ -43,14 +43,14 @@
           <h3 class="setting-drawer-index-title">导航模式</h3>
 
           <div class="setting-drawer-index-blockChecbox">
-            <div class="setting-drawer-index-item" @click="handleLayout('sidemenu')">
+            <div class="setting-drawer-index-item" @click="handleSetLayout('sidemenu')">
               <img alt="sidemenu" src="/images/sidemenu.svg" />
               <div v-if="layoutMode === 'sidemenu'" class="setting-drawer-index-selectIcon">
                 <a-icon type="check" />
               </div>
             </div>
 
-            <div class="setting-drawer-index-item" @click="handleLayout('topmenu')">
+            <div class="setting-drawer-index-item" @click="handleSetLayout('topmenu')">
               <img alt="topmenu" src="/images/topmenu.svg" />
               <div v-if="layoutMode !== 'sidemenu'" class="setting-drawer-index-selectIcon">
                 <a-icon type="check" />
@@ -62,53 +62,68 @@
         <div class="mt-6">
           <a-list :split="false">
             <a-list-item>
-              <a-tooltip slot="actions">
-                <template slot="title"> 该设定仅 [顶部栏导航] 时有效 </template>
-                <a-select
-                  :defaultValue="contentWidth"
-                  size="small"
-                  style="width: 80px"
-                  @change="handleContentWidthChange"
-                >
-                  <a-select-option value="Fixed">固定</a-select-option>
-                  <a-select-option v-if="layoutMode !== 'sidemenu'" value="Fluid">流式</a-select-option>
-                </a-select>
-              </a-tooltip>
-              <a-list-item-meta>
-                <div slot="title">内容区域宽度</div>
-              </a-list-item-meta>
-            </a-list-item>
-            <a-list-item>
-              <a-switch slot="actions" :defaultChecked="fixedHeader" size="small" @change="handleFixedHeader" />
-              <a-list-item-meta>
-                <div slot="title">固定 Header</div>
-              </a-list-item-meta>
-            </a-list-item>
-            <a-list-item>
-              <a-switch
-                slot="actions"
-                :defaultChecked="autoHideHeader"
-                :disabled="!fixedHeader"
-                size="small"
-                @change="handleFixedHeaderHidden"
-              />
-              <a-list-item-meta>
-                <a-tooltip slot="title" placement="left">
-                  <template slot="title">固定 Header 时可配置</template>
-                  <div :style="{ opacity: !fixedHeader ? '0.5' : '1' }">下滑时隐藏 Header</div>
+              <template #actions>
+                <a-tooltip>
+                  <template #title> 该设定仅 [顶部栏导航] 时有效</template>
+                  <a-select
+                    :disabled="layoutMode !== 'topmenu'"
+                    :value="contentWidth"
+                    size="small"
+                    style="width: 80px"
+                    @change="handleContentWidthChange"
+                  >
+                    <a-select-option value="Fixed">固定</a-select-option>
+                    <a-select-option v-if="layoutMode !== 'sidemenu'" value="Fluid">流式</a-select-option>
+                  </a-select>
                 </a-tooltip>
+              </template>
+              <a-list-item-meta>
+                <template #title>
+                  <div>内容区域宽度</div>
+                </template>
               </a-list-item-meta>
             </a-list-item>
             <a-list-item>
-              <a-switch
-                slot="actions"
-                :defaultChecked="fixedSidebar"
-                :disabled="layoutMode === 'topmenu'"
-                size="small"
-                @change="handleFixedSidebar"
-              />
+              <template #actions>
+                <a-switch :checked="fixedHeader" size="small" @change="handleSetFixedHeader" />
+              </template>
               <a-list-item-meta>
-                <div slot="title" :style="{ opacity: layoutMode === 'topmenu' ? '0.5' : '1' }">固定侧边菜单</div>
+                <template #title>
+                  <div>固定 Header</div>
+                </template>
+              </a-list-item-meta>
+            </a-list-item>
+            <a-list-item>
+              <template #actions>
+                <a-switch
+                  :checked="autoHideHeader"
+                  :disabled="!fixedHeader"
+                  size="small"
+                  @change="handleSetAutoHideHeader"
+                />
+              </template>
+              <a-list-item-meta>
+                <template #title>
+                  <a-tooltip placement="left">
+                    <template #title>固定 Header 时可配置</template>
+                    <div :style="{ opacity: !fixedHeader ? '0.5' : '1' }">下滑时隐藏 Header</div>
+                  </a-tooltip>
+                </template>
+              </a-list-item-meta>
+            </a-list-item>
+            <a-list-item>
+              <template #actions>
+                <a-switch
+                  :checked="fixedSidebar"
+                  :disabled="layoutMode === 'topmenu'"
+                  size="small"
+                  @change="handleSetFixedSidebar"
+                />
+              </template>
+              <a-list-item-meta>
+                <template #title>
+                  <div :style="{ opacity: layoutMode === 'topmenu' ? '0.5' : '1' }">固定侧边菜单</div>
+                </template>
               </a-list-item-meta>
             </a-list-item>
           </a-list>
@@ -148,43 +163,45 @@ export default {
     onClose() {
       this.ToggleLayoutSetting(false)
     },
-    handleMenuTheme(theme) {
+    handleSetMenuTheme(theme) {
       this.baseConfig.navTheme = theme
       this.$store.dispatch('ToggleTheme', theme)
     },
-    handleLayout(mode) {
+    handleSetLayout(mode) {
       this.baseConfig.layout = mode
       this.$store.dispatch('ToggleLayoutMode', mode)
-      this.handleFixedSidebar(false)
       if (mode === 'sidemenu') {
         this.handleContentWidthChange('Fixed')
+        this.handleSetFixedSidebar(true)
+      } else {
+        this.handleSetFixedHeader(true)
+        this.handleSetFixedSidebar(false)
       }
     },
     handleContentWidthChange(type) {
       this.baseConfig.contentWidth = type
       this.$store.dispatch('ToggleContentWidth', type)
     },
-    changeColor(color) {
+    handleChangeColor(color) {
       this.baseConfig.primaryColor = color
       if (this.primaryColor !== color) {
         this.$store.dispatch('ToggleColor', color)
         updateTheme(color)
       }
     },
-    handleFixedHeader(fixed) {
+    handleSetFixedHeader(fixed) {
       this.baseConfig.fixedHeader = fixed
       this.$store.dispatch('ToggleFixedHeader', fixed)
+
+      if (!fixed) {
+        this.handleSetAutoHideHeader(false)
+      }
     },
-    handleFixedHeaderHidden(autoHidden) {
+    handleSetAutoHideHeader(autoHidden) {
       this.baseConfig.autoHideHeader = autoHidden
       this.$store.dispatch('ToggleFixedHeaderHidden', autoHidden)
     },
-    handleFixedSidebar(fixed) {
-      if (this.layoutMode === 'topmenu') {
-        this.baseConfig.fixedSidebar = false
-        this.$store.dispatch('ToggleFixedSidebar', false)
-        return
-      }
+    handleSetFixedSidebar(fixed) {
       this.baseConfig.fixedSidebar = fixed
       this.$store.dispatch('ToggleFixedSidebar', fixed)
     }
diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js
index dba7fcd5..3bc45274 100644
--- a/src/config/defaultSettings.js
+++ b/src/config/defaultSettings.js
@@ -1,10 +1,10 @@
 export default {
   primaryColor: '#1890FF',
   navTheme: 'dark',
-  layout: 'topmenu',
+  layout: 'sidemenu',
   contentWidth: 'Fixed',
   fixedHeader: false,
-  fixedSidebar: false,
+  fixedSidebar: true,
   autoHideHeader: false,
   storageOptions: {
     namespace: 'halo__',
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index c2f200c9..8142981d 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -84,9 +84,6 @@ const app = {
       commit('TOGGLE_LAYOUT_MODE', mode)
     },
     ToggleFixedHeader({ commit }, fixedHeader) {
-      if (!fixedHeader) {
-        commit('TOGGLE_FIXED_HEADER_HIDDEN', false)
-      }
       commit('TOGGLE_FIXED_HEADER', fixedHeader)
     },
     ToggleFixedSidebar({ commit }, fixedSidebar) {