From 471b7d965747104772101758cd624bc33d04771e Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 29 Mar 2024 17:24:07 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=20Logo=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20(#4357)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/license-import/index.vue       |  2 +-
 frontend/src/lang/modules/en.ts                        |  2 +-
 frontend/src/lang/modules/tw.ts                        |  2 +-
 .../src/layout/components/Sidebar/components/Logo.vue  |  2 +-
 frontend/src/layout/index.vue                          |  3 +--
 frontend/src/views/login/components/login-form.vue     | 10 ++++++++++
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/license-import/index.vue b/frontend/src/components/license-import/index.vue
index 6afdab74c..dd2a1b6d5 100644
--- a/frontend/src/components/license-import/index.vue
+++ b/frontend/src/components/license-import/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-dialog v-model="open" :close-on-click-modal="false" @close="handleClose">
-            <div style="text-align: center">
+            <div style="text-align: center" v-loading="loading">
                 <span class="text-3xl font-medium">{{ $t('license.levelUpPro') }}</span>
                 <el-row type="flex" justify="center" class="mt-6">
                     <el-col :span="22">
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
index ccc7d5024..7fa4a3271 100644
--- a/frontend/src/lang/modules/en.ts
+++ b/frontend/src/lang/modules/en.ts
@@ -1458,7 +1458,7 @@ const message = {
 
         license: 'License',
     },
-    License: {
+    license: {
         community: 'Community Edition',
         pro: 'Professional Edition',
         trial: 'Trial Edition',
diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts
index e5b0125df..a84a19399 100644
--- a/frontend/src/lang/modules/tw.ts
+++ b/frontend/src/lang/modules/tw.ts
@@ -1358,7 +1358,7 @@ const message = {
 
         license: '許可證',
     },
-    License: {
+    license: {
         community: '社區版',
         pro: '專業版',
         trial: '試用版',
diff --git a/frontend/src/layout/components/Sidebar/components/Logo.vue b/frontend/src/layout/components/Sidebar/components/Logo.vue
index de965ed1e..e6d2fc27e 100644
--- a/frontend/src/layout/components/Sidebar/components/Logo.vue
+++ b/frontend/src/layout/components/Sidebar/components/Logo.vue
@@ -36,7 +36,7 @@ const getLogoUrl = (isCollapse: boolean) => {
     img {
         object-fit: contain;
         width: 95%;
-        height: 40px;
+        height: 50px;
     }
 }
 </style>
diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue
index 1e85dfb98..212e517bc 100644
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@@ -75,7 +75,6 @@ const loadDataFromDB = async () => {
 
 const loadDataFromXDB = async () => {
     const res = await searchXSetting();
-    localStorage.setItem('1p-favicon', res.data.logo);
     globalStore.themeConfig.title = res.data.title;
     globalStore.themeConfig.logo = res.data.logo;
     globalStore.themeConfig.logoWithText = res.data.logoWithText;
@@ -110,7 +109,7 @@ const updateDarkMode = async (event: MediaQueryListEvent) => {
 };
 
 const initFavicon = () => {
-    let favicon = localStorage.getItem('1p-favicon');
+    let favicon = globalStore.themeConfig.favicon;
     const link = (document.querySelector("link[rel*='icon']") || document.createElement('link')) as HTMLLinkElement;
     link.type = 'image/x-icon';
     link.rel = 'shortcut icon';
diff --git a/frontend/src/views/login/components/login-form.vue b/frontend/src/views/login/components/login-form.vue
index 114367ae6..838e7081e 100644
--- a/frontend/src/views/login/components/login-form.vue
+++ b/frontend/src/views/login/components/login-form.vue
@@ -319,9 +319,19 @@ const loadLanguage = async () => {
     } catch (error) {}
 };
 
+const loadFavicon = () => {
+    let favicon = globalStore.themeConfig.favicon;
+    const link = (document.querySelector("link[rel*='icon']") || document.createElement('link')) as HTMLLinkElement;
+    link.type = 'image/x-icon';
+    link.rel = 'shortcut icon';
+    link.href = favicon ? '/api/v1/images/favicon' : '/public/favicon.png';
+    document.getElementsByTagName('head')[0].appendChild(link);
+};
+
 onMounted(() => {
     globalStore.isOnRestart = false;
     loginVerify();
+    loadFavicon();
     loadLanguage();
     document.title = globalStore.themeConfig.panelName;
     loginForm.agreeLicense = globalStore.agreeLicense;