From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/layout/components/Settings/index.vue | 176 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index d5522ae..c748998 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,11 +1,11 @@
<template>
- <el-drawer v-model="showSettings" :withHeader="false" direction="rtl" size="300px" close-on-click-modal>
+ <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(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
@@ -17,7 +17,7 @@
</div>
<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
@@ -37,7 +37,7 @@
<div class="drawer-item">
<span>娣辫壊妯″紡</span>
<span class="comp-style">
- <el-switch v-model="isDark" @change="toggleDark" class="drawer-switch" />
+ <el-switch v-model="isDark" class="drawer-switch" @change="toggleDark" />
</span>
</div>
@@ -88,126 +88,126 @@
</template>
<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 { ComponentInternalInstance } from "vue";
-import { SettingTypeEnum } from "@/enums/SettingTypeEnum";
-import { SideThemeEnum } from "@/enums/SideThemeEnum";
+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 { SettingTypeEnum } from '@/enums/SettingTypeEnum';
+import { SideThemeEnum } from '@/enums/SideThemeEnum';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const appStore = useAppStore()
-const settingsStore = useSettingsStore()
-const permissionStore = usePermissionStore()
-
+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']);
// 鏄惁鏆楅粦妯″紡
const isDark = useDark({
storageKey: 'useDarkKey',
valueDark: 'dark',
- valueLight: 'light',
+ valueLight: 'light'
});
-watch(isDark, ()=> {
+watch(isDark, () => {
if (isDark.value) {
- settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: SideThemeEnum.DARK })
+ settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: SideThemeEnum.DARK });
} else {
- settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: sideTheme.value })
+ settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: sideTheme.value });
}
-})
+});
const toggleDark = () => useToggle(isDark);
/** 鏄惁闇�瑕乼opNav */
const topNav = computed({
- get: () => storeSettings.value.topNav,
- set: (val) => {
- settingsStore.changeSetting({ key: SettingTypeEnum.TOP_NAV, value: val })
- if (!val) {
- appStore.toggleSideBarHide(false);
- permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
- }
+ get: () => storeSettings.value.topNav,
+ set: (val) => {
+ settingsStore.changeSetting({ key: SettingTypeEnum.TOP_NAV, value: val });
+ if (!val) {
+ appStore.toggleSideBarHide(false);
+ permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
}
-})
+ }
+});
/** 鏄惁闇�瑕乼agview */
const tagsView = computed({
- get: () => storeSettings.value.tagsView,
- set: (val) => {
- settingsStore.changeSetting({ key: SettingTypeEnum.TAGS_VIEW, value: val })
- }
-})
+ get: () => storeSettings.value.tagsView,
+ set: (val) => {
+ settingsStore.changeSetting({ key: SettingTypeEnum.TAGS_VIEW, value: val });
+ }
+});
/**鏄惁闇�瑕佸浐瀹氬ご閮� */
const fixedHeader = computed({
- get: () => storeSettings.value.fixedHeader,
- set: (val) => {
- settingsStore.changeSetting({ key: SettingTypeEnum.FIXED_HEADER, value: val })
- }
-})
+ get: () => storeSettings.value.fixedHeader,
+ set: (val) => {
+ settingsStore.changeSetting({ key: SettingTypeEnum.FIXED_HEADER, value: val });
+ }
+});
/**鏄惁闇�瑕佷晶杈规爮鐨刲ogo */
const sidebarLogo = computed({
- get: () => storeSettings.value.sidebarLogo,
- set: (val) => {
- settingsStore.changeSetting({ key: SettingTypeEnum.SIDEBAR_LOGO, value: val })
- }
-})
+ get: () => storeSettings.value.sidebarLogo,
+ set: (val) => {
+ settingsStore.changeSetting({ key: SettingTypeEnum.SIDEBAR_LOGO, value: val });
+ }
+});
/**鏄惁闇�瑕佷晶杈规爮鐨勫姩鎬佺綉椤电殑title */
const dynamicTitle = computed({
- get: () => storeSettings.value.dynamicTitle,
- set: (val) => {
- settingsStore.changeSetting({ key: SettingTypeEnum.DYNAMIC_TITLE, value: val })
- // 鍔ㄦ�佽缃綉椤垫爣棰�
- useDynamicTitle()
- }
-})
+ get: () => storeSettings.value.dynamicTitle,
+ set: (val) => {
+ settingsStore.changeSetting({ key: SettingTypeEnum.DYNAMIC_TITLE, value: val });
+ // 鍔ㄦ�佽缃綉椤垫爣棰�
+ useDynamicTitle();
+ }
+});
-const themeChange = (val: string | null) => {
- settingsStore.changeSetting({ key: SettingTypeEnum.THEME, value: val })
- theme.value = val;
- if (val) {
- handleThemeStyle(val);
- }
-}
+const themeChange = (val: string) => {
+ settingsStore.changeSetting({ key: SettingTypeEnum.THEME, value: val });
+ theme.value = val;
+ if (val) {
+ handleThemeStyle(val);
+ }
+};
const handleTheme = (val: string) => {
- sideTheme.value = val;
- if (isDark.value && val === SideThemeEnum.LIGHT) {
- // 鏆楅粦妯″紡棰滆壊涓嶅彉
- settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: SideThemeEnum.DARK })
- return
- }
- settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: val })
-}
+ sideTheme.value = val;
+ if (isDark.value && val === SideThemeEnum.LIGHT) {
+ // 鏆楅粦妯″紡棰滆壊涓嶅彉
+ settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: SideThemeEnum.DARK });
+ return;
+ }
+ settingsStore.changeSetting({ key: SettingTypeEnum.SIDE_THEME, value: val });
+};
const 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)
-}
+ 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);
+};
const resetSetting = () => {
- proxy?.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...");
- localStorage.removeItem("layout-setting")
- setTimeout("window.location.reload()", 1000)
-}
+ proxy?.$modal.loading('姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...');
+ localStorage.removeItem('layout-setting');
+ setTimeout('window.location.reload()', 1000);
+};
const openSetting = () => {
- showSettings.value = true;
-}
+ showSettings.value = true;
+};
defineExpose({
- openSetting,
-})
+ openSetting
+});
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3