Merge branch 'flystar233-dev' into dev

Author: imsyy

electron/main/ipc/ipc-window.ts

@@ -163,12 +163,12 @@ const initWindowsIpc = (): void => {
   });
 
   // 开启设置
-  ipcMain.on("open-setting", (_, type) => {
+  ipcMain.on("open-setting", (_, type, scrollTo) => {
     const mainWin = mainWindow.getWin();
     if (!mainWin) return;
     mainWin?.show();
     mainWin?.focus();
-    mainWin?.webContents.send("openSetting", type);
+    mainWin?.webContents.send("openSetting", type, scrollTo);
   });
 };
 

src/components/Player/PlayerRightMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <n-flex :size="8" align="center" class="right-menu">
     <n-badge v-if="isElectron" value="ON" :show="statusStore.showDesktopLyric">
-      <div class="menu-icon" @click.stop="player.toggleDesktopLyric">
+      <div class="menu-icon" @click.stop="player.toggleDesktopLyric()">
         <SvgIcon name="DesktopLyric2" :depth="statusStore.showDesktopLyric ? 1 : 3" />
       </div>
     </n-badge>

src/components/Setting/LyricsSetting.vue

@@ -400,7 +400,7 @@
         />
       </n-card>
     </div>
-    <div v-if="isElectron" class="set-list">
+    <div v-if="isElectron" ref="desktopLyricRef" class="set-list">
       <n-h3 prefix="bar">
         桌面歌词
         <n-tag type="warning" size="small" round>Beta</n-tag>
@@ -414,7 +414,7 @@
           :value="statusStore.showDesktopLyric"
           :round="false"
           class="set"
-          @update:value="player.toggleDesktopLyric"
+          @update:value="player.setDesktopLyricShow"
         />
       </n-card>
       <n-card class="set-item">
@@ -641,10 +641,15 @@ import { usePlayerController } from "@/core/player/PlayerController";
 import { SelectOption } from "naive-ui";
 import defaultDesktopLyricConfig from "@/assets/data/lyricConfig";
 
+const props = defineProps<{ scrollTo?: string }>();
+
 const player = usePlayerController();
 const statusStore = useStatusStore();
 const settingStore = useSettingStore();
 
+// 桌面歌词区域引用
+const desktopLyricRef = ref<HTMLElement | null>(null);
+
 // 全部字体
 const allFontsData = ref<SelectOption[]>([]);
 
@@ -757,6 +762,12 @@ onMounted(async () => {
     // 恢复地址
     await window.api.store.set("amllDbServer", settingStore.amllDbServer);
   }
+  // 如果需要滚动到桌面歌词部分
+  if (props.scrollTo === "desktop" && desktopLyricRef.value) {
+    nextTick(() => {
+      desktopLyricRef.value?.scrollIntoView({ behavior: "instant", block: "start" });
+    });
+  }
 });
 </script>
 

src/components/Setting/MainSetting.vue

@@ -36,7 +36,7 @@
         <!-- 播放 -->
         <PlaySetting v-else-if="activeKey === 'play'" />
         <!-- 歌词 -->
-        <LyricsSetting v-else-if="activeKey === 'lyrics'" />
+        <LyricsSetting v-else-if="activeKey === 'lyrics'" :scroll-to="props.scrollTo" />
         <!-- 快捷键 -->
         <KeyboardSetting v-else-if="activeKey === 'keyboard'" />
         <!-- 本地 -->
@@ -59,7 +59,7 @@ import { renderIcon } from "@/utils/helper";
 import { isDevBuild, isElectron } from "@/utils/env";
 import packageJson from "@/../package.json";
 
-const props = defineProps<{ type: SettingType }>();
+const props = defineProps<{ type: SettingType; scrollTo?: string }>();
 
 // 设置内容
 const setScrollbar = ref<InstanceType<typeof NScrollbar> | null>(null);

src/utils/initIpc.ts

@@ -42,7 +42,9 @@ const initIpc = () => {
       await toLikeSong(musicStore.playSong, !dataStore.isLikeSong(musicStore.playSong.id));
     });
     // 开启设置
-    window.electron.ipcRenderer.on("openSetting", (_, type: SettingType) => openSetting(type));
+    window.electron.ipcRenderer.on("openSetting", (_, type: SettingType, scrollTo?: string) =>
+      openSetting(type, scrollTo),
+    );
     // 桌面歌词开关
     window.electron.ipcRenderer.on("toogleDesktopLyric", () => player.toggleDesktopLyric());
     // 显式关闭桌面歌词

src/utils/modal.ts

@@ -236,8 +236,17 @@ export const openDownloadSongs = (songs: SongType[]): void => {
   });
 };
 
+// 设置页面是否已打开
+let isSettingOpen = false;
+
 // 打开设置
-export const openSetting = (type: SettingType = "general") => {
+export const openSetting = (type: SettingType = "general", scrollTo?: string) => {
+  // 如果设置页面已打开，显示提醒
+  if (isSettingOpen) {
+    window.$message.warning("设置页面已打开");
+    return;
+  }
+  isSettingOpen = true;
   window.$modal.create({
     preset: "card",
     transformOrigin: "center",
@@ -247,7 +256,10 @@ export const openSetting = (type: SettingType = "general") => {
     bordered: true,
     class: "main-setting",
     content: () => {
-      return h(MainSetting, { type });
+      return h(MainSetting, { type, scrollTo });
+    },
+    onAfterLeave: () => {
+      isSettingOpen = false;
     },
   });
 };

src/views/DesktopLyric/index.vue

@@ -24,7 +24,7 @@
           </div>
         </n-flex>
         <n-flex :wrap="false" align="center" justify="flex-end" size="small" @pointerdown.stop>
-          <div class="menu-btn" @click.stop="sendToMain('open-setting', 'lyrics')">
+          <div class="menu-btn" @click.stop="sendToMain('open-setting', 'lyrics', 'desktop')">
             <SvgIcon name="Settings" />
           </div>
           <div