From 64036d520f8d1e41390bdf097fb87039701d0efe Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期五, 01 十二月 2023 14:20:45 +0800 Subject: [PATCH] 升级组件依赖到最新版本 --- src/layout/components/Settings/index.vue | 99 ++++++++++--------------------------------------- 1 files changed, 21 insertions(+), 78 deletions(-) diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 3c39c64..38f2d2b 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 /> @@ -38,129 +38,72 @@ <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" /> </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" /> </span> </div> <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> <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' 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 - }) - if (!val) { - store.commit("SET_SIDEBAR_ROUTERS", store.state.permission.defaultRoutes); - } - } -}) -/** 鏄惁闇�瑕乼agview */ -const tagsView = computed({ - get: () => storeSettings.value.tagsView, - set: (val) => { - store.dispatch('settings/changeSetting', { - key: 'tagsView', - value: val - }) - } -}) -/**鏄惁闇�瑕佸浐瀹氬ご閮� */ -const fixedHeader = computed({ - get: () => storeSettings.value.fixedHeader, - set: (val) => { - store.dispatch('settings/changeSetting', { - key: 'fixedHeader', - value: val - }) - } -}) -/**鏄惁闇�瑕佷晶杈规爮鐨刲ogo */ -const sidebarLogo = computed({ - get: () => storeSettings.value.sidebarLogo, - set: (val) => { - store.dispatch('settings/changeSetting', { - key: 'sidebarLogo', - value: val - }) - } -}) -/**鏄惁闇�瑕佷晶杈规爮鐨勫姩鎬佺綉椤电殑title */ -const dynamicTitle = computed({ - get: () => storeSettings.value.dynamicTitle, - set: (val) => { - store.dispatch('settings/changeSetting', { - key: 'dynamicTitle', - value: val - }) - // 鍔ㄦ�佽缃綉椤垫爣棰� - useDynamicTitle() - } -}) - function themeChange(val) { - store.dispatch('settings/changeSetting', { - key: 'theme', - value: val - }) - theme.value = val; + settingsStore.theme = val; + handleThemeStyle(val); } function handleTheme(val) { - store.dispatch('settings/changeSetting', { - key: 'sideTheme', - value: val - }) + settingsStore.sideTheme = val; sideTheme.value = val; } function saveSetting() { -- Gitblit v1.9.3