From f002124ee11bc93e6b9955549143b695417e7f8d Mon Sep 17 00:00:00 2001
From: Soybean <2570172956@qq.com>
Date: Thu, 2 Sep 2021 23:15:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E5=AF=BC=E8=88=AA=E6=A0=8F?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=85=8D=E7=BD=AE=EF=BC=9A=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=8F=8A=E4=B8=BB=E9=A2=98=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/interface/app.ts | 2 +-
src/interface/index.ts | 2 +-
.../{DarkMode.vue => DarkMode/index.vue} | 0
.../SettingDrawer/components/NavMode.vue | 8 ---
.../components/NavMode/components/NavType.vue | 49 +++++++++++++++++++
.../components/NavMode/components/index.ts | 3 ++
.../components/NavMode/index.vue | 36 ++++++++++++++
.../SettingDrawer/components/SystemTheme.vue | 22 ---------
.../components/SystemTheme/index.vue | 18 +++++++
.../SettingDrawer/components/index.ts | 6 +--
.../components/SettingDrawer/index.vue | 2 +-
src/store/modules/app/index.ts | 6 ++-
12 files changed, 117 insertions(+), 37 deletions(-)
rename src/layouts/BasicLayout/components/SettingDrawer/components/{DarkMode.vue => DarkMode/index.vue} (100%)
delete mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue
create mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue
create mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts
create mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue
delete mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue
create mode 100644 src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue
diff --git a/src/interface/app.ts b/src/interface/app.ts
index 3190ac88..1027d8b8 100644
--- a/src/interface/app.ts
+++ b/src/interface/app.ts
@@ -34,7 +34,7 @@ interface OtherColor {
error: string;
}
-type NavMode = keyof typeof EnumNavMode;
+export type NavMode = keyof typeof EnumNavMode;
type NavTheme = keyof typeof EnumNavTheme;
interface NavStyle {
diff --git a/src/interface/index.ts b/src/interface/index.ts
index f0169007..b05beba3 100644
--- a/src/interface/index.ts
+++ b/src/interface/index.ts
@@ -1,2 +1,2 @@
export { UserInfo } from './business';
-export { ThemeSettings } from './app';
+export { ThemeSettings, NavMode } from './app';
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode/index.vue
similarity index 100%
rename from src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode.vue
rename to src/layouts/BasicLayout/components/SettingDrawer/components/DarkMode/index.vue
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue
deleted file mode 100644
index 36e7e7d4..00000000
--- a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
- 导航栏模式
-
-
-
-
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue
new file mode 100644
index 00000000..c9f01db6
--- /dev/null
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/NavType.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ {{ EnumNavMode[mode] }}
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts
new file mode 100644
index 00000000..1ffab7cd
--- /dev/null
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/components/index.ts
@@ -0,0 +1,3 @@
+import NavType from './NavType.vue';
+
+export { NavType };
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue
new file mode 100644
index 00000000..360801be
--- /dev/null
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/NavMode/index.vue
@@ -0,0 +1,36 @@
+
+ 导航栏模式
+
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue
deleted file mode 100644
index 4bf35db3..00000000
--- a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-
- 系统主题
-
-
-
-
-
-
-
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue
new file mode 100644
index 00000000..5bd663bb
--- /dev/null
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/SystemTheme/index.vue
@@ -0,0 +1,18 @@
+
+ 系统主题
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts b/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts
index bc40d377..5d26c194 100644
--- a/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts
+++ b/src/layouts/BasicLayout/components/SettingDrawer/components/index.ts
@@ -1,5 +1,5 @@
-import DarkMode from './DarkMode.vue';
-import NavMode from './NavMode.vue';
-import SystemTheme from './SystemTheme.vue';
+import DarkMode from './DarkMode/index.vue';
+import NavMode from './NavMode/index.vue';
+import SystemTheme from './SystemTheme/index.vue';
export { DarkMode, NavMode, SystemTheme };
diff --git a/src/layouts/BasicLayout/components/SettingDrawer/index.vue b/src/layouts/BasicLayout/components/SettingDrawer/index.vue
index b5702e39..e4a52ca0 100644
--- a/src/layouts/BasicLayout/components/SettingDrawer/index.vue
+++ b/src/layouts/BasicLayout/components/SettingDrawer/index.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/store/modules/app/index.ts b/src/store/modules/app/index.ts
index 74cce268..a967dff2 100644
--- a/src/store/modules/app/index.ts
+++ b/src/store/modules/app/index.ts
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia';
import type { GlobalThemeOverrides } from 'naive-ui';
import { themeSettings } from '@/settings';
-import type { ThemeSettings } from '@/interface';
+import type { ThemeSettings, NavMode } from '@/interface';
import { store } from '../../index';
import { getHoverAndPressedColor } from './helpers';
@@ -84,6 +84,10 @@ const appStore = defineStore({
/** 设置系统主题颜色 */
setThemeColor(color: string) {
this.themeSettings.themeColor = color;
+ },
+ /** 设置导航栏模式 */
+ setNavMode(mode: NavMode) {
+ this.themeSettings.navStyle.mode = mode;
}
}
});