From 661145cf9113ad43f949348fff58855858a4fe5e Mon Sep 17 00:00:00 2001
From: WorldSansha <shijiesansha@gmail.com>
Date: Mon, 26 Oct 2026 11:59:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=B8=BA=E4=B8=93=E8=BE=91?=
 =?UTF-8?q?=E6=AD=8C=E6=9B=B2=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=A2=9F=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/types/player.ts             |  2 +
 src/components/list/SongList.vue   | 59 +++++++++++++++++++++++++++++-
 src/components/ui/SVirtualList.vue | 13 +++++--
 src/i18n/locales/en-US.json        |  1 +
 src/i18n/locales/zh-CN.json        |  1 +
 src/utils/format/netease.ts        |  2 +
 6 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/shared/types/player.ts b/shared/types/player.ts
index 93a93aff2..775db8d72 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -128,6 +128,8 @@ export interface Track {
   artists: Artist[];
   /** 专辑 */
   album?: Album;
+  /** 碟号或碟片名称 */
+  disc?: string;
   /** 曲目编号 */
   track?: number;
   /** 时长（毫秒） */
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index c4c14b1cb..7c2e4481d 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -202,8 +202,20 @@ const filteredItems = computed(() => {
   });
 });
 
+/** 默认顺序下按碟片分组，搜索仍保留原专辑的分碟结构 */
+const discGroups = computed(() => {
+  if (
+    props.collectionType !== "album" ||
+    (props.enableSort && sortField.value !== "none") ||
+    new Set(props.items.map((track) => track.disc ?? "1")).size < 2
+  )
+    return [];
+  return [...Map.groupBy(filteredItems.value, (track) => track.disc ?? "1")];
+});
+
 /** 排序后列表 */
 const sortedItems = computed(() => {
+  if (discGroups.value.length) return discGroups.value.flatMap(([, tracks]) => tracks);
   if (!props.enableSort || sortField.value === "none") return filteredItems.value;
   const result = [...filteredItems.value];
   const field = sortField.value;
@@ -234,6 +246,27 @@ const sortedItems = computed(() => {
   return result;
 });
 
+/** 标题附在每碟第一首歌上，歌曲索引和播放队列保持一致 */
+const discHeaders = computed(() => {
+  const headers: Record<number, { disc: string; count: number }> = {};
+  let index = 0;
+  for (const [disc, tracks] of discGroups.value) {
+    headers[index] = { disc, count: tracks.length };
+    index += tracks.length;
+  }
+  return headers;
+});
+
+/** 使用完整专辑计算碟内曲序，搜索时保持原编号 */
+const discTrackNumbers = computed(
+  () =>
+    new Map(
+      [...Map.groupBy(props.items, (track) => track.disc ?? "1").values()].flatMap((tracks) =>
+        tracks.map((track, index) => [track.id, index + 1] as const),
+      ),
+    ),
+);
+
 /** 当前播放歌曲在过滤后列表中的索引 */
 const playingIndex = computed(() => {
   if (!playingId.value) return -1;
@@ -421,7 +454,10 @@ defineExpose({
         :item-height="isCompactList ? 56 : 88"
         :padding-bottom="isFloatingPlayerBar ? PLAYER_BAR_GAP : 80"
         :get-item-key="(item: Track) => item.id"
-        item-fixed
+        :item-fixed="!discGroups.length"
+        :get-item-height="
+          (_item: Track, index: number) => (isCompactList ? 56 : 88) + (discHeaders[index] ? 40 : 0)
+        "
         height="100%"
         @scroll="onScroll"
         @reach-bottom="emit('reachBottom')"
@@ -618,6 +654,25 @@ defineExpose({
         </template>
         <!-- 列表项 -->
         <template #default="{ item, index }: { item: Track; index: number }">
+          <div
+            v-if="discHeaders[index]"
+            class="mx-6 h-10 flex items-center gap-3 text-on-surface-variant"
+            :class="!isCompactList && index > 0 ? 'pb-3' : ''"
+          >
+            <IconLucideDisc3
+              class="size-4 translate-y-px shrink-0 text-primary/70"
+              aria-hidden="true"
+            />
+            <h2
+              class="min-w-0 flex-1 truncate text-sm font-semibold"
+              :title="discHeaders[index].disc"
+            >
+              {{ t("collection.disc", { disc: discHeaders[index].disc }) }}
+            </h2>
+            <span class="shrink-0 text-xs tabular-nums text-on-surface-variant/50">
+              {{ t("common.totalSongs", { count: discHeaders[index].count }) }}
+            </span>
+          </div>
           <div :class="isCompactList ? 'px-3' : 'px-3 pb-3'">
             <div
               data-song-item
@@ -654,7 +709,7 @@ defineExpose({
                     class="font-bold tabular-nums group-hover:opacity-0 transition-opacity duration-300"
                     :class="isCompactList ? 'text-xs' : 'text-sm'"
                   >
-                    {{ index + 1 }}
+                    {{ discGroups.length ? discTrackNumbers.get(item.id) : index + 1 }}
                   </span>
                   <IconLucideMusic
                     v-else
diff --git a/src/components/ui/SVirtualList.vue b/src/components/ui/SVirtualList.vue
index 2a869d695..85ce2131e 100644
--- a/src/components/ui/SVirtualList.vue
+++ b/src/components/ui/SVirtualList.vue
@@ -19,6 +19,8 @@ export interface SVirtualListProps<T> {
   itemHeight: number;
   /** 定高模式（跳过 DOM 测量，性能更佳） */
   itemFixed?: boolean;
+  /** 不等高模式下提供精确行高，跳过 DOM 测量 */
+  getItemHeight?: (item: T, index: number) => number;
   /** 容器高度，支持 CSS 值 */
   height?: number | string;
   /** 顶部内边距（px） */
@@ -71,11 +73,13 @@ const viewportHeight = computed(() => scrollViewportHeight.value || 0);
 const itemHeights = shallowRef<number[]>([]);
 const itemTops = shallowRef<number[]>([]);
 
-/** 初始化高度数组，复用已测量的值 */
+/** 初始化不等高列表的精确行高或复用已测量的值 */
 const initializeHeights = (): void => {
   if (props.itemFixed) return;
   const length = props.items.length;
-  if (itemHeights.value.length !== length) {
+  if (props.getItemHeight) {
+    itemHeights.value = props.items.map(props.getItemHeight);
+  } else if (itemHeights.value.length !== length) {
     const old = itemHeights.value;
     itemHeights.value = Array.from({ length }, (_, idx) => old[idx] || props.itemHeight);
   }
@@ -174,7 +178,8 @@ const visibleItems = computed(() => {
 
 /** 测量可见项的真实 DOM 高度，允许 0.5px 误差 */
 const measureItemHeights = (): void => {
-  if (props.itemFixed || !itemRefs.value.length || props.items.length === 0) return;
+  if (props.itemFixed || props.getItemHeight || !itemRefs.value.length || props.items.length === 0)
+    return;
   let hasChanges = false;
   itemRefs.value.forEach((element) => {
     if (!element) return;
@@ -285,7 +290,7 @@ const scrollToIndex = (index: number, behavior: ScrollBehavior = "auto"): void =
 const getScrollTop = (): number => scrollTop.value;
 
 watch(
-  () => props.items,
+  () => [props.items, props.itemHeight, props.itemFixed, props.getItemHeight],
   () => {
     initializeHeights();
     calculateVisibleRange(scrollTop.value);
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 4fa03785a..e34f5d97d 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -2265,6 +2265,7 @@
     }
   },
   "collection": {
+    "disc": "Disc {disc}",
     "totalDuration": "About {time}",
     "unknownAlbum": "Unknown Album",
     "empty": "No songs",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 073dee27a..737393c4b 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -2265,6 +2265,7 @@
     }
   },
   "collection": {
+    "disc": "Disc {disc}",
     "totalDuration": "约 {time}",
     "unknownAlbum": "未知专辑",
     "empty": "暂无歌曲",
diff --git a/src/utils/format/netease.ts b/src/utils/format/netease.ts
index f949d8ec4..d34a3ccdb 100644
--- a/src/utils/format/netease.ts
+++ b/src/utils/format/netease.ts
@@ -89,6 +89,8 @@ export const songToTrack = (song: NeteaseSong): Track => {
       .filter((artist) => artist.name?.trim())
       .map((artist) => ({ id: String(artist.id), name: artist.name.trim() })),
     album: album ? { id: String(album.id), name: album.name, cover } : undefined,
+    disc: song.cd?.trim() || undefined,
+    track: song.no && song.no > 0 ? song.no : undefined,
     duration: song.dt ?? song.duration ?? 0,
     cover,
     coverOriginal,

From e66bf6bb13aa1974cdc6a7525d4d629f270d86a2 Mon Sep 17 00:00:00 2001
From: imsyy <imsyy1024@gmail.com>
Date: Fri, 30 Oct 2026 00:29:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E4=B8=93?=
 =?UTF-8?q?=E8=BE=91=E5=88=86=E7=A2=9F=E5=B1=95=E7=A4=BA=E5=B9=B6=E8=A1=A5?=
 =?UTF-8?q?=E9=BD=90=E5=90=84=E5=B9=B3=E5=8F=B0=E7=A2=9F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 electron/main/apis/kugou/core/song.ts         |  4 +
 electron/main/apis/qqmusic/core/song.ts       |  3 +
 .../services/streaming/adapters/jellyfin.ts   |  3 +
 .../services/streaming/adapters/subsonic.ts   | 13 ++-
 shared/types/platform/kugou.ts                |  4 +
 shared/types/platform/qqmusic.ts              |  2 +
 shared/types/player.ts                        |  6 +-
 src/components/list/SongList.vue              | 97 +++++++++++--------
 src/components/ui/SVirtualList.vue            | 26 +++--
 src/i18n/locales/zh-CN.json                   |  2 +-
 src/utils/format/kugou.ts                     |  2 +
 src/utils/format/netease.spec.ts              | 13 +++
 src/utils/format/netease.ts                   | 14 ++-
 src/utils/format/qqmusic.ts                   |  1 +
 14 files changed, 128 insertions(+), 62 deletions(-)

diff --git a/electron/main/apis/kugou/core/song.ts b/electron/main/apis/kugou/core/song.ts
index 6fcada5d1..d6631c470 100644
--- a/electron/main/apis/kugou/core/song.ts
+++ b/electron/main/apis/kugou/core/song.ts
@@ -36,6 +36,8 @@ export interface KGResourceSong {
   audio_info?: KGAudioInfo;
   authors?: Array<{ author_id?: string | number; author_name?: string }>;
   album_info?: { album_name?: string; cover?: string };
+  /** 专辑内碟片信息，disc 从 1 开始 */
+  extend?: { disc?: number; cd_name?: string };
   trans_param?: { union_cover?: string };
   deprecated?: {
     pay_type?: number;
@@ -112,6 +114,8 @@ export const normalizeKGSong = (raw: KGResourceSong, defaults: SongDefaults = {}
     artists,
     album: decodeName(raw.album_info?.album_name || defaults.albumName),
     albumId: Number(base.album_id) > 0 ? String(base.album_id) : defaults.albumId || "",
+    disc: raw.extend?.disc || undefined,
+    discTitle: decodeName(raw.extend?.cd_name) || undefined,
     cover: fillCover(cover, 300),
     coverOriginal: fillCover(cover, 480),
     interval: duration / 1000,
diff --git a/electron/main/apis/qqmusic/core/song.ts b/electron/main/apis/qqmusic/core/song.ts
index 5eb5ee10f..2d05d47ca 100644
--- a/electron/main/apis/qqmusic/core/song.ts
+++ b/electron/main/apis/qqmusic/core/song.ts
@@ -10,6 +10,8 @@ export interface QMAudioInfo {
   interval?: number;
   singer?: Array<{ id?: number; mid?: string; name?: string }>;
   album?: { mid?: string; name?: string; title?: string; pmid?: string };
+  /** 碟片索引，从 0 开始 */
+  index_cd?: number;
   file?: {
     media_mid?: string;
     size_128mp3?: number;
@@ -46,6 +48,7 @@ export const normalizeQMSong = (song: QMAudioInfo, albumMid = ""): QMSong => {
     artists: song.singer ?? [],
     album: song.album?.name || song.album?.title || "",
     albumMid: mid,
+    disc: song.index_cd !== undefined ? song.index_cd + 1 : undefined,
     duration: (song.interval ?? 0) * 1000,
     mediaMid: song.file?.media_mid ?? "",
     pay: {
diff --git a/electron/main/services/streaming/adapters/jellyfin.ts b/electron/main/services/streaming/adapters/jellyfin.ts
index 00c3c7860..221b65761 100644
--- a/electron/main/services/streaming/adapters/jellyfin.ts
+++ b/electron/main/services/streaming/adapters/jellyfin.ts
@@ -30,6 +30,8 @@ interface JellyItem {
   Artists?: string[];
   ArtistItems?: { Id: string; Name: string }[];
   RunTimeTicks?: number;
+  /** 碟号 */
+  ParentIndexNumber?: number;
   ProductionYear?: number;
   ChildCount?: number;
   ImageTags?: { Primary?: string };
@@ -225,6 +227,7 @@ const toTrack = (config: StreamingRuntimeConfig, item: JellyItem): Track => {
       item.Artists?.map((name) => ({ name })) ??
       [],
     album: item.Album ? { id: item.AlbumId, name: item.Album, serverId: config.id } : undefined,
+    disc: item.ParentIndexNumber || undefined,
     duration: item.RunTimeTicks ? Math.floor(item.RunTimeTicks / 10_000) : 0,
     cover: coverId ? imageUrl(config, coverId, imageTag, 300) : undefined,
     coverOriginal: coverId ? imageUrl(config, coverId, imageTag, 1500) : undefined,
diff --git a/electron/main/services/streaming/adapters/subsonic.ts b/electron/main/services/streaming/adapters/subsonic.ts
index b8b3826f2..f5283d805 100644
--- a/electron/main/services/streaming/adapters/subsonic.ts
+++ b/electron/main/services/streaming/adapters/subsonic.ts
@@ -20,6 +20,7 @@ interface SubsonicSong {
   artistId?: string;
   album?: string;
   albumId?: string;
+  discNumber?: number;
   duration?: number;
   bitRate?: number;
   samplingRate?: number;
@@ -40,6 +41,8 @@ interface SubsonicAlbum {
   songCount?: number;
   year?: number;
   displayArtist?: string;
+  /** OpenSubsonic 扩展的碟片名称 */
+  discTitles?: { disc: number; title: string }[];
   song?: SubsonicSong[];
 }
 
@@ -174,6 +177,7 @@ const toTrack = (config: StreamingRuntimeConfig, song: SubsonicSong): Track => {
     title: song.title || "",
     artists,
     album: song.album ? { id: song.albumId, name: song.album, serverId: config.id } : undefined,
+    disc: song.discNumber || undefined,
     duration: Math.round((song.duration ?? 0) * 1000),
     cover: coverUrl(config, song.coverArt, 300),
     coverOriginal: coverUrl(config, song.coverArt, 1500),
@@ -435,7 +439,14 @@ export const subsonicAdapter: StreamingAdapter = {
    */
   async getAlbumSongs(config, albumId) {
     const result = await callApi<{ album?: SubsonicAlbum }>(config, "getAlbum", { id: albumId });
-    return (result.album?.song ?? []).map((song) => toTrack(config, song));
+    const discTitles = new Map(
+      result.album?.discTitles?.map((disc) => [disc.disc, disc.title.trim()]),
+    );
+    return (result.album?.song ?? []).map((song) => {
+      const track = toTrack(config, song);
+      const discTitle = track.disc && discTitles.get(track.disc);
+      return discTitle ? { ...track, discTitle } : track;
+    });
   },
 
   /**
diff --git a/shared/types/platform/kugou.ts b/shared/types/platform/kugou.ts
index 9c8d6e838..8c79770b1 100644
--- a/shared/types/platform/kugou.ts
+++ b/shared/types/platform/kugou.ts
@@ -12,6 +12,10 @@ export interface KGSong {
   artists?: Array<{ id?: string | number; name: string }>;
   album: string;
   albumId: string | number;
+  /** 碟号，从 1 开始 */
+  disc?: number;
+  /** 碟片名称 */
+  discTitle?: string;
   cover?: string;
   coverOriginal?: string;
   interval: number;
diff --git a/shared/types/platform/qqmusic.ts b/shared/types/platform/qqmusic.ts
index 996697dc1..9938d7582 100644
--- a/shared/types/platform/qqmusic.ts
+++ b/shared/types/platform/qqmusic.ts
@@ -8,6 +8,8 @@ export interface QMSong {
   artists?: Array<{ mid?: string; name?: string }>;
   album?: string;
   albumMid?: string;
+  /** 碟号，从 1 开始 */
+  disc?: number;
   cover?: string;
   coverOriginal?: string;
   /** 歌曲时长，单位为毫秒 */
diff --git a/shared/types/player.ts b/shared/types/player.ts
index 775db8d72..d33cfcab7 100644
--- a/shared/types/player.ts
+++ b/shared/types/player.ts
@@ -128,8 +128,10 @@ export interface Track {
   artists: Artist[];
   /** 专辑 */
   album?: Album;
-  /** 碟号或碟片名称 */
-  disc?: string;
+  /** 碟号，从 1 开始 */
+  disc?: number;
+  /** 碟片名称 */
+  discTitle?: string;
   /** 曲目编号 */
   track?: number;
   /** 时长（毫秒） */
diff --git a/src/components/list/SongList.vue b/src/components/list/SongList.vue
index 7c2e4481d..1d6ea2f93 100644
--- a/src/components/list/SongList.vue
+++ b/src/components/list/SongList.vue
@@ -202,20 +202,37 @@ const filteredItems = computed(() => {
   });
 });
 
-/** 默认顺序下按碟片分组，搜索仍保留原专辑的分碟结构 */
-const discGroups = computed(() => {
-  if (
-    props.collectionType !== "album" ||
-    (props.enableSort && sortField.value !== "none") ||
-    new Set(props.items.map((track) => track.disc ?? "1")).size < 2
-  )
-    return [];
-  return [...Map.groupBy(filteredItems.value, (track) => track.disc ?? "1")];
+/** 多碟专辑的碟片与碟内曲序，基于完整专辑计算，搜索过滤时保持不变 */
+const albumDiscs = computed(() => {
+  if (props.collectionType !== "album") return null;
+  const groups = Map.groupBy(props.items, (track) => track.disc ?? 1);
+  if (groups.size < 2) return null;
+  const trackNumbers = new Map<string, number>();
+  for (const tracks of groups.values()) {
+    tracks.forEach((track, position) => trackNumbers.set(track.id, position + 1));
+  }
+  return { groups, trackNumbers };
+});
+
+/** 默认顺序下按碟号排列的列表，碟片标题附在每碟首曲上以保持播放与多选索引一致 */
+const discLayout = computed(() => {
+  const discs = albumDiscs.value;
+  if (!discs || (props.enableSort && sortField.value !== "none")) return null;
+  const items: Track[] = [];
+  const headers = new Map<number, { disc: number; title?: string; count: number }>();
+  const visible = Map.groupBy(filteredItems.value, (track) => track.disc ?? 1);
+  for (const [disc, tracks] of [...visible].sort(([left], [right]) => left - right)) {
+    const albumTracks = discs.groups.get(disc) ?? tracks;
+    const title = albumTracks.find((track) => track.discTitle)?.discTitle;
+    headers.set(items.length, { disc, title, count: albumTracks.length });
+    items.push(...tracks);
+  }
+  return { items, headers };
 });
 
 /** 排序后列表 */
 const sortedItems = computed(() => {
-  if (discGroups.value.length) return discGroups.value.flatMap(([, tracks]) => tracks);
+  if (discLayout.value) return discLayout.value.items;
   if (!props.enableSort || sortField.value === "none") return filteredItems.value;
   const result = [...filteredItems.value];
   const field = sortField.value;
@@ -246,27 +263,6 @@ const sortedItems = computed(() => {
   return result;
 });
 
-/** 标题附在每碟第一首歌上，歌曲索引和播放队列保持一致 */
-const discHeaders = computed(() => {
-  const headers: Record<number, { disc: string; count: number }> = {};
-  let index = 0;
-  for (const [disc, tracks] of discGroups.value) {
-    headers[index] = { disc, count: tracks.length };
-    index += tracks.length;
-  }
-  return headers;
-});
-
-/** 使用完整专辑计算碟内曲序，搜索时保持原编号 */
-const discTrackNumbers = computed(
-  () =>
-    new Map(
-      [...Map.groupBy(props.items, (track) => track.disc ?? "1").values()].flatMap((tracks) =>
-        tracks.map((track, index) => [track.id, index + 1] as const),
-      ),
-    ),
-);
-
 /** 当前播放歌曲在过滤后列表中的索引 */
 const playingIndex = computed(() => {
   if (!playingId.value) return -1;
@@ -306,6 +302,21 @@ const { deleteConfirmOpen, deleteDialogTitle, deleteDialogContent } = batch;
 /** 是否使用紧凑列表样式 */
 const isCompactList = computed(() => settings.appearance.songListStyle === "compact");
 
+/** 歌曲行高度 */
+const rowHeight = computed(() => (isCompactList.value ? 56 : 88));
+
+/** 碟片标题行高度 */
+const DISC_HEADER_HEIGHT = 40;
+
+/** 分碟时每行的精确高度，碟片首曲额外包含标题行 */
+const discItemHeights = computed(() => {
+  const layout = discLayout.value;
+  if (!layout) return undefined;
+  return layout.items.map(
+    (_track, index) => rowHeight.value + (layout.headers.has(index) ? DISC_HEADER_HEIGHT : 0),
+  );
+});
+
 /**
  * 计算歌曲行样式
  * @param item - 歌曲数据
@@ -451,13 +462,11 @@ defineExpose({
       <SVirtualList
         ref="virtualListRef"
         :items="sortedItems"
-        :item-height="isCompactList ? 56 : 88"
+        :item-height="rowHeight"
+        :item-fixed="!discLayout"
+        :exact-item-heights="discItemHeights"
         :padding-bottom="isFloatingPlayerBar ? PLAYER_BAR_GAP : 80"
         :get-item-key="(item: Track) => item.id"
-        :item-fixed="!discGroups.length"
-        :get-item-height="
-          (_item: Track, index: number) => (isCompactList ? 56 : 88) + (discHeaders[index] ? 40 : 0)
-        "
         height="100%"
         @scroll="onScroll"
         @reach-bottom="emit('reachBottom')"
@@ -655,7 +664,7 @@ defineExpose({
         <!-- 列表项 -->
         <template #default="{ item, index }: { item: Track; index: number }">
           <div
-            v-if="discHeaders[index]"
+            v-if="discLayout?.headers.has(index)"
             class="mx-6 h-10 flex items-center gap-3 text-on-surface-variant"
             :class="!isCompactList && index > 0 ? 'pb-3' : ''"
           >
@@ -665,12 +674,18 @@ defineExpose({
             />
             <h2
               class="min-w-0 flex-1 truncate text-sm font-semibold"
-              :title="discHeaders[index].disc"
+              :title="discLayout.headers.get(index)!.title"
             >
-              {{ t("collection.disc", { disc: discHeaders[index].disc }) }}
+              {{ t("collection.disc", { disc: discLayout.headers.get(index)!.disc }) }}
+              <span
+                v-if="discLayout.headers.get(index)!.title"
+                class="font-normal text-on-surface-variant/70"
+              >
+                · {{ discLayout.headers.get(index)!.title }}
+              </span>
             </h2>
             <span class="shrink-0 text-xs tabular-nums text-on-surface-variant/50">
-              {{ t("common.totalSongs", { count: discHeaders[index].count }) }}
+              {{ t("common.totalSongs", { count: discLayout.headers.get(index)!.count }) }}
             </span>
           </div>
           <div :class="isCompactList ? 'px-3' : 'px-3 pb-3'">
@@ -709,7 +724,7 @@ defineExpose({
                     class="font-bold tabular-nums group-hover:opacity-0 transition-opacity duration-300"
                     :class="isCompactList ? 'text-xs' : 'text-sm'"
                   >
-                    {{ discGroups.length ? discTrackNumbers.get(item.id) : index + 1 }}
+                    {{ discLayout ? albumDiscs?.trackNumbers.get(item.id) : index + 1 }}
                   </span>
                   <IconLucideMusic
                     v-else
diff --git a/src/components/ui/SVirtualList.vue b/src/components/ui/SVirtualList.vue
index 85ce2131e..31e72bdc3 100644
--- a/src/components/ui/SVirtualList.vue
+++ b/src/components/ui/SVirtualList.vue
@@ -19,8 +19,8 @@ export interface SVirtualListProps<T> {
   itemHeight: number;
   /** 定高模式（跳过 DOM 测量，性能更佳） */
   itemFixed?: boolean;
-  /** 不等高模式下提供精确行高，跳过 DOM 测量 */
-  getItemHeight?: (item: T, index: number) => number;
+  /** 不定高模式下每项的精确高度，提供后跳过 DOM 测量；需传引用稳定的数组 */
+  exactItemHeights?: number[];
   /** 容器高度，支持 CSS 值 */
   height?: number | string;
   /** 顶部内边距（px） */
@@ -73,12 +73,12 @@ const viewportHeight = computed(() => scrollViewportHeight.value || 0);
 const itemHeights = shallowRef<number[]>([]);
 const itemTops = shallowRef<number[]>([]);
 
-/** 初始化不等高列表的精确行高或复用已测量的值 */
+/** 初始化高度数组，优先使用外部精确高度，否则复用已测量的值 */
 const initializeHeights = (): void => {
   if (props.itemFixed) return;
   const length = props.items.length;
-  if (props.getItemHeight) {
-    itemHeights.value = props.items.map(props.getItemHeight);
+  if (props.exactItemHeights) {
+    itemHeights.value = props.exactItemHeights;
   } else if (itemHeights.value.length !== length) {
     const old = itemHeights.value;
     itemHeights.value = Array.from({ length }, (_, idx) => old[idx] || props.itemHeight);
@@ -178,7 +178,7 @@ const visibleItems = computed(() => {
 
 /** 测量可见项的真实 DOM 高度，允许 0.5px 误差 */
 const measureItemHeights = (): void => {
-  if (props.itemFixed || props.getItemHeight || !itemRefs.value.length || props.items.length === 0)
+  if (props.itemFixed || props.exactItemHeights || !itemRefs.value.length || !props.items.length)
     return;
   let hasChanges = false;
   itemRefs.value.forEach((element) => {
@@ -289,15 +289,11 @@ const scrollToIndex = (index: number, behavior: ScrollBehavior = "auto"): void =
 /** 获取当前滚动位置 */
 const getScrollTop = (): number => scrollTop.value;
 
-watch(
-  () => [props.items, props.itemHeight, props.itemFixed, props.getItemHeight],
-  () => {
-    initializeHeights();
-    calculateVisibleRange(scrollTop.value);
-    nextTick(debouncedMeasure);
-  },
-  { deep: false },
-);
+watch([() => props.items, () => props.exactItemHeights], () => {
+  initializeHeights();
+  calculateVisibleRange(scrollTop.value);
+  nextTick(debouncedMeasure);
+});
 
 watch(
   () => props.items.length,
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 737393c4b..3e81442a2 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -2265,7 +2265,7 @@
     }
   },
   "collection": {
-    "disc": "Disc {disc}",
+    "disc": "CD {disc}",
     "totalDuration": "约 {time}",
     "unknownAlbum": "未知专辑",
     "empty": "暂无歌曲",
diff --git a/src/utils/format/kugou.ts b/src/utils/format/kugou.ts
index 1bf826402..a544c6d52 100644
--- a/src/utils/format/kugou.ts
+++ b/src/utils/format/kugou.ts
@@ -110,6 +110,8 @@ export const kgSongToTrack = (song: KGSong): Track => {
             cover: song.cover,
           }
         : undefined,
+    disc: song.disc,
+    discTitle: song.discTitle,
     duration: durationMs,
     quality: audio?.quality,
     fileSize: audio?.fileSize,
diff --git a/src/utils/format/netease.spec.ts b/src/utils/format/netease.spec.ts
index 85b47b9dc..7e38b5f6e 100644
--- a/src/utils/format/netease.spec.ts
+++ b/src/utils/format/netease.spec.ts
@@ -29,3 +29,16 @@ describe("NCM歌曲歌手格式化", () => {
     });
   });
 });
+
+describe("NCM歌曲碟片解析", () => {
+  it.each([
+    ["1 致天堂的信 Letters to Heaven", { disc: 1, discTitle: "致天堂的信 Letters to Heaven" }],
+    ["02", { disc: 2, discTitle: undefined }],
+    ["CD3", { disc: 3, discTitle: undefined }],
+    ["", { disc: undefined, discTitle: undefined }],
+  ])("解析 %j", (cd, expected) => {
+    const song = { id: 1, name: "歌曲", cd } as unknown as NeteaseSong;
+    const track = songToTrack(song);
+    expect({ disc: track.disc, discTitle: track.discTitle }).toEqual(expected);
+  });
+});
diff --git a/src/utils/format/netease.ts b/src/utils/format/netease.ts
index d34a3ccdb..be916212b 100644
--- a/src/utils/format/netease.ts
+++ b/src/utils/format/netease.ts
@@ -68,6 +68,17 @@ const pickQuality = (song: NeteaseSong): AudioQuality | undefined => {
   return undefined;
 };
 
+/**
+ * 解析碟片字段，接口可能返回 "01"、"CD2" 或 "1 碟片名称"
+ * @param cd - 原始 cd 字段
+ * @returns 碟号与碟片名称
+ */
+const parseDisc = (cd: string | undefined): Pick<Track, "disc" | "discTitle"> => {
+  const match = cd?.trim().match(/^(?:cd|disc)?\s*(\d+)\s*(.*)$/i);
+  if (!match) return {};
+  return { disc: Number(match[1]) || undefined, discTitle: match[2] || undefined };
+};
+
 /**
  *  song → 应用层 Track
  * @param song - 原始 song 对象
@@ -89,8 +100,7 @@ export const songToTrack = (song: NeteaseSong): Track => {
       .filter((artist) => artist.name?.trim())
       .map((artist) => ({ id: String(artist.id), name: artist.name.trim() })),
     album: album ? { id: String(album.id), name: album.name, cover } : undefined,
-    disc: song.cd?.trim() || undefined,
-    track: song.no && song.no > 0 ? song.no : undefined,
+    ...parseDisc(song.cd),
     duration: song.dt ?? song.duration ?? 0,
     cover,
     coverOriginal,
diff --git a/src/utils/format/qqmusic.ts b/src/utils/format/qqmusic.ts
index e1542fa29..cfbd87a17 100644
--- a/src/utils/format/qqmusic.ts
+++ b/src/utils/format/qqmusic.ts
@@ -79,6 +79,7 @@ export const qqSongToTrack = (song: QMSong): Track => {
         ? [{ name: song.artist }]
         : [],
     album: song.album ? { id: song.albumMid, name: song.album, cover } : undefined,
+    disc: song.disc,
     duration: song.duration ?? 0,
     quality: audio?.quality,
     fileSize: audio?.fileSize,