From 736effaa268e561dbe4802b29a7f0a476a89297b Mon Sep 17 00:00:00 2001 From: xlsea Date: Wed, 10 Jul 2024 09:24:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sj=5F1.1.0-beta3):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B0=B4=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/modules/theme-drawer/modules/page-fun.vue | 2 +- src/store/modules/auth/index.ts | 5 +++++ src/theme/settings.ts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/layouts/modules/theme-drawer/modules/page-fun.vue b/src/layouts/modules/theme-drawer/modules/page-fun.vue index dd4b23e..a63ebcb 100644 --- a/src/layouts/modules/theme-drawer/modules/page-fun.vue +++ b/src/layouts/modules/theme-drawer/modules/page-fun.vue @@ -106,7 +106,7 @@ const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wra - + diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index 13bdda2..15116d8 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -10,11 +10,13 @@ import { $t } from '@/locales'; import { roleTypeRecord } from '@/constants/business'; import { useRouteStore } from '../route'; import { useTabStore } from '../tab'; +import { useThemeStore } from '../theme'; import { clearAuthStorage, getToken } from './shared'; export const useAuthStore = defineStore(SetupStoreId.Auth, () => { const route = useRoute(); const routeStore = useRouteStore(); + const themeStore = useThemeStore(); const tabStore = useTabStore(); const { toLogin, redirectFromLogin } = useRouterPush(false); const { loading: loginLoading, startLoading, endLoading } = useLoading(); @@ -54,6 +56,8 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { authStore.$reset(); + themeStore.setWatermarkText(import.meta.env.VITE_APP_TITLE || 'Snail Job'); + if (!route.meta.constant) { await toLogin(); } @@ -78,6 +82,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { const pass = await loginByToken(loginToken); if (pass) { + themeStore.setWatermarkText(userInfo.userName); await routeStore.initAuthRoute(); if (redirect) { diff --git a/src/theme/settings.ts b/src/theme/settings.ts index 339a80a..5704b27 100644 --- a/src/theme/settings.ts +++ b/src/theme/settings.ts @@ -49,7 +49,7 @@ export const themeSettings: App.Theme.ThemeSetting = { }, watermark: { visible: true, - text: 'Snail Job' + text: import.meta.env.VITE_APP_TITLE || 'Snail Job' } };