🐞 fix: 修复一些小问题

imsyy · imsyy · commit d797ac0f1b39 · 2026-01-04T01:25:19.000+08:00
diff --git a/src/components/Modal/Setting/FontManager.vue b/src/components/Modal/Setting/FontManager.vue
@@ -43,7 +43,49 @@
         </n-flex>
       </n-card>
     </div>
-
+    <div class="set-list" v-if="isElectron">
+      <n-h3 prefix="bar">桌面歌词</n-h3>
+      <n-card class="set-item">
+        <div class="label">
+          <n-text class="name">桌面歌词字体</n-text>
+          <n-text class="tip" :depth="3"> 桌面歌词使用的字体 </n-text>
+        </div>
+        <n-flex align="center">
+          <Transition name="fade" mode="out-in">
+            <n-button
+              v-if="desktopLyricConfig.fontFamily !== 'system-ui'"
+              type="primary"
+              strong
+              secondary
+              @click="
+                () => {
+                  desktopLyricConfig.fontFamily = 'system-ui';
+                  saveDesktopLyricConfig();
+                }
+              "
+            >
+              恢复默认
+            </n-button>
+          </Transition>
+          <s-input
+            v-if="settingStore.useCustomFont"
+            v-model:value="desktopLyricConfig.fontFamily"
+            :update-value-on-input="false"
+            placeholder="输入字体名称"
+            class="set"
+            @change="saveDesktopLyricConfig"
+          />
+          <n-select
+            v-else
+            v-model:value="desktopLyricConfig.fontFamily"
+            :options="getOptions('desktop')"
+            class="set"
+            filterable
+            @update:value="saveDesktopLyricConfig"
+          />
+        </n-flex>
+      </n-card>
+    </div>
     <div class="set-list">
       <n-h3 prefix="bar">歌词字体</n-h3>
       <n-card v-for="font in lyricFontConfigs" :key="font.keySetting" class="set-item">
@@ -88,17 +130,29 @@ import { useSettingStore } from "@/stores";
 import { isElectron } from "@/utils/env";
 import type { SelectOption } from "naive-ui";
 import { lyricFontConfigs } from "@/utils/lyricFontConfig";
+import { LyricConfig } from "@/types/desktop-lyric";
+import defaultDesktopLyricConfig from "@/assets/data/lyricConfig";
+import { cloneDeep, isEqual } from "lodash-es";
 
 const settingStore = useSettingStore();
 
 // 系统字体选项
 const systemFonts = ref<SelectOption[]>([]);
 
+// 桌面歌词配置
+const desktopLyricConfig = reactive<LyricConfig>({ ...defaultDesktopLyricConfig });
+
 // 获取下拉选项
 const getOptions = (key: string) => {
   const isGlobal = key === "globalFont";
-  const defaultLabel = isGlobal ? "系统默认" : "跟随全局";
-  const defaultValue = isGlobal ? "default" : "follow";
+  const isDesktop = key === "desktop";
+  let defaultLabel = "跟随全局";
+  let defaultValue = "follow";
+
+  if (isGlobal || isDesktop) {
+    defaultLabel = "系统默认";
+    defaultValue = isGlobal ? "default" : "system-ui";
+  }
 
   return [{ label: defaultLabel, value: defaultValue }, ...systemFonts.value];
 };
@@ -123,8 +177,39 @@ const getAllSystemFonts = async () => {
   }
 };
 
+// 获取桌面歌词配置
+const getDesktopLyricConfig = async () => {
+  if (!isElectron) return;
+  const config = await window.electron.ipcRenderer.invoke("request-desktop-lyric-option");
+  if (config) Object.assign(desktopLyricConfig, config);
+  // 监听更新
+  window.electron.ipcRenderer.on("update-desktop-lyric-option", (_, config) => {
+    if (config && !isEqual(desktopLyricConfig, config)) {
+      Object.assign(desktopLyricConfig, config);
+    }
+  });
+};
+
+// 保存桌面歌词配置
+const saveDesktopLyricConfig = () => {
+  try {
+    if (!isElectron) return;
+    window.electron.ipcRenderer.send(
+      "update-desktop-lyric-option",
+      cloneDeep(desktopLyricConfig),
+      true,
+    );
+    window.$message.success("桌面歌词字体已保存");
+  } catch (error) {
+    console.error("Failed to save options:", error);
+    window.$message.error("桌面歌词配置保存失败");
+    getDesktopLyricConfig();
+  }
+};
+
 onMounted(() => {
   getAllSystemFonts();
+  getDesktopLyricConfig();
 });
 </script>
 
diff --git a/src/components/Setting/LyricsSetting.vue b/src/components/Setting/LyricsSetting.vue
@@ -477,31 +477,7 @@
           <n-text class="name">歌词字体</n-text>
           <n-text class="tip" :depth="3"> 更改桌面歌词字体 </n-text>
         </div>
-        <n-flex>
-          <Transition name="fade" mode="out-in">
-            <n-button
-              v-if="desktopLyricConfig.fontFamily !== 'system-ui'"
-              type="primary"
-              strong
-              secondary
-              @click="
-                () => {
-                  desktopLyricConfig.fontFamily = 'system-ui';
-                  saveDesktopLyricConfig();
-                }
-              "
-            >
-              恢复默认
-            </n-button>
-          </Transition>
-          <n-select
-            v-model:value="desktopLyricConfig.fontFamily"
-            :options="allFontsData"
-            class="set"
-            filterable
-            @update:value="saveDesktopLyricConfig"
-          />
-        </n-flex>
+        <n-button type="primary" strong secondary @click="openFontManager">配置</n-button>
       </n-card>
       <n-card class="set-item">
         <div class="label">
@@ -639,7 +615,6 @@ import { isElectron } from "@/utils/env";
 import { openLyricExclude, openAMLLServer, openFontManager } from "@/utils/modal";
 import { LyricConfig } from "@/types/desktop-lyric";
 import { usePlayerController } from "@/core/player/PlayerController";
-import { SelectOption } from "naive-ui";
 import defaultDesktopLyricConfig from "@/assets/data/lyricConfig";
 
 const props = defineProps<{ scrollTo?: string }>();
@@ -651,20 +626,19 @@ const settingStore = useSettingStore();
 // 桌面歌词区域引用
 const desktopLyricRef = ref<HTMLElement | null>(null);
 
-// 全部字体
-const allFontsData = ref<SelectOption[]>([]);
-
 /**
  * 创建响应式字体大小计算属性
  * 当启用 AMLL 时，翻译和音译的字体大小会根据主歌词大小自动调整
  */
-const fontSizeComputed = (key: string) => computed({
-  get: () => settingStore.useAMLyrics ?
-    // AMLL 会为翻译和音译设置 `font-size: max(.5em, 10px);`
-    Math.max(0.5 * settingStore.lyricFontSize, 10) :
-    settingStore[key],
-  set: (value) => settingStore[key] = value,
-});
+const fontSizeComputed = (key: string) =>
+  computed({
+    get: () =>
+      settingStore.useAMLyrics
+        ? // AMLL 会为翻译和音译设置 `font-size: max(.5em, 10px);`
+          Math.max(0.5 * settingStore.lyricFontSize, 10)
+        : settingStore[key],
+    set: (value) => (settingStore[key] = value),
+  });
 
 // 真实显示的翻译歌词字体大小
 const tranFontSize = fontSizeComputed("lyricTranFontSize");
@@ -673,8 +647,9 @@ const tranFontSize = fontSizeComputed("lyricTranFontSize");
 const romaFontSize = fontSizeComputed("lyricRomaFontSize");
 
 // 显示翻译和音译歌词字体大小被禁用的原因
-const tranFontSizeTitle = computed(() => settingStore.useAMLyrics ?
-  "翻译和音译歌词大小由 Apple Music-like Lyrics 自动设置" : "")
+const tranFontSizeTitle = computed(() =>
+  settingStore.useAMLyrics ? "翻译和音译歌词大小由 Apple Music-like Lyrics 自动设置" : "",
+);
 
 // 桌面歌词配置
 const desktopLyricConfig = reactive<LyricConfig>({ ...defaultDesktopLyricConfig });
diff --git a/src/components/Setting/PlaySetting.vue b/src/components/Setting/PlaySetting.vue
@@ -111,7 +111,7 @@
         />
       </n-card>
     </div>
-    <div v-if="isElectron && statusStore.isDeveloperMode" class="set-list">
+    <div v-if="isElectron" class="set-list">
       <n-h3 prefix="bar">
         音乐解锁
         <n-tag type="warning" size="small" round>Beta</n-tag>
@@ -316,9 +316,7 @@
       <n-card class="set-item">
         <div class="label">
           <n-text class="name">播放列表歌曲数量</n-text>
-          <n-text class="tip" :depth="3">
-            在右下角的播放列表按钮处显示播放列表的歌曲数量
-          </n-text>
+          <n-text class="tip" :depth="3"> 在右下角的播放列表按钮处显示播放列表的歌曲数量 </n-text>
         </div>
         <n-switch v-model:value="settingStore.showPlaylistCount" class="set" :round="false" />
       </n-card>
diff --git a/src/core/player/LyricManager.ts b/src/core/player/LyricManager.ts
@@ -440,6 +440,12 @@ class LyricManager {
     if (this.isLyricDataEqual(musicStore.songLyric, lyricData)) {
       // 仅更新加载状态，不更新歌词数据
       statusStore.lyricLoading = false;
+      // 单曲循环时，歌词数据未变，需通知桌面歌词取消加载状态
+      if (isElectron) {
+        window.electron.ipcRenderer.send("update-desktop-lyric-data", {
+          lyricLoading: false,
+        });
+      }
       return;
     }
     // 设置歌词
