mirror of
https://github.com/algerkong/AlgerMusicPlayer.git
synced 2026-04-26 01:07:22 +08:00
perf: 长列表渐进式渲染优化与播放栏遮挡修复 (#589)
- 新增 useProgressiveRender composable,提取手工虚拟化逻辑(renderLimit + placeholderHeight) - FavoritePage/DownloadPage 使用 composable 实现渐进式渲染,避免大量 DOM 一次性渲染 - MusicListPage 初始加载扩大至 200 首,工具栏按钮添加 n-tooltip,新增回到顶部按钮 - 播放栏动态底部间距替代 PlayBottom 组件,修复播放时列表底部被遮挡 - 下载页无下载任务时自动切换到已下载 tab - i18n: 添加 scrollToTop/compactLayout/normalLayout 翻译(5 种语言) Inspired-By: https://github.com/algerkong/AlgerMusicPlayer/pull/589
This commit is contained in:
@@ -223,6 +223,9 @@ export default {
|
|||||||
operationFailed: 'Operation Failed',
|
operationFailed: 'Operation Failed',
|
||||||
songsAlreadyInPlaylist: 'Songs already in playlist',
|
songsAlreadyInPlaylist: 'Songs already in playlist',
|
||||||
locateCurrent: 'Locate current song',
|
locateCurrent: 'Locate current song',
|
||||||
|
scrollToTop: 'Scroll to top',
|
||||||
|
compactLayout: 'Compact layout',
|
||||||
|
normalLayout: 'Normal layout',
|
||||||
historyRecommend: 'Daily History',
|
historyRecommend: 'Daily History',
|
||||||
fetchDatesFailed: 'Failed to fetch dates',
|
fetchDatesFailed: 'Failed to fetch dates',
|
||||||
fetchSongsFailed: 'Failed to fetch songs',
|
fetchSongsFailed: 'Failed to fetch songs',
|
||||||
|
|||||||
@@ -223,6 +223,9 @@ export default {
|
|||||||
addToPlaylistSuccess: 'プレイリストに追加しました',
|
addToPlaylistSuccess: 'プレイリストに追加しました',
|
||||||
songsAlreadyInPlaylist: '楽曲は既にプレイリストに存在します',
|
songsAlreadyInPlaylist: '楽曲は既にプレイリストに存在します',
|
||||||
locateCurrent: '再生中の曲を表示',
|
locateCurrent: '再生中の曲を表示',
|
||||||
|
scrollToTop: 'トップに戻る',
|
||||||
|
compactLayout: 'コンパクト表示',
|
||||||
|
normalLayout: '通常表示',
|
||||||
historyRecommend: '履歴の日次推薦',
|
historyRecommend: '履歴の日次推薦',
|
||||||
fetchDatesFailed: '日付リストの取得に失敗しました',
|
fetchDatesFailed: '日付リストの取得に失敗しました',
|
||||||
fetchSongsFailed: '楽曲リストの取得に失敗しました',
|
fetchSongsFailed: '楽曲リストの取得に失敗しました',
|
||||||
|
|||||||
@@ -222,6 +222,9 @@ export default {
|
|||||||
addToPlaylistSuccess: '재생 목록에 추가 성공',
|
addToPlaylistSuccess: '재생 목록에 추가 성공',
|
||||||
songsAlreadyInPlaylist: '곡이 이미 재생 목록에 있습니다',
|
songsAlreadyInPlaylist: '곡이 이미 재생 목록에 있습니다',
|
||||||
locateCurrent: '현재 재생 곡 찾기',
|
locateCurrent: '현재 재생 곡 찾기',
|
||||||
|
scrollToTop: '맨 위로',
|
||||||
|
compactLayout: '간결한 레이아웃',
|
||||||
|
normalLayout: '일반 레이아웃',
|
||||||
historyRecommend: '일일 기록 권장',
|
historyRecommend: '일일 기록 권장',
|
||||||
fetchDatesFailed: '날짜를 가져오지 못했습니다',
|
fetchDatesFailed: '날짜를 가져오지 못했습니다',
|
||||||
fetchSongsFailed: '곡을 가져오지 못했습니다',
|
fetchSongsFailed: '곡을 가져오지 못했습니다',
|
||||||
|
|||||||
@@ -216,6 +216,9 @@ export default {
|
|||||||
addToPlaylistSuccess: '添加到播放列表成功',
|
addToPlaylistSuccess: '添加到播放列表成功',
|
||||||
songsAlreadyInPlaylist: '歌曲已存在于播放列表中',
|
songsAlreadyInPlaylist: '歌曲已存在于播放列表中',
|
||||||
locateCurrent: '定位当前播放',
|
locateCurrent: '定位当前播放',
|
||||||
|
scrollToTop: '回到顶部',
|
||||||
|
compactLayout: '紧凑布局',
|
||||||
|
normalLayout: '常规布局',
|
||||||
historyRecommend: '历史日推',
|
historyRecommend: '历史日推',
|
||||||
fetchDatesFailed: '获取日期列表失败',
|
fetchDatesFailed: '获取日期列表失败',
|
||||||
fetchSongsFailed: '获取歌曲列表失败',
|
fetchSongsFailed: '获取歌曲列表失败',
|
||||||
|
|||||||
@@ -216,6 +216,9 @@ export default {
|
|||||||
addToPlaylistSuccess: '新增至播放清單成功',
|
addToPlaylistSuccess: '新增至播放清單成功',
|
||||||
songsAlreadyInPlaylist: '歌曲已存在於播放清單中',
|
songsAlreadyInPlaylist: '歌曲已存在於播放清單中',
|
||||||
locateCurrent: '定位當前播放',
|
locateCurrent: '定位當前播放',
|
||||||
|
scrollToTop: '回到頂部',
|
||||||
|
compactLayout: '緊湊佈局',
|
||||||
|
normalLayout: '常規佈局',
|
||||||
historyRecommend: '歷史日推',
|
historyRecommend: '歷史日推',
|
||||||
fetchDatesFailed: '獲取日期列表失敗',
|
fetchDatesFailed: '獲取日期列表失敗',
|
||||||
fetchSongsFailed: '獲取歌曲列表失敗',
|
fetchSongsFailed: '獲取歌曲列表失敗',
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import { computed, type ComputedRef, type Ref,ref } from 'vue';
|
||||||
|
|
||||||
|
import { usePlayerStore } from '@/store';
|
||||||
|
import { isMobile } from '@/utils';
|
||||||
|
|
||||||
|
type ProgressiveRenderOptions = {
|
||||||
|
/** 全量数据列表 */
|
||||||
|
items: ComputedRef<any[]> | Ref<any[]>;
|
||||||
|
/** 每项估算高度(px) */
|
||||||
|
itemHeight: ComputedRef<number> | number;
|
||||||
|
/** 列表区域的 CSS 选择器,用于计算偏移 */
|
||||||
|
listSelector: string;
|
||||||
|
/** 初始渲染数量 */
|
||||||
|
initialCount?: number;
|
||||||
|
/** 滚动到底部时的回调(用于加载更多数据) */
|
||||||
|
onReachEnd?: () => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useProgressiveRender = (options: ProgressiveRenderOptions) => {
|
||||||
|
const { items, itemHeight, listSelector, initialCount = 40, onReachEnd } = options;
|
||||||
|
|
||||||
|
const playerStore = usePlayerStore();
|
||||||
|
const renderLimit = ref(initialCount);
|
||||||
|
|
||||||
|
const getItemHeight = () => (typeof itemHeight === 'number' ? itemHeight : itemHeight.value);
|
||||||
|
|
||||||
|
/** 截取到 renderLimit 的可渲染列表 */
|
||||||
|
const renderedItems = computed(() => {
|
||||||
|
const all = items.value;
|
||||||
|
return all.slice(0, renderLimit.value);
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 未渲染项的占位高度,让滚动条反映真实总高度 */
|
||||||
|
const placeholderHeight = computed(() => {
|
||||||
|
const unrendered = items.value.length - renderedItems.value.length;
|
||||||
|
return Math.max(0, unrendered) * getItemHeight();
|
||||||
|
});
|
||||||
|
|
||||||
|
/** 是否正在播放(用于动态底部间距) */
|
||||||
|
const isPlaying = computed(() => !!playerStore.playMusicUrl);
|
||||||
|
|
||||||
|
/** 内容区底部 padding,播放时留出播放栏空间 */
|
||||||
|
const contentPaddingBottom = computed(() =>
|
||||||
|
isPlaying.value && !isMobile.value ? '220px' : '80px'
|
||||||
|
);
|
||||||
|
|
||||||
|
/** 重置渲染限制 */
|
||||||
|
const resetRenderLimit = () => {
|
||||||
|
renderLimit.value = initialCount;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 扩展渲染限制到指定索引 */
|
||||||
|
const expandTo = (index: number) => {
|
||||||
|
renderLimit.value = Math.max(renderLimit.value, index);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 滚动事件处理函数,挂载到外层 n-scrollbar 的 @scroll
|
||||||
|
* 根据可视区域动态扩展 renderLimit
|
||||||
|
*/
|
||||||
|
const handleScroll = (e: Event) => {
|
||||||
|
const target = e.target as HTMLElement;
|
||||||
|
const { scrollTop, clientHeight } = target;
|
||||||
|
|
||||||
|
const listSection = document.querySelector(listSelector) as HTMLElement;
|
||||||
|
const listStart = listSection?.offsetTop || 0;
|
||||||
|
|
||||||
|
const visibleBottom = scrollTop + clientHeight - listStart;
|
||||||
|
if (visibleBottom <= 0) return;
|
||||||
|
|
||||||
|
// 多渲染一屏作为缓冲
|
||||||
|
const bufferHeight = clientHeight;
|
||||||
|
const neededIndex = Math.ceil((visibleBottom + bufferHeight) / getItemHeight());
|
||||||
|
const allCount = items.value.length;
|
||||||
|
|
||||||
|
if (neededIndex > renderLimit.value) {
|
||||||
|
renderLimit.value = Math.min(neededIndex, allCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 所有项都已渲染,通知外部加载更多数据
|
||||||
|
if (renderLimit.value >= allCount && onReachEnd) {
|
||||||
|
onReachEnd();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
renderLimit,
|
||||||
|
renderedItems,
|
||||||
|
placeholderHeight,
|
||||||
|
isPlaying,
|
||||||
|
contentPaddingBottom,
|
||||||
|
resetRenderLimit,
|
||||||
|
expandTo,
|
||||||
|
handleScroll
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="download-page h-full w-full bg-white dark:bg-black transition-colors duration-500">
|
<div class="download-page h-full w-full bg-white dark:bg-black transition-colors duration-500">
|
||||||
<n-scrollbar class="h-full">
|
<n-scrollbar ref="scrollbarRef" class="h-full" @scroll="handleDownloadScroll">
|
||||||
<div class="download-content pb-32">
|
<div class="download-content" :style="{ paddingBottom: contentPaddingBottom }">
|
||||||
<!-- Hero Section -->
|
<!-- Hero Section -->
|
||||||
<section class="hero-section relative overflow-hidden rounded-tl-2xl">
|
<section class="hero-section relative overflow-hidden rounded-tl-2xl">
|
||||||
<!-- Background with Blur -->
|
<!-- Background with Blur -->
|
||||||
@@ -210,86 +210,96 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="space-y-2">
|
<div v-else class="space-y-2">
|
||||||
<div
|
<div class="downloaded-list-section">
|
||||||
v-for="(item, index) in downloadStore.completedList"
|
|
||||||
:key="item.path || item.filePath"
|
|
||||||
class="downloaded-item group animate-item p-3 rounded-2xl flex items-center gap-4 hover:bg-neutral-100 dark:hover:bg-neutral-900 transition-all"
|
|
||||||
:style="{ animationDelay: `${index * 0.03}s` }"
|
|
||||||
>
|
|
||||||
<div
|
<div
|
||||||
class="relative w-12 h-12 rounded-xl overflow-hidden shadow-lg flex-shrink-0"
|
v-for="(item, index) in renderedDownloaded"
|
||||||
|
:key="item.path || item.filePath"
|
||||||
|
class="downloaded-item group p-3 rounded-2xl flex items-center gap-4 hover:bg-neutral-100 dark:hover:bg-neutral-900 transition-all"
|
||||||
|
:class="{ 'animate-item': index < 20 }"
|
||||||
|
:style="index < 20 ? { animationDelay: `${index * 0.03}s` } : undefined"
|
||||||
>
|
>
|
||||||
<img
|
|
||||||
:src="getImgUrl(item.picUrl, '100y100')"
|
|
||||||
class="w-full h-full object-cover"
|
|
||||||
@error="handleCoverError"
|
|
||||||
/>
|
|
||||||
<div
|
<div
|
||||||
class="absolute inset-0 flex items-center justify-center bg-black/40 opacity-0 group-hover:opacity-100 transition-all cursor-pointer"
|
class="relative w-12 h-12 rounded-xl overflow-hidden shadow-lg flex-shrink-0"
|
||||||
@click="handlePlayMusic(item)"
|
|
||||||
>
|
>
|
||||||
<i class="ri-play-fill text-white text-xl" />
|
<img
|
||||||
</div>
|
:src="getImgUrl(item.picUrl, '100y100')"
|
||||||
</div>
|
class="w-full h-full object-cover"
|
||||||
|
@error="handleCoverError"
|
||||||
<div class="flex-1 min-w-0">
|
/>
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<span class="text-sm font-bold text-neutral-900 dark:text-white truncate">{{
|
|
||||||
item.displayName || item.filename
|
|
||||||
}}</span>
|
|
||||||
<span class="text-xs text-neutral-400 flex-shrink-0">{{
|
|
||||||
formatSize(item.size)
|
|
||||||
}}</span>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center gap-4 mt-1">
|
|
||||||
<span class="text-xs text-neutral-500 truncate max-w-[150px]">{{
|
|
||||||
item.ar?.map((a) => a.name).join(', ')
|
|
||||||
}}</span>
|
|
||||||
<div
|
<div
|
||||||
class="hidden md:flex items-center gap-1 text-[10px] text-neutral-400 bg-neutral-100 dark:bg-neutral-800 px-2 py-0.5 rounded-full truncate"
|
class="absolute inset-0 flex items-center justify-center bg-black/40 opacity-0 group-hover:opacity-100 transition-all cursor-pointer"
|
||||||
|
@click="handlePlayMusic(item)"
|
||||||
>
|
>
|
||||||
<i class="ri-folder-line" />
|
<i class="ri-play-fill text-white text-xl" />
|
||||||
<span class="truncate">{{ shortenPath(item.path || item.filePath) }}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center gap-1">
|
<div class="flex-1 min-w-0">
|
||||||
<n-tooltip trigger="hover">
|
<div class="flex items-center gap-2">
|
||||||
<template #trigger>
|
<span class="text-sm font-bold text-neutral-900 dark:text-white truncate">{{
|
||||||
<button
|
item.displayName || item.filename
|
||||||
class="w-8 h-8 rounded-full flex items-center justify-center text-neutral-400 hover:text-primary hover:bg-primary/10 transition-all"
|
}}</span>
|
||||||
@click="copyPath(item.path || item.filePath)"
|
<span class="text-xs text-neutral-400 flex-shrink-0">{{
|
||||||
|
formatSize(item.size)
|
||||||
|
}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-4 mt-1">
|
||||||
|
<span class="text-xs text-neutral-500 truncate max-w-[150px]">{{
|
||||||
|
item.ar?.map((a) => a.name).join(', ')
|
||||||
|
}}</span>
|
||||||
|
<div
|
||||||
|
class="hidden md:flex items-center gap-1 text-[10px] text-neutral-400 bg-neutral-100 dark:bg-neutral-800 px-2 py-0.5 rounded-full truncate"
|
||||||
>
|
>
|
||||||
<i class="ri-file-copy-line" />
|
<i class="ri-folder-line" />
|
||||||
</button>
|
<span class="truncate">{{
|
||||||
</template>
|
shortenPath(item.path || item.filePath)
|
||||||
{{ t('download.path.copy') || '复制路径' }}
|
}}</span>
|
||||||
</n-tooltip>
|
</div>
|
||||||
<n-tooltip trigger="hover">
|
</div>
|
||||||
<template #trigger>
|
</div>
|
||||||
<button
|
|
||||||
class="w-8 h-8 rounded-full flex items-center justify-center text-neutral-400 hover:text-primary hover:bg-primary/10 transition-all"
|
<div class="flex items-center gap-1">
|
||||||
@click="openDirectory(item.path || item.filePath)"
|
<n-tooltip trigger="hover">
|
||||||
>
|
<template #trigger>
|
||||||
<i class="ri-folder-open-line" />
|
<button
|
||||||
</button>
|
class="w-8 h-8 rounded-full flex items-center justify-center text-neutral-400 hover:text-primary hover:bg-primary/10 transition-all"
|
||||||
</template>
|
@click="copyPath(item.path || item.filePath)"
|
||||||
{{ t('download.settingsPanel.open') }}
|
>
|
||||||
</n-tooltip>
|
<i class="ri-file-copy-line" />
|
||||||
<n-tooltip trigger="hover">
|
</button>
|
||||||
<template #trigger>
|
</template>
|
||||||
<button
|
{{ t('download.path.copy') || '复制路径' }}
|
||||||
class="w-8 h-8 rounded-full flex items-center justify-center text-neutral-400 hover:text-red-500 hover:bg-red-500/10 transition-all"
|
</n-tooltip>
|
||||||
@click="handleDelete(item)"
|
<n-tooltip trigger="hover">
|
||||||
>
|
<template #trigger>
|
||||||
<i class="ri-delete-bin-line" />
|
<button
|
||||||
</button>
|
class="w-8 h-8 rounded-full flex items-center justify-center text-neutral-400 hover:text-primary hover:bg-primary/10 transition-all"
|
||||||
</template>
|
@click="openDirectory(item.path || item.filePath)"
|
||||||
{{ t('common.delete') }}
|
>
|
||||||
</n-tooltip>
|
<i class="ri-folder-open-line" />
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
{{ t('download.settingsPanel.open') }}
|
||||||
|
</n-tooltip>
|
||||||
|
<n-tooltip trigger="hover">
|
||||||
|
<template #trigger>
|
||||||
|
<button
|
||||||
|
class="w-8 h-8 rounded-full flex items-center justify-center text-neutral-400 hover:text-red-500 hover:bg-red-500/10 transition-all"
|
||||||
|
@click="handleDelete(item)"
|
||||||
|
>
|
||||||
|
<i class="ri-delete-bin-line" />
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
{{ t('common.delete') }}
|
||||||
|
</n-tooltip>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- 未渲染项占位 -->
|
||||||
|
<div
|
||||||
|
v-if="downloadedPlaceholderHeight > 0"
|
||||||
|
:style="{ height: downloadedPlaceholderHeight + 'px' }"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</n-spin>
|
</n-spin>
|
||||||
</div>
|
</div>
|
||||||
@@ -540,6 +550,7 @@ import { useMessage } from 'naive-ui';
|
|||||||
import { computed, onMounted, ref, watch } from 'vue';
|
import { computed, onMounted, ref, watch } from 'vue';
|
||||||
import { useI18n } from 'vue-i18n';
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
import { useProgressiveRender } from '@/hooks/useProgressiveRender';
|
||||||
import { useDownloadStore } from '@/store/modules/download';
|
import { useDownloadStore } from '@/store/modules/download';
|
||||||
import { usePlayerStore } from '@/store/modules/player';
|
import { usePlayerStore } from '@/store/modules/player';
|
||||||
import type { SongResult } from '@/types/music';
|
import type { SongResult } from '@/types/music';
|
||||||
@@ -551,8 +562,23 @@ const { t } = useI18n();
|
|||||||
const playerStore = usePlayerStore();
|
const playerStore = usePlayerStore();
|
||||||
const downloadStore = useDownloadStore();
|
const downloadStore = useDownloadStore();
|
||||||
const message = useMessage();
|
const message = useMessage();
|
||||||
|
const scrollbarRef = ref();
|
||||||
|
|
||||||
const tabName = ref('downloading');
|
const completedList = computed(() => downloadStore.completedList);
|
||||||
|
|
||||||
|
const {
|
||||||
|
renderedItems: renderedDownloaded,
|
||||||
|
placeholderHeight: downloadedPlaceholderHeight,
|
||||||
|
contentPaddingBottom,
|
||||||
|
handleScroll: handleDownloadScroll
|
||||||
|
} = useProgressiveRender({
|
||||||
|
items: completedList,
|
||||||
|
itemHeight: 72,
|
||||||
|
listSelector: '.downloaded-list-section',
|
||||||
|
initialCount: 40
|
||||||
|
});
|
||||||
|
|
||||||
|
const tabName = ref(downloadStore.downloadingList.length > 0 ? 'downloading' : 'downloaded');
|
||||||
|
|
||||||
// ── Status helpers ──────────────────────────────────────────────────────────
|
// ── Status helpers ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|||||||
@@ -94,23 +94,33 @@
|
|||||||
<p>{{ t('favorite.emptyTip') }}</p>
|
<p>{{ t('favorite.emptyTip') }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-else class="space-y-1 pb-24" :class="{ 'max-w-[400px]': isComponent }">
|
<div
|
||||||
<song-item
|
v-else
|
||||||
v-for="(song, index) in favoriteSongs"
|
class="space-y-1"
|
||||||
:key="song.id"
|
:class="{ 'max-w-[400px]': isComponent }"
|
||||||
:item="song"
|
:style="{ paddingBottom: contentPaddingBottom }"
|
||||||
:favorite="false"
|
>
|
||||||
class="rounded-xl hover:bg-gray-100 dark:hover:bg-neutral-800 transition-colors"
|
<div class="favorite-list-section">
|
||||||
:class="[
|
<song-item
|
||||||
setAnimationClass('animate__bounceInLeft'),
|
v-for="(song, index) in renderedItems"
|
||||||
{ '!bg-primary/10': selectedSongs.includes(song.id as number) }
|
:key="song.id"
|
||||||
]"
|
:item="song"
|
||||||
:style="getItemAnimationDelay(index)"
|
:favorite="false"
|
||||||
:selectable="isSelecting"
|
class="rounded-xl hover:bg-gray-100 dark:hover:bg-neutral-800 transition-colors"
|
||||||
:selected="selectedSongs.includes(song.id as number)"
|
:class="[
|
||||||
@play="handlePlay"
|
index < 20 ? setAnimationClass('animate__bounceInLeft') : '',
|
||||||
@select="handleSelect"
|
{ '!bg-primary/10': selectedSongs.includes(song.id as number) }
|
||||||
/>
|
]"
|
||||||
|
:style="index < 20 ? getItemAnimationDelay(index) : undefined"
|
||||||
|
:selectable="isSelecting"
|
||||||
|
:selected="selectedSongs.includes(song.id as number)"
|
||||||
|
@play="handlePlay"
|
||||||
|
@select="handleSelect"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 未渲染项占位 -->
|
||||||
|
<div v-if="placeholderHeight > 0" :style="{ height: placeholderHeight + 'px' }" />
|
||||||
|
|
||||||
<div v-if="isComponent" class="pt-4 text-center">
|
<div v-if="isComponent" class="pt-4 text-center">
|
||||||
<n-button text type="primary" @click="handleMore">
|
<n-button text type="primary" @click="handleMore">
|
||||||
@@ -138,7 +148,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</n-scrollbar>
|
</n-scrollbar>
|
||||||
<play-bottom />
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -149,9 +158,9 @@ import { useI18n } from 'vue-i18n';
|
|||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
|
|
||||||
import { getMusicDetail } from '@/api/music';
|
import { getMusicDetail } from '@/api/music';
|
||||||
import PlayBottom from '@/components/common/PlayBottom.vue';
|
|
||||||
import SongItem from '@/components/common/SongItem.vue';
|
import SongItem from '@/components/common/SongItem.vue';
|
||||||
import { useDownload } from '@/hooks/useDownload';
|
import { useDownload } from '@/hooks/useDownload';
|
||||||
|
import { useProgressiveRender } from '@/hooks/useProgressiveRender';
|
||||||
import { usePlayerStore } from '@/store';
|
import { usePlayerStore } from '@/store';
|
||||||
import type { SongResult } from '@/types/music';
|
import type { SongResult } from '@/types/music';
|
||||||
import { isElectron, setAnimationClass, setAnimationDelay } from '@/utils';
|
import { isElectron, setAnimationClass, setAnimationDelay } from '@/utils';
|
||||||
@@ -162,6 +171,31 @@ const favoriteList = computed(() => playerStore.favoriteList);
|
|||||||
const favoriteSongs = ref<SongResult[]>([]);
|
const favoriteSongs = ref<SongResult[]>([]);
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const noMore = ref(false);
|
const noMore = ref(false);
|
||||||
|
const scrollbarRef = ref();
|
||||||
|
|
||||||
|
// 手工虚拟化
|
||||||
|
const {
|
||||||
|
renderedItems,
|
||||||
|
placeholderHeight,
|
||||||
|
contentPaddingBottom,
|
||||||
|
handleScroll: progressiveScroll,
|
||||||
|
resetRenderLimit
|
||||||
|
} = useProgressiveRender({
|
||||||
|
items: favoriteSongs,
|
||||||
|
itemHeight: 64,
|
||||||
|
listSelector: '.favorite-list-section',
|
||||||
|
initialCount: 40,
|
||||||
|
onReachEnd: () => {
|
||||||
|
if (!loading.value && !noMore.value) {
|
||||||
|
currentPage.value++;
|
||||||
|
getFavoriteSongs();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleScroll = (e: Event) => {
|
||||||
|
progressiveScroll(e);
|
||||||
|
};
|
||||||
|
|
||||||
// 多选相关
|
// 多选相关
|
||||||
const isSelecting = ref(false);
|
const isSelecting = ref(false);
|
||||||
@@ -191,28 +225,24 @@ const handleSelect = (songId: number, selected: boolean) => {
|
|||||||
|
|
||||||
// 批量下载
|
// 批量下载
|
||||||
const handleBatchDownload = async () => {
|
const handleBatchDownload = async () => {
|
||||||
// 获取选中歌曲的信息
|
|
||||||
const selectedSongsList = selectedSongs.value
|
const selectedSongsList = selectedSongs.value
|
||||||
.map((songId) => favoriteSongs.value.find((s) => s.id === songId))
|
.map((songId) => favoriteSongs.value.find((s) => s.id === songId))
|
||||||
.filter((song) => song) as SongResult[];
|
.filter((song) => song) as SongResult[];
|
||||||
|
|
||||||
// 使用hook中的批量下载功能
|
|
||||||
await batchDownloadMusic(selectedSongsList);
|
await batchDownloadMusic(selectedSongsList);
|
||||||
|
|
||||||
// 下载完成后取消选择
|
|
||||||
cancelSelect();
|
cancelSelect();
|
||||||
};
|
};
|
||||||
|
|
||||||
// 排序相关
|
// 排序相关
|
||||||
const isDescending = ref(true); // 默认倒序显示
|
const isDescending = ref(true);
|
||||||
|
|
||||||
// 切换排序方式
|
|
||||||
const toggleSort = (descending: boolean) => {
|
const toggleSort = (descending: boolean) => {
|
||||||
if (isDescending.value === descending) return;
|
if (isDescending.value === descending) return;
|
||||||
isDescending.value = descending;
|
isDescending.value = descending;
|
||||||
currentPage.value = 1;
|
currentPage.value = 1;
|
||||||
favoriteSongs.value = [];
|
favoriteSongs.value = [];
|
||||||
noMore.value = false;
|
noMore.value = false;
|
||||||
|
resetRenderLimit();
|
||||||
getFavoriteSongs();
|
getFavoriteSongs();
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -229,16 +259,14 @@ const props = defineProps({
|
|||||||
|
|
||||||
// 获取当前页的收藏歌曲ID
|
// 获取当前页的收藏歌曲ID
|
||||||
const getCurrentPageIds = () => {
|
const getCurrentPageIds = () => {
|
||||||
let ids = [...favoriteList.value]; // 复制一份以免修改原数组
|
let ids = [...favoriteList.value];
|
||||||
|
|
||||||
// 根据排序方式调整顺序
|
|
||||||
if (isDescending.value) {
|
if (isDescending.value) {
|
||||||
ids = ids.reverse(); // 倒序,最新收藏的在前面
|
ids = ids.reverse();
|
||||||
}
|
}
|
||||||
|
|
||||||
const startIndex = (currentPage.value - 1) * pageSize;
|
const startIndex = (currentPage.value - 1) * pageSize;
|
||||||
const endIndex = startIndex + pageSize;
|
const endIndex = startIndex + pageSize;
|
||||||
// 返回原始ID,不进行类型转换
|
|
||||||
return ids.slice(startIndex, endIndex);
|
return ids.slice(startIndex, endIndex);
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -259,7 +287,6 @@ const getFavoriteSongs = async () => {
|
|||||||
|
|
||||||
const musicIds = currentIds.filter((id) => typeof id === 'number') as number[];
|
const musicIds = currentIds.filter((id) => typeof id === 'number') as number[];
|
||||||
|
|
||||||
// 处理音乐数据
|
|
||||||
let neteaseSongs: SongResult[] = [];
|
let neteaseSongs: SongResult[] = [];
|
||||||
if (musicIds.length > 0) {
|
if (musicIds.length > 0) {
|
||||||
const res = await getMusicDetail(musicIds);
|
const res = await getMusicDetail(musicIds);
|
||||||
@@ -272,31 +299,20 @@ const getFavoriteSongs = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log('获取数据统计:', {
|
|
||||||
neteaseSongs: neteaseSongs.length
|
|
||||||
});
|
|
||||||
|
|
||||||
// 合并数据,保持原有顺序
|
|
||||||
const newSongs = currentIds
|
const newSongs = currentIds
|
||||||
.map((id) => {
|
.map((id) => {
|
||||||
const strId = String(id);
|
const strId = String(id);
|
||||||
|
|
||||||
// 查找音乐
|
|
||||||
const found = neteaseSongs.find((song) => String(song.id) === strId);
|
const found = neteaseSongs.find((song) => String(song.id) === strId);
|
||||||
return found;
|
return found;
|
||||||
})
|
})
|
||||||
.filter((song): song is SongResult => !!song);
|
.filter((song): song is SongResult => !!song);
|
||||||
|
|
||||||
console.log(`最终歌曲列表: ${newSongs.length}首`);
|
|
||||||
|
|
||||||
// 追加新数据而不是替换
|
|
||||||
if (currentPage.value === 1) {
|
if (currentPage.value === 1) {
|
||||||
favoriteSongs.value = newSongs;
|
favoriteSongs.value = newSongs;
|
||||||
} else {
|
} else {
|
||||||
favoriteSongs.value = [...favoriteSongs.value, ...newSongs];
|
favoriteSongs.value = [...favoriteSongs.value, ...newSongs];
|
||||||
}
|
}
|
||||||
|
|
||||||
// 判断是否还有更多数据
|
|
||||||
noMore.value = favoriteSongs.value.length >= favoriteList.value.length;
|
noMore.value = favoriteSongs.value.length >= favoriteList.value.length;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('获取收藏歌曲失败:', error);
|
console.error('获取收藏歌曲失败:', error);
|
||||||
@@ -305,17 +321,6 @@ const getFavoriteSongs = async () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 处理滚动事件
|
|
||||||
const handleScroll = (e: any) => {
|
|
||||||
const { scrollTop, scrollHeight, offsetHeight } = e.target;
|
|
||||||
const threshold = 100; // 距离底部多少像素时加载更多
|
|
||||||
|
|
||||||
if (!loading.value && !noMore.value && scrollHeight - (scrollTop + offsetHeight) < threshold) {
|
|
||||||
currentPage.value++;
|
|
||||||
getFavoriteSongs();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const hasLoaded = ref(false);
|
const hasLoaded = ref(false);
|
||||||
|
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
@@ -326,13 +331,13 @@ onMounted(async () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// 监听收藏列表变化,变化时重置并重新加载
|
|
||||||
watch(
|
watch(
|
||||||
favoriteList,
|
favoriteList,
|
||||||
async () => {
|
async () => {
|
||||||
hasLoaded.value = false;
|
hasLoaded.value = false;
|
||||||
currentPage.value = 1;
|
currentPage.value = 1;
|
||||||
noMore.value = false;
|
noMore.value = false;
|
||||||
|
resetRenderLimit();
|
||||||
await getFavoriteSongs();
|
await getFavoriteSongs();
|
||||||
hasLoaded.value = true;
|
hasLoaded.value = true;
|
||||||
},
|
},
|
||||||
@@ -363,7 +368,6 @@ const isIndeterminate = computed(() => {
|
|||||||
return selectedSongs.value.length > 0 && selectedSongs.value.length < favoriteSongs.value.length;
|
return selectedSongs.value.length > 0 && selectedSongs.value.length < favoriteSongs.value.length;
|
||||||
});
|
});
|
||||||
|
|
||||||
// 处理全选/取消全选
|
|
||||||
const handleSelectAll = (checked: boolean) => {
|
const handleSelectAll = (checked: boolean) => {
|
||||||
if (checked) {
|
if (checked) {
|
||||||
selectedSongs.value = favoriteSongs.value.map((song) => song.id as number);
|
selectedSongs.value = favoriteSongs.value.map((song) => song.id as number);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="music-list-page h-full w-full bg-white dark:bg-black transition-colors duration-500">
|
<div class="music-list-page h-full w-full bg-white dark:bg-black transition-colors duration-500">
|
||||||
<n-scrollbar ref="scrollbarRef" class="h-full" @scroll="handleScroll">
|
<n-scrollbar ref="scrollbarRef" class="h-full" @scroll="handleScroll">
|
||||||
<div class="music-list-content pb-32">
|
<div class="music-list-content" :style="{ paddingBottom: contentPaddingBottom }">
|
||||||
<!-- Hero Section 和 Action Bar -->
|
<!-- Hero Section 和 Action Bar -->
|
||||||
<n-spin :show="loading">
|
<n-spin :show="loading">
|
||||||
<!-- Hero Section -->
|
<!-- Hero Section -->
|
||||||
@@ -217,23 +217,50 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Locate Current Song -->
|
<!-- Locate Current Song -->
|
||||||
<button
|
<n-tooltip v-if="currentPlayingIndex >= 0" trigger="hover">
|
||||||
v-if="currentPlayingIndex >= 0"
|
<template #trigger>
|
||||||
class="action-btn-icon w-10 h-10 rounded-full flex items-center justify-center bg-neutral-100 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:bg-neutral-800 transition-all"
|
<button
|
||||||
:title="t('comp.musicList.locateCurrent', '定位当前播放')"
|
class="action-btn-icon w-10 h-10 rounded-full flex items-center justify-center bg-neutral-100 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:bg-neutral-800 transition-all"
|
||||||
@click="scrollToCurrentSong"
|
@click="scrollToCurrentSong"
|
||||||
>
|
>
|
||||||
<i class="ri-focus-3-line text-lg" />
|
<i class="ri-focus-3-line text-lg" />
|
||||||
</button>
|
</button>
|
||||||
|
</template>
|
||||||
|
{{ t('comp.musicList.locateCurrent') }}
|
||||||
|
</n-tooltip>
|
||||||
|
|
||||||
<!-- Layout Toggle -->
|
<!-- Layout Toggle -->
|
||||||
<button
|
<n-tooltip v-if="!isMobile" trigger="hover">
|
||||||
v-if="!isMobile"
|
<template #trigger>
|
||||||
class="action-btn-icon w-10 h-10 rounded-full flex items-center justify-center bg-neutral-100 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:bg-neutral-800 transition-all"
|
<button
|
||||||
@click="toggleLayout"
|
class="action-btn-icon w-10 h-10 rounded-full flex items-center justify-center bg-neutral-100 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:bg-neutral-800 transition-all"
|
||||||
>
|
@click="toggleLayout"
|
||||||
<i :class="isCompactLayout ? 'ri-list-check-2' : 'ri-grid-line'" class="text-lg" />
|
>
|
||||||
</button>
|
<i
|
||||||
|
:class="isCompactLayout ? 'ri-list-check-2' : 'ri-grid-line'"
|
||||||
|
class="text-lg"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
{{
|
||||||
|
isCompactLayout
|
||||||
|
? t('comp.musicList.normalLayout')
|
||||||
|
: t('comp.musicList.compactLayout')
|
||||||
|
}}
|
||||||
|
</n-tooltip>
|
||||||
|
|
||||||
|
<!-- Scroll to Top -->
|
||||||
|
<n-tooltip trigger="hover">
|
||||||
|
<template #trigger>
|
||||||
|
<button
|
||||||
|
class="action-btn-icon w-10 h-10 rounded-full flex items-center justify-center bg-neutral-100 dark:bg-neutral-900 text-neutral-600 dark:text-neutral-400 hover:bg-neutral-200 dark:hover:bg-neutral-800 transition-all"
|
||||||
|
@click="scrollToTop"
|
||||||
|
>
|
||||||
|
<i class="ri-arrow-up-line text-lg" />
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
{{ t('comp.musicList.scrollToTop') }}
|
||||||
|
</n-tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
@@ -296,7 +323,6 @@
|
|||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</n-scrollbar>
|
</n-scrollbar>
|
||||||
<play-bottom />
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -314,7 +340,6 @@ import {
|
|||||||
subscribePlaylist,
|
subscribePlaylist,
|
||||||
updatePlaylistTracks
|
updatePlaylistTracks
|
||||||
} from '@/api/music';
|
} from '@/api/music';
|
||||||
import PlayBottom from '@/components/common/PlayBottom.vue';
|
|
||||||
import SongItem from '@/components/common/SongItem.vue';
|
import SongItem from '@/components/common/SongItem.vue';
|
||||||
import { useDownload } from '@/hooks/useDownload';
|
import { useDownload } from '@/hooks/useDownload';
|
||||||
import { useScrollTitle } from '@/hooks/useScrollTitle';
|
import { useScrollTitle } from '@/hooks/useScrollTitle';
|
||||||
@@ -338,6 +363,10 @@ const message = useMessage();
|
|||||||
const playHistoryStore = usePlayHistoryStore();
|
const playHistoryStore = usePlayHistoryStore();
|
||||||
|
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
|
const isPlaying = computed(() => !!playerStore.playMusicUrl);
|
||||||
|
const contentPaddingBottom = computed(() =>
|
||||||
|
isPlaying.value && !isMobile.value ? '220px' : '80px'
|
||||||
|
);
|
||||||
|
|
||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
const id = route.params.id;
|
const id = route.params.id;
|
||||||
@@ -428,7 +457,7 @@ const canRemove = computed(() => {
|
|||||||
|
|
||||||
const canCollect = ref(false);
|
const canCollect = ref(false);
|
||||||
const isCollected = ref(false);
|
const isCollected = ref(false);
|
||||||
const pageSize = 40;
|
const pageSize = 200;
|
||||||
const initialAnimateCount = 20; // 仅前 20 项有入场动画
|
const initialAnimateCount = 20; // 仅前 20 项有入场动画
|
||||||
const displayedSongs = ref<SongResult[]>([]);
|
const displayedSongs = ref<SongResult[]>([]);
|
||||||
const renderLimit = ref(pageSize); // DOM 渲染上限,数据全部在内存
|
const renderLimit = ref(pageSize); // DOM 渲染上限,数据全部在内存
|
||||||
@@ -832,6 +861,10 @@ const toggleLayout = () => {
|
|||||||
localStorage.setItem('musicListLayout', isCompactLayout.value ? 'compact' : 'normal');
|
localStorage.setItem('musicListLayout', isCompactLayout.value ? 'compact' : 'normal');
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const scrollToTop = () => {
|
||||||
|
scrollbarRef.value?.scrollTo({ top: 0, behavior: 'smooth' });
|
||||||
|
};
|
||||||
|
|
||||||
const checkCollectionStatus = () => {
|
const checkCollectionStatus = () => {
|
||||||
const type = route.query.type as string;
|
const type = route.query.type as string;
|
||||||
if (type === 'playlist' && listInfo.value?.id) {
|
if (type === 'playlist' && listInfo.value?.id) {
|
||||||
|
|||||||
Reference in New Issue
Block a user