mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-24 02:59:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 客户端缓存导致界面设置 Logo 不能正常显示 (#7048)

Browse Source 
Refs #7020
This commit is contained in:
蘭 2024-11-14 16:18:02 +08:00 committed by GitHub
parent bfa667584a
commit 7aad2cf4af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/hooks/use-logo.ts
View File

@ -15,6 +15,6 @@ export const useLogo = async () => {
const link = (document.querySelector("link[rel*='icon']") || document.createElement('link')) as HTMLLinkElement; const link = (document.querySelector("link[rel*='icon']") || document.createElement('link')) as HTMLLinkElement;
link.type = 'image/x-icon'; link.type = 'image/x-icon';
link.rel = 'shortcut icon'; link.rel = 'shortcut icon';
link.href = globalStore.themeConfig.favicon ? '/api/v1/images/favicon' : '/public/favicon.png'; link.href = globalStore.themeConfig.favicon ? `/api/v1/images/favicon?t=${Date.now()}` : '/public/favicon.png';
document.getElementsByTagName('head')[0].appendChild(link); document.getElementsByTagName('head')[0].appendChild(link);
}; };

9
frontend/src/layout/components/Sidebar/components/Logo.vue
View File

@ -1,13 +1,18 @@
<template> <template>
<div class="logo" style="cursor: pointer" @click="goHome"> <div class="logo" style="cursor: pointer" @click="goHome">
<template v-if="isCollapse"> <template v-if="isCollapse">
<img v-if="globalStore.themeConfig.logo" :src="'/api/v1/images/logo'" style="cursor: pointer" alt="logo" /> <img
v-if="globalStore.themeConfig.logo"
:src="`/api/v1/images/logo?t=${Date.now()}`"
style="cursor: pointer"
alt="logo"
/>
<MenuLogo v-else /> <MenuLogo v-else />
</template> </template>
<template v-else> <template v-else>
<img <img
v-if="globalStore.themeConfig.logoWithText" v-if="globalStore.themeConfig.logoWithText"
:src="'/api/v1/images/logoWithText'" :src="`/api/v1/images/logoWithText?t=${Date.now()}`"
style="cursor: pointer" style="cursor: pointer"
alt="logo" alt="logo"
/> />

4
frontend/src/utils/xpack.ts
View File

@ -32,9 +32,9 @@ export function initFavicon() {
</svg> </svg>
`; `;
goldLink = `data:image/svg+xml,${encodeURIComponent(svg)}`; goldLink = `data:image/svg+xml,${encodeURIComponent(svg)}`;
link.href = favicon ? '/api/v1/images/favicon' : goldLink; link.href = favicon ? `/api/v1/images/favicon?t=${Date.now()}` : goldLink;
} else { } else {
link.href = favicon ? '/api/v1/images/favicon' : '/public/favicon.png'; link.href = favicon ? `/api/v1/images/favicon?t=${Date.now()}` : '/public/favicon.png';
} }
document.head.appendChild(link); document.head.appendChild(link);
} }

6
frontend/src/views/setting/about/index.vue
View File

@ -4,7 +4,11 @@
<template #main> <template #main>
<div style="text-align: center; margin-top: 20px"> <div style="text-align: center; margin-top: 20px">
<div style="justify-self: center" class="logo"> <div style="justify-self: center" class="logo">
<img v-if="globalStore.themeConfig.logo" style="width: 80px" :src="'/api/v1/images/logo'" /> <img
v-if="globalStore.themeConfig.logo"
style="width: 80px"
:src="`/api/v1/images/logo?t=${Date.now()}`"
/>
<PrimaryLogo v-else /> <PrimaryLogo v-else />
</div> </div>
<h3 class="description">{{ globalStore.themeConfig.title || $t('setting.description') }}</h3> <h3 class="description">{{ globalStore.themeConfig.title || $t('setting.description') }}</h3>