From f32a7105c38ee455c4b165d48651ef19fc6948db Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 18:35:55 +0800
Subject: [PATCH] !68 修复升级依赖带来的问题 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/layout/components/Settings/index.vue | 207 +++++++++++++++++++++++++--------------------------
1 files changed, 102 insertions(+), 105 deletions(-)
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 3360959..2a2e077 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,25 +1,28 @@
<template>
- <el-drawer v-model="showSettings" :withHeader="false" direction="rtl" size="300px">
- <div class="setting-drawer-title">
- <h3 class="drawer-title">涓婚椋庢牸璁剧疆</h3>
- </div>
+ <el-drawer v-model="showSettings" :with-header="false" direction="rtl" size="300px" close-on-click-modal>
+ <h3 class="drawer-title">涓婚椋庢牸璁剧疆</h3>
+
<div class="setting-drawer-block-checbox">
- <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
+ <div class="setting-drawer-block-checbox-item" @click="handleTheme(SideThemeEnum.DARK)">
<img src="@/assets/images/dark.svg" alt="dark" />
- <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+ <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block">
<i aria-label="鍥炬爣: check" class="anticon anticon-check">
<svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class>
- <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
+ <path
+ d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
+ />
</svg>
</i>
</div>
</div>
- <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
+ <div class="setting-drawer-block-checbox-item" @click="handleTheme(SideThemeEnum.LIGHT)">
<img src="@/assets/images/light.svg" alt="light" />
- <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+ <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block">
<i aria-label="鍥炬爣: check" class="anticon anticon-check">
<svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class>
- <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
+ <path
+ d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
+ />
</svg>
</i>
</div>
@@ -28,9 +31,16 @@
<div class="drawer-item">
<span>涓婚棰滆壊</span>
<span class="comp-style">
- <el-color-picker v-model="theme" :predefine="predefineColors" @change="themeChange"/>
+ <el-color-picker v-model="theme" :predefine="predefineColors" @change="themeChange" />
</span>
</div>
+ <div class="drawer-item">
+ <span>娣辫壊妯″紡</span>
+ <span class="comp-style">
+ <el-switch v-model="isDark" class="drawer-switch" @change="toggleDark" />
+ </span>
+ </div>
+
<el-divider />
<h3 class="drawer-title">绯荤粺甯冨眬閰嶇疆</h3>
@@ -38,35 +48,35 @@
<div class="drawer-item">
<span>寮�鍚� TopNav</span>
<span class="comp-style">
- <el-switch v-model="topNav" class="drawer-switch" />
+ <el-switch v-model="settingsStore.topNav" class="drawer-switch" @change="topNavChange" />
</span>
</div>
<div class="drawer-item">
<span>寮�鍚� Tags-Views</span>
<span class="comp-style">
- <el-switch v-model="tagsView" class="drawer-switch" />
+ <el-switch v-model="settingsStore.tagsView" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>鍥哄畾 Header</span>
<span class="comp-style">
- <el-switch v-model="fixedHeader" class="drawer-switch" />
+ <el-switch v-model="settingsStore.fixedHeader" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>鏄剧ず Logo</span>
<span class="comp-style">
- <el-switch v-model="sidebarLogo" class="drawer-switch" />
+ <el-switch v-model="settingsStore.sidebarLogo" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>鍔ㄦ�佹爣棰�</span>
<span class="comp-style">
- <el-switch v-model="dynamicTitle" class="drawer-switch" />
+ <el-switch v-model="settingsStore.dynamicTitle" class="drawer-switch" @change="dynamicTitleChange" />
</span>
</div>
@@ -75,110 +85,98 @@
<el-button type="primary" plain icon="DocumentAdd" @click="saveSetting">淇濆瓨閰嶇疆</el-button>
<el-button plain icon="Refresh" @click="resetSetting">閲嶇疆閰嶇疆</el-button>
</el-drawer>
-
</template>
-<script setup>
-import variables from '@/assets/styles/variables.module.scss'
-import originElementPlus from 'element-plus/theme-chalk/index.css'
-import axios from 'axios'
-import { ElLoading, ElMessage } from 'element-plus'
-import { useDynamicTitle } from '@/utils/dynamicTitle'
-import useAppStore from '@/store/modules/app'
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
-import { handleThemeStyle } from '@/utils/theme'
+<script setup lang="ts">
+import { useDynamicTitle } from '@/utils/dynamicTitle';
+import useAppStore from '@/store/modules/app';
+import useSettingsStore from '@/store/modules/settings';
+import usePermissionStore from '@/store/modules/permission';
+import { handleThemeStyle } from '@/utils/theme';
+import { SideThemeEnum } from '@/enums/SideThemeEnum';
+import defaultSettings from '@/settings';
-const { proxy } = getCurrentInstance();
-const appStore = useAppStore()
-const settingsStore = useSettingsStore()
-const permissionStore = usePermissionStore()
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const appStore = useAppStore();
+const settingsStore = useSettingsStore();
+const permissionStore = usePermissionStore();
+
const showSettings = ref(false);
const theme = ref(settingsStore.theme);
const sideTheme = ref(settingsStore.sideTheme);
const storeSettings = computed(() => settingsStore);
-const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
+const predefineColors = ref(['#409EFF', '#ff4500', '#ff8c00', '#ffd700', '#90ee90', '#00ced1', '#1e90ff', '#c71585']);
-/** 鏄惁闇�瑕乼opnav */
-const topNav = computed({
- get: () => storeSettings.value.topNav,
- set: (val) => {
- settingsStore.changeSetting({ key: 'topNav', value: val })
- if (!val) {
- appStore.toggleSideBarHide(false);
- permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
- }
+// 鏄惁鏆楅粦妯″紡
+const isDark = useDark({
+ storageKey: 'useDarkKey',
+ valueDark: 'dark',
+ valueLight: 'light'
+});
+// 鍖归厤鑿滃崟棰滆壊
+watch(isDark, () => {
+ if (isDark.value) {
+ settingsStore.sideTheme = SideThemeEnum.DARK;
+ } else {
+ settingsStore.sideTheme = sideTheme.value;
}
-})
-/** 鏄惁闇�瑕乼agview */
-const tagsView = computed({
- get: () => storeSettings.value.tagsView,
- set: (val) => {
- settingsStore.changeSetting({ key: 'tagsView', value: val })
- }
-})
-/**鏄惁闇�瑕佸浐瀹氬ご閮� */
-const fixedHeader = computed({
- get: () => storeSettings.value.fixedHeader,
- set: (val) => {
- settingsStore.changeSetting({ key: 'fixedHeader', value: val })
- }
-})
-/**鏄惁闇�瑕佷晶杈规爮鐨刲ogo */
-const sidebarLogo = computed({
- get: () => storeSettings.value.sidebarLogo,
- set: (val) => {
- settingsStore.changeSetting({ key: 'sidebarLogo', value: val })
- }
-})
-/**鏄惁闇�瑕佷晶杈规爮鐨勫姩鎬佺綉椤电殑title */
-const dynamicTitle = computed({
- get: () => storeSettings.value.dynamicTitle,
- set: (val) => {
- settingsStore.changeSetting({ key: 'dynamicTitle', value: val })
- // 鍔ㄦ�佽缃綉椤垫爣棰�
- useDynamicTitle()
- }
-})
+});
+const toggleDark = () => useToggle(isDark);
-function themeChange(val) {
- settingsStore.changeSetting({ key: 'theme', value: val })
- theme.value = val;
+const topNavChange = (val) => {
+ if (!val) {
+ appStore.toggleSideBarHide(false);
+ permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
+ }
+};
+
+const dynamicTitleChange = () => {
+ // 鍔ㄦ�佽缃綉椤垫爣棰�
+ useDynamicTitle();
+};
+
+const themeChange = (val: string) => {
+ settingsStore.theme = val;
handleThemeStyle(val);
-}
-function handleTheme(val) {
- settingsStore.changeSetting({ key: 'sideTheme', value: val })
+};
+const handleTheme = (val: string) => {
sideTheme.value = val;
-}
-function saveSetting() {
- proxy.$modal.loading("姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍊�...");
- let layoutSetting = {
- "topNav": storeSettings.value.topNav,
- "tagsView": storeSettings.value.tagsView,
- "fixedHeader": storeSettings.value.fixedHeader,
- "sidebarLogo": storeSettings.value.sidebarLogo,
- "dynamicTitle": storeSettings.value.dynamicTitle,
- "sideTheme": storeSettings.value.sideTheme,
- "theme": storeSettings.value.theme
- };
- localStorage.setItem("layout-setting", JSON.stringify(layoutSetting));
- setTimeout(proxy.$modal.closeLoading(), 1000)
-}
-function resetSetting() {
- proxy.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...");
- localStorage.removeItem("layout-setting")
- setTimeout("window.location.reload()", 1000)
-}
-function openSetting() {
+ if (isDark.value && val === SideThemeEnum.LIGHT) {
+ // 鏆楅粦妯″紡棰滆壊涓嶅彉
+ settingsStore.sideTheme = SideThemeEnum.DARK;
+ return;
+ }
+ settingsStore.sideTheme = val;
+};
+const saveSetting = () => {
+ proxy?.$modal.loading('姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍊�...');
+ const settings = useStorage<LayoutSetting>('layout-setting', defaultSettings);
+ settings.value.topNav = storeSettings.value.topNav;
+ settings.value.tagsView = storeSettings.value.tagsView;
+ settings.value.fixedHeader = storeSettings.value.fixedHeader;
+ settings.value.sidebarLogo = storeSettings.value.sidebarLogo;
+ settings.value.dynamicTitle = storeSettings.value.dynamicTitle;
+ settings.value.sideTheme = storeSettings.value.sideTheme;
+ settings.value.theme = storeSettings.value.theme;
+ setTimeout(() => {
+ proxy?.$modal.closeLoading();
+ }, 1000);
+};
+const resetSetting = () => {
+ proxy?.$modal.loading('姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...');
+ useStorage<any>('layout-setting', null).value = null;
+ setTimeout('window.location.reload()', 1000);
+};
+const openSetting = () => {
showSettings.value = true;
-}
+};
defineExpose({
- openSetting,
-})
+ openSetting
+});
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
.setting-drawer-title {
margin-bottom: 12px;
color: rgba(0, 0, 0, 0.85);
@@ -229,7 +227,6 @@
}
.drawer-item {
- color: rgba(0, 0, 0, 0.65);
padding: 12px 0;
font-size: 14px;
@@ -238,4 +235,4 @@
margin: -3px 8px 0px 0px;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3