From 23f1bf22c42a904c05cee63e10c9fd8b60dfe8f5 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 20 九月 2022 14:54:56 +0800
Subject: [PATCH] Default Changelist
---
src/App.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 5e39821..9227320 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,20 +4,19 @@
<!-- <router-view v-if="!$route.meta.iskeepAlive" :key="$route.id"></router-view>-->
<!-- </keep-alive>-->
<!-- </transition>-->
- <router-view v-if="!$route.meta.iskeepAlive" v-slot="{ Component }">
- <transition name="fade" mode="in-out">
- <keep-alive :exclude="excludeList" :include="includeList">
- <component :is="Component" :key="$route.id"></component>
- </keep-alive>
- </transition>
- </router-view>
- <!-- <el-config-provider :size="getGlobalComponentSize" :locale="i18nLocale">-->
- <!-- <router-view v-show="themeConfig.lockScreenTime > 1" />-->
- <!-- <router-view v-show="themeConfig.lockScreenTime > 1" />-->
- <!-- <LockScreen v-if="themeConfig.isLockScreen" />-->
- <!-- <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />-->
- <!-- <CloseFull v-if="!themeConfig.isLockScreen" />-->
- <!-- </el-config-provider>-->
+ <!-- <router-view v-if="!$route.meta.iskeepAlive" v-slot="{ Component }">-->
+ <!-- <transition name="fade" mode="in-out">-->
+ <!-- <keep-alive :exclude="excludeList" :include="includeList">-->
+ <!-- <components :is="Component" :key="$route.id"></components>-->
+ <!-- </keep-alive>-->
+ <!-- </transition>-->
+ <!-- </router-view>-->
+ <el-config-provider :size="getGlobalComponentSize" :locale="i18nLocale">
+ <router-view v-show="themeConfig.lockScreenTime > 1" />
+ <LockScreen v-if="themeConfig.isLockScreen" />
+ <Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
+ <CloseFull v-if="!themeConfig.isLockScreen" />
+ </el-config-provider>
</template>
<script lang="ts">
@@ -76,9 +75,10 @@
proxy.mittBus.on('getI18nConfig', (locale: string) => {
(state.i18nLocale as string | null) = locale;
});
- // 获取缓存中的布局配置
+ // 获取缓存中的布局配置;
if (Local.get('themeConfig')) {
- storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
+ storesThemeConfig.setThemeConfig(themeConfig.value);
+ // storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
document.documentElement.style.cssText = Local.get('themeConfigStyle');
}
// 获取缓存中的全屏配置
--
Gitblit v1.9.2