From f5a16e4534b815471fdd22edab89a010d492c4aa Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 十月 2022 20:13:44 +0800
Subject: [PATCH] 修复使用透明底png图片时，自动填充黑色背景
---
src/layout/components/Settings/index.vue | 59 +++++++++++++++++++++++------------------------------------
1 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 3c39c64..3bf28fe 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -28,7 +28,7 @@
<div class="drawer-item">
<span>涓婚棰滆壊</span>
<span class="comp-style">
- <el-color-picker size="small" v-model="theme" :predefine="predefineColors" @change="themeChange"/>
+ <el-color-picker v-model="theme" :predefine="predefineColors" @change="themeChange"/>
</span>
</div>
<el-divider />
@@ -72,8 +72,8 @@
<el-divider />
- <el-button size="small" type="primary" plain icon="DocumentAdd" @click="saveSetting">淇濆瓨閰嶇疆</el-button>
- <el-button size="small" plain icon="Refresh" @click="resetSetting">閲嶇疆閰嶇疆</el-button>
+ <el-button type="primary" plain icon="DocumentAdd" @click="saveSetting">淇濆瓨閰嶇疆</el-button>
+ <el-button plain icon="Refresh" @click="resetSetting">閲嶇疆閰嶇疆</el-button>
</el-drawer>
</template>
@@ -84,25 +84,29 @@
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'
const { proxy } = getCurrentInstance();
-const store = useStore();
+const appStore = useAppStore()
+const settingsStore = useSettingsStore()
+const permissionStore = usePermissionStore()
const showSettings = ref(false);
-const theme = ref(store.state.settings.theme);
-const sideTheme = ref(store.state.settings.sideTheme);
-const storeSettings = computed(() => store.state.settings);
+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"]);
/** 鏄惁闇�瑕乼opnav */
const topNav = computed({
get: () => storeSettings.value.topNav,
set: (val) => {
- store.dispatch('settings/changeSetting', {
- key: 'topNav',
- value: val
- })
+ settingsStore.changeSetting({ key: 'topNav', value: val })
if (!val) {
- store.commit("SET_SIDEBAR_ROUTERS", store.state.permission.defaultRoutes);
+ appStore.toggleSideBarHide(false);
+ permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
}
}
})
@@ -110,57 +114,40 @@
const tagsView = computed({
get: () => storeSettings.value.tagsView,
set: (val) => {
- store.dispatch('settings/changeSetting', {
- key: 'tagsView',
- value: val
- })
+ settingsStore.changeSetting({ key: 'tagsView', value: val })
}
})
/**鏄惁闇�瑕佸浐瀹氬ご閮� */
const fixedHeader = computed({
get: () => storeSettings.value.fixedHeader,
set: (val) => {
- store.dispatch('settings/changeSetting', {
- key: 'fixedHeader',
- value: val
- })
+ settingsStore.changeSetting({ key: 'fixedHeader', value: val })
}
})
/**鏄惁闇�瑕佷晶杈规爮鐨刲ogo */
const sidebarLogo = computed({
get: () => storeSettings.value.sidebarLogo,
set: (val) => {
- store.dispatch('settings/changeSetting', {
- key: 'sidebarLogo',
- value: val
- })
+ settingsStore.changeSetting({ key: 'sidebarLogo', value: val })
}
})
/**鏄惁闇�瑕佷晶杈规爮鐨勫姩鎬佺綉椤电殑title */
const dynamicTitle = computed({
get: () => storeSettings.value.dynamicTitle,
set: (val) => {
- store.dispatch('settings/changeSetting', {
- key: 'dynamicTitle',
- value: val
- })
+ settingsStore.changeSetting({ key: 'dynamicTitle', value: val })
// 鍔ㄦ�佽缃綉椤垫爣棰�
useDynamicTitle()
}
})
function themeChange(val) {
- store.dispatch('settings/changeSetting', {
- key: 'theme',
- value: val
- })
+ settingsStore.changeSetting({ key: 'theme', value: val })
theme.value = val;
+ handleThemeStyle(val);
}
function handleTheme(val) {
- store.dispatch('settings/changeSetting', {
- key: 'sideTheme',
- value: val
- })
+ settingsStore.changeSetting({ key: 'sideTheme', value: val })
sideTheme.value = val;
}
function saveSetting() {
--
Gitblit v1.9.3