From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期四, 14 十二月 2023 16:17:12 +0800 Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * 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/App.vue | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/App.vue b/src/App.vue index 31839f2..a93790a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,15 +1,21 @@ <template> - <router-view /> + <el-config-provider :locale="appStore.locale" :size="size"> + <router-view /> + </el-config-provider> </template> -<script setup> -import useSettingsStore from '@/store/modules/settings' -import { handleThemeStyle } from '@/utils/theme' +<script setup lang="ts"> +import useSettingsStore from '@/store/modules/settings'; +import { handleThemeStyle } from '@/utils/theme'; +import useAppStore from '@/store/modules/app'; + +const appStore = useAppStore(); +const size = computed(() => appStore.size); onMounted(() => { nextTick(() => { // 鍒濆鍖栦富棰樻牱寮� - handleThemeStyle(useSettingsStore().theme) - }) -}) + handleThemeStyle(useSettingsStore().theme); + }); +}); </script> -- Gitblit v1.9.3