From ce97b04d79c56873f8109d702d110a7243f714ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=82=A0=E9=9D=99=E8=90=9D=E8=8E=89?= <i@mikuhl.cn>
Date: Wed, 14 Feb 2024 22:51:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E9=A2=9C=E8=89=B2=E5=88=87=E6=8D=A2=20(#681)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 修复Header元素偏移的问题

* fix: 修复i18n未引用的问题

* feat: 新增侧边栏颜色模式

* chore: 移除侧边栏模式跟随系统

* feat: 换种展示方式
---
 src/config/style.ts                      |  1 +
 src/layouts/components/Header.vue        |  1 -
 src/layouts/components/LayoutSideNav.vue |  2 +-
 src/layouts/components/SideNav.vue       | 25 ++++++++++++++++++++---
 src/layouts/setting.vue                  | 20 ++++++++++++++----
 src/locales/lang/en_US/layout.ts         |  1 +
 src/locales/lang/zh_CN/layout.ts         |  1 +
 src/store/modules/setting.ts             | 26 ++++++++++++++++++------
 src/style/layout.less                    |  6 +++++-
 9 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/config/style.ts b/src/config/style.ts
index b652f5a..cdf7d93 100644
--- a/src/config/style.ts
+++ b/src/config/style.ts
@@ -5,6 +5,7 @@ export default {
   mode: 'light',
   layout: 'side',
   splitMenu: false,
+  sideMode: 'light',
   isFooterAside: false,
   isSidebarFixed: true,
   isHeaderFixed: true,
diff --git a/src/layouts/components/Header.vue b/src/layouts/components/Header.vue
index 4ee196f..37be801 100644
--- a/src/layouts/components/Header.vue
+++ b/src/layouts/components/Header.vue
@@ -238,7 +238,6 @@ const navToHelper = () => {
   display: flex;
   align-items: normal;
   line-height: 0;
-  padding-left: var(--td-comp-margin-xl);
 }
 
 .header-logo-container {
diff --git a/src/layouts/components/LayoutSideNav.vue b/src/layouts/components/LayoutSideNav.vue
index 112db44..9dc50a2 100644
--- a/src/layouts/components/LayoutSideNav.vue
+++ b/src/layouts/components/LayoutSideNav.vue
@@ -5,7 +5,7 @@
     :layout="settingStore.layout"
     :is-fixed="settingStore.isSidebarFixed"
     :menu="sideMenu"
-    :theme="settingStore.displayMode"
+    :theme="settingStore.displaySideMode"
     :is-compact="settingStore.isSidebarCompact"
   />
 </template>
diff --git a/src/layouts/components/SideNav.vue b/src/layouts/components/SideNav.vue
index a8b627f..3025037 100644
--- a/src/layouts/components/SideNav.vue
+++ b/src/layouts/components/SideNav.vue
@@ -3,12 +3,12 @@
     <t-menu :class="menuCls" :theme="theme" :value="active" :collapsed="collapsed" :default-expanded="defaultExpanded">
       <template #logo>
         <span v-if="showLogo" :class="`${prefix}-side-nav-logo-wrapper`" @click="goHome">
-          <component :is="getLogo()" :class="`${prefix}-side-nav-logo-${collapsed ? 't' : 'tdesign'}-logo`" />
+          <component :is="getLogo()" :class="logoCls" />
         </span>
       </template>
       <menu-content :nav-data="menu" />
       <template #operations>
-        <span class="version-container"> {{ !collapsed ? 'TDesign Starter' : '' }} {{ pgk.version }} </span>
+        <span :class="versionCls"> {{ !collapsed ? 'TDesign Starter' : '' }} {{ pgk.version }} </span>
       </template>
     </t-menu>
     <div :class="`${prefix}-side-nav-placeholder${collapsed ? '-hidden' : ''}`"></div>
@@ -75,6 +75,10 @@ const defaultExpanded = computed(() => {
   return union(expanded, parentPath === '' ? [] : [parentPath]);
 });
 
+const sideMode = computed(() => {
+  const { theme } = props;
+  return theme === 'dark';
+});
 const sideNavCls = computed(() => {
   const { isCompact } = props;
   return [
@@ -84,7 +88,22 @@ const sideNavCls = computed(() => {
     },
   ];
 });
-
+const logoCls = computed(() => {
+  return [
+    `${prefix}-side-nav-logo-${collapsed.value ? 't' : 'tdesign'}-logo`,
+    {
+      [`${prefix}-side-nav-dark`]: sideMode.value,
+    },
+  ];
+});
+const versionCls = computed(() => {
+  return [
+    `version-container`,
+    {
+      [`${prefix}-side-nav-dark`]: sideMode.value,
+    },
+  ];
+});
 const menuCls = computed(() => {
   const { showLogo, isFixed, layout } = props;
   return [
diff --git a/src/layouts/setting.vue b/src/layouts/setting.vue
index 0d32f4a..058f4d7 100644
--- a/src/layouts/setting.vue
+++ b/src/layouts/setting.vue
@@ -52,7 +52,6 @@
             </t-popup>
           </div>
         </t-radio-group>
-
         <div class="setting-group-title">{{ $t('layout.setting.navigationLayout') }}</div>
         <t-radio-group v-model="formData.layout">
           <div v-for="(item, index) in LAYOUT_OPTION" :key="index" class="setting-layout-drawer">
@@ -62,15 +61,24 @@
           </div>
         </t-radio-group>
 
-        <t-form-item v-show="formData.layout === 'mix'" label="分割菜单（混合模式下有效）" name="splitMenu">
+        <t-form-item v-show="formData.layout === 'mix'" :label="$t('layout.setting.splitMenu')" name="splitMenu">
           <t-switch v-model="formData.splitMenu" />
         </t-form-item>
-
-        <t-form-item v-show="formData.layout === 'mix'" label="固定 Sidebar" name="isSidebarFixed">
+        <t-form-item
+          v-show="formData.layout === 'mix'"
+          :label="$t('layout.setting.fixedSidebar')"
+          name="isSidebarFixed"
+        >
           <t-switch v-model="formData.isSidebarFixed" />
         </t-form-item>
 
         <div class="setting-group-title">{{ $t('layout.setting.element.title') }}</div>
+        <t-form-item :label="$t('layout.setting.sideMode')" name="sideMode">
+          <t-radio-group v-model="formData.sideMode" class="side-mode-radio">
+            <t-radio-button key="light" value="light" :label="$t('layout.setting.theme.options.light')" />
+            <t-radio-button key="dark" value="dark" :label="$t('layout.setting.theme.options.dark')" />
+          </t-radio-group>
+        </t-form-item>
         <t-form-item
           v-show="formData.layout === 'side'"
           :label="$t('layout.setting.element.showHeader')"
@@ -295,6 +303,10 @@ watchEffect(() => {
     width: 100%;
     justify-content: space-between;
     align-items: center;
+
+    &.side-mode-radio {
+      justify-content: end;
+    }
   }
 
   .t-radio-group.t-size-m .t-radio-button {
diff --git a/src/locales/lang/en_US/layout.ts b/src/locales/lang/en_US/layout.ts
index 5768171..d833732 100644
--- a/src/locales/lang/en_US/layout.ts
+++ b/src/locales/lang/en_US/layout.ts
@@ -33,6 +33,7 @@ export default {
       },
     },
     navigationLayout: 'Navigation Layout',
+    sideMode: 'Side Menu Mode',
     splitMenu: 'Split Menu（Only Mix mode）',
     fixedSidebar: 'Fixed Sidebar',
     element: {
diff --git a/src/locales/lang/zh_CN/layout.ts b/src/locales/lang/zh_CN/layout.ts
index b648b25..26f0e27 100644
--- a/src/locales/lang/zh_CN/layout.ts
+++ b/src/locales/lang/zh_CN/layout.ts
@@ -33,6 +33,7 @@ export default {
       },
     },
     navigationLayout: '导航布局',
+    sideMode: '侧边栏模式',
     splitMenu: '分割菜单（混合模式下有效）',
     fixedSidebar: '固定侧边栏',
     element: {
diff --git a/src/store/modules/setting.ts b/src/store/modules/setting.ts
index 346d4cb..aa781e8 100644
--- a/src/store/modules/setting.ts
+++ b/src/store/modules/setting.ts
@@ -33,18 +33,16 @@ export const useSettingStore = defineStore('setting', {
       }
       return state.mode as 'dark' | 'light';
     },
+    displaySideMode: (state): 'dark' | 'light' => {
+      return state.sideMode as 'dark' | 'light';
+    },
   },
   actions: {
     async changeMode(mode: 'dark' | 'light' | 'auto') {
       let theme = mode;
 
       if (mode === 'auto') {
-        const media = window.matchMedia('(prefers-color-scheme:dark)');
-        if (media.matches) {
-          theme = 'dark';
-        } else {
-          theme = 'light';
-        }
+        theme = this.getMediaColor();
       }
       const isDarkMode = theme === 'dark';
 
@@ -52,6 +50,19 @@ export const useSettingStore = defineStore('setting', {
 
       this.chartColors = isDarkMode ? DARK_CHART_COLORS : LIGHT_CHART_COLORS;
     },
+    async changeSideMode(mode: 'dark' | 'light') {
+      const isDarkMode = mode === 'dark';
+
+      document.documentElement.setAttribute('side-mode', isDarkMode ? 'dark' : '');
+    },
+    getMediaColor() {
+      const media = window.matchMedia('(prefers-color-scheme:dark)');
+
+      if (media.matches) {
+        return 'dark';
+      }
+      return 'light';
+    },
     changeBrandTheme(brandTheme: string) {
       const mode = this.displayMode;
       // 以主题色加显示模式作为键
@@ -79,6 +90,9 @@ export const useSettingStore = defineStore('setting', {
         if (key === 'mode') {
           this.changeMode(payload[key]);
         }
+        if (key === 'sideMode') {
+          this.changeSideMode(payload[key]);
+        }
         if (key === 'brandTheme') {
           this.changeBrandTheme(payload[key]);
         }
diff --git a/src/style/layout.less b/src/style/layout.less
index 3e8f9bd..ae52216 100644
--- a/src/style/layout.less
+++ b/src/style/layout.less
@@ -163,7 +163,7 @@
     }
 
     &-logo-tdesign-logo {
-      padding: 0 var(--td-comp-paddingLR-xl);
+      margin-right: var(--td-comp-margin-xxxl);
       height: var(--td-comp-size-s);
       width: 100%;
       color: var(--td-text-color-primary);
@@ -176,6 +176,10 @@
     }
   }
 
+  &-side-nav-dark {
+    color: var(--td-font-white-1) !important;
+  }
+
   &-side-nav-placeholder {
     flex: 1 1 232px;
     min-width: 232px;