From 01588ed9b5005da08c66ebde9027a1590e545da1 Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:12:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=20(#5442?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #5435
---
 frontend/src/utils/xpack.ts                   | 51 +++++++++++--------
 .../views/host/terminal/terminal/index.vue    |  2 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/frontend/src/utils/xpack.ts b/frontend/src/utils/xpack.ts
index 2f286756b..505f6311d 100644
--- a/frontend/src/utils/xpack.ts
+++ b/frontend/src/utils/xpack.ts
@@ -23,14 +23,17 @@ export function initFavicon() {
 }
 
 export async function getXpackSetting() {
-    const searchXSettingGlob = import.meta.glob('xpack/api/modules/setting.ts');
-    const module = await searchXSettingGlob?.['../xpack/api/modules/setting.ts']?.();
-    const res = await module?.searchXSetting();
-    if (!res) {
-        resetXSetting();
-        return;
+    let searchXSetting;
+    const xpackModules = import.meta.glob('../xpack/api/modules/setting.ts', { eager: true });
+    if (xpackModules['../xpack/api/modules/setting.ts']) {
+        searchXSetting = xpackModules['../xpack/api/modules/setting.ts']['searchXSetting'] || {};
+        const res = await searchXSetting();
+        if (!res) {
+            resetXSetting();
+            return;
+        }
+        return res;
     }
-    return res;
 }
 
 const loadDataFromDB = async () => {
@@ -81,24 +84,30 @@ export async function getXpackSettingForTheme() {
         return;
     }
 
-    const searchXSettingGlob = import.meta.glob('xpack/api/modules/setting.ts');
-    const module = await searchXSettingGlob?.['../xpack/api/modules/setting.ts']?.();
-    const res2 = await module?.searchXSetting();
-    if (res2) {
-        globalStore.themeConfig.title = res2.data?.title;
-        globalStore.themeConfig.logo = res2.data?.logo;
-        globalStore.themeConfig.logoWithText = res2.data?.logoWithText;
-        globalStore.themeConfig.favicon = res2.data?.favicon;
-        globalStore.themeConfig.isGold = res2.data?.theme === 'dark-gold';
-    } else {
-        resetXSetting();
+    let searchXSetting;
+    const xpackModules = import.meta.glob('../xpack/api/modules/setting.ts', { eager: true });
+    if (xpackModules['../xpack/api/modules/setting.ts']) {
+        searchXSetting = xpackModules['../xpack/api/modules/setting.ts']['searchXSetting'] || {};
+        const res2 = await searchXSetting();
+        if (res2) {
+            globalStore.themeConfig.title = res2.data?.title;
+            globalStore.themeConfig.logo = res2.data?.logo;
+            globalStore.themeConfig.logoWithText = res2.data?.logoWithText;
+            globalStore.themeConfig.favicon = res2.data?.favicon;
+            globalStore.themeConfig.isGold = res2.data?.theme === 'dark-gold';
+        } else {
+            resetXSetting();
+        }
     }
     switchTheme();
     initFavicon();
 }
 
 export async function updateXpackSettingByKey(key: string, value: string) {
-    const searchXSettingGlob = import.meta.glob('xpack/api/modules/setting.ts');
-    const module = await searchXSettingGlob?.['../xpack/api/modules/setting.ts']?.();
-    return module?.updateXSettingByKey(key, value);
+    let updateXSettingByKey;
+    const xpackModules = import.meta.glob('../xpack/api/modules/setting.ts', { eager: true });
+    if (xpackModules['../xpack/api/modules/setting.ts']) {
+        updateXSettingByKey = xpackModules['../xpack/api/modules/setting.ts']['updateXSettingByKey'] || {};
+        return updateXSettingByKey(key, value);
+    }
 }
diff --git a/frontend/src/views/host/terminal/terminal/index.vue b/frontend/src/views/host/terminal/terminal/index.vue
index 0139a1c62..83a4379de 100644
--- a/frontend/src/views/host/terminal/terminal/index.vue
+++ b/frontend/src/views/host/terminal/terminal/index.vue
@@ -448,7 +448,7 @@ onMounted(() => {
     font-weight: 600;
 }
 .fullScreen {
-    background-color: #efefef;
+    background-color: transparent;
     border: none;
     position: absolute;
     right: 50px;