From 49c2dc4f23913c9ef86ee046c6ae53d4406cbca7 Mon Sep 17 00:00:00 2001
From: Soybean <2570172956@qq.com>
Date: Thu, 2 Sep 2021 22:05:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E6=96=B0=E5=A2=9E=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A8=A1=E5=BC=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/ColorBlock/index.vue    | 28 +++++++++++++++++++
 src/components/common/index.ts                |  3 +-
 src/components/index.ts                       |  2 +-
 src/enum/theme.ts                             |  1 +
 .../SettingDrawer/components/NavMode.vue      |  8 ++++++
 .../SettingDrawer/components/SystemTheme.vue  | 11 ++++----
 .../SettingDrawer/components/index.ts         |  3 +-
 .../components/SettingDrawer/index.vue        |  5 ++--
 8 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 src/components/common/ColorBlock/index.vue
 create mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue

diff --git a/src/components/common/ColorBlock/index.vue b/src/components/common/ColorBlock/index.vue
new file mode 100644
index 00000000..74971870
--- /dev/null
+++ b/src/components/common/ColorBlock/index.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="flex-center w-20px h-20px mx-6px mb-8px cursor-pointer rounded-2px" :style="{ backgroundColor: color }">
+    <icon-ic-outline-check
+      v-if="checked"
+      class="text-14px text-white"
+      :class="[isWhite ? 'text-gray-700' : 'text-white']"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue';
+
+const props = defineProps({
+  color: {
+    type: String,
+    required: true
+  },
+  checked: {
+    type: Boolean,
+    default: false
+  }
+});
+
+const whiteColors = ['#ffffff', '#fff', 'rgb(255,255,255)'];
+const isWhite = computed(() => whiteColors.includes(props.color));
+</script>
+<style scoped></style>
diff --git a/src/components/common/index.ts b/src/components/common/index.ts
index ff66d87d..0c063025 100644
--- a/src/components/common/index.ts
+++ b/src/components/common/index.ts
@@ -1,3 +1,4 @@
 import AppProviderContent from './AppProviderContent/index.vue';
+import ColorBlock from './ColorBlock/index.vue';
 
-export { AppProviderContent };
+export { AppProviderContent, ColorBlock };
diff --git a/src/components/index.ts b/src/components/index.ts
index f149c5aa..91394a0e 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1 +1 @@
-export { AppProviderContent } from './common';
+export { AppProviderContent, ColorBlock } from './common';
diff --git a/src/enum/theme.ts b/src/enum/theme.ts
index 664dd012..d081aaf9 100644
--- a/src/enum/theme.ts
+++ b/src/enum/theme.ts
@@ -2,6 +2,7 @@
 export enum EnumNavMode {
   'vertical' = '左侧菜单模式',
   'horizontal' = '顶部菜单模式',
+  'vertical-mix' = '左侧菜单混合模式',
   'horizontal-mix' = '顶部菜单混合模式'
 }
 
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue
new file mode 100644
index 00000000..36e7e7d4
--- /dev/null
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue
@@ -0,0 +1,8 @@
+<template>
+  <n-divider title-placement="center">导航栏模式</n-divider>
+</template>
+
+<script lang="ts" setup>
+import { NDivider } from 'naive-ui';
+</script>
+<style scoped></style>
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue
index 62073d96..4bf35db3 100644
--- a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue
@@ -1,21 +1,20 @@
 <template>
   <n-divider title-placement="center">系统主题</n-divider>
   <div class="flex flex-wrap justify-between">
-    <div
+    <color-block
       v-for="color in app.themeSettings.themeColorList"
       :key="color"
-      class="flex-center w-20px h-20px mx-6px mb-8px cursor-pointer rounded-2px"
-      :style="{ backgroundColor: color }"
+      :color="color"
+      :checked="color === app.themeSettings.themeColor"
       @click="setThemeColor(color)"
-    >
-      <icon-ic-outline-check v-if="color === app.themeSettings.themeColor" class="text-14px text-white" />
-    </div>
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { NDivider } from 'naive-ui';
 import { useAppStore } from '@/store';
+import { ColorBlock } from '@/components';
 
 const app = useAppStore();
 const { setThemeColor } = useAppStore();
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts b/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts
index 170c20e5..bc40d377 100644
--- a/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts
@@ -1,4 +1,5 @@
 import DarkMode from './DarkMode.vue';
+import NavMode from './NavMode.vue';
 import SystemTheme from './SystemTheme.vue';
 
-export { DarkMode, SystemTheme };
+export { DarkMode, NavMode, SystemTheme };
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/index.vue
index 278fc8ca..b5702e39 100644
--- a/src/layouts/BasicLayout/components/SettingDrawer/index.vue
+++ b/src/layouts/BasicLayout/components/SettingDrawer/index.vue
@@ -1,7 +1,8 @@
 <template>
   <n-drawer v-model:show="app.settingDrawer.visible">
-    <n-drawer-content title="主题配置">
+    <n-drawer-content title="主题配置" :native-scrollbar="false">
       <dark-mode />
+      <nav-mode />
       <system-theme />
     </n-drawer-content>
   </n-drawer>
@@ -10,7 +11,7 @@
 <script lang="ts" setup>
 import { NDrawer, NDrawerContent } from 'naive-ui';
 import { useAppStore } from '@/store';
-import { DarkMode, SystemTheme } from './components';
+import { DarkMode, NavMode, SystemTheme } from './components';
 
 const app = useAppStore();
 </script>