音乐模块调整
This commit is contained in:
1 parent
4f574cb5fa
commit
8f853f7ef3
31 files changed
+3819
-936
No files matched your search
+466
-363
File diff suppressed because it is too large.
Load diff
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||
import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||
import { toast } from 'vue-sonner'
|
||||
import {
|
||||
Cloud,
|
||||
@@ -16,7 +16,7 @@ import {
|
||||
Search,
|
||||
Trash2
|
||||
} from '@lucide/vue'
|
||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||
import { useFeiniuStore, type PlayableItem } from '@/stores/feiniuStore'
|
||||
import TrackItem from './TrackItem.vue'
|
||||
import PlaylistEditorDialog from './PlaylistEditorDialog.vue'
|
||||
import { Button } from '@/components/ui/button'
|
||||
@@ -46,21 +46,96 @@ const sourceNav = computed(() => [
|
||||
{ value: 'playlists' as const, label: '我的歌单', icon: ListMusic, count: store.playlists.length }
|
||||
])
|
||||
|
||||
// ===== 飞牛曲库:搜索(直接绑定 store.searchKeyword,此前绑定的是孤立局部变量,导致搜索完全无效)=====
|
||||
// ===== 曲库搜索:飞牛 track/list 接口**不支持**关键字过滤(实测忽略该参数),
|
||||
// 因此搜索框只做**本地筛选**(歌名/歌手/专辑);输入时自动补齐剩余分页,
|
||||
// 保证筛选覆盖全库而不是已加载的前几页。两个视图(飞牛/本地)共用同一个关键字。
|
||||
let searchTimer: ReturnType<typeof setTimeout> | undefined
|
||||
let searchSeq = 0
|
||||
/** 全量补齐进行中:输入防抖与视图切换可能同时触发,用标志位避免并发重复翻页 */
|
||||
let fillingAll = false
|
||||
/** 本组件已完成挂载初始化:此前不触发补齐,避免与 ensureTracksFresh 的首页请求并发 */
|
||||
let mountedReady = false
|
||||
|
||||
/**
|
||||
* 补齐飞牛曲库的剩余分页。
|
||||
* 飞牛 `track/list` 不支持关键字过滤,搜索框只做**本地筛选**,
|
||||
* 因此必须先把剩余分页拉完,否则只能在「已加载的前几页」里找,
|
||||
* 表现为「曲库里明明有这首歌却搜不到」。
|
||||
*
|
||||
* 必须避让任何在途的分页请求:补齐是「按页追加」,而首页刷新是
|
||||
* `tracks = mapped`(整体替换);两者交错会把刚追加的页直接抹掉,造成曲目缺口。
|
||||
*/
|
||||
async function fillRemainingFeiniu() {
|
||||
if (fillingAll || !store.hasMoreTracks) return
|
||||
if (store.loading || store.refreshing || store.loadingMore) return
|
||||
fillingAll = true
|
||||
const seq = ++searchSeq
|
||||
try {
|
||||
await store.loadRemainingTracks()
|
||||
} catch (e) {
|
||||
if (seq === searchSeq) toast.error(String(e))
|
||||
} finally {
|
||||
fillingAll = false
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 搜索框输入:仅飞牛曲库需要补齐分页(本地曲库是已全量在内存的数组,输入即筛)。
|
||||
* 两个视图共用同一个关键字,但按各自的数据来源决定是否发请求。
|
||||
*/
|
||||
function onSearchInput() {
|
||||
clearTimeout(searchTimer)
|
||||
searchTimer = setTimeout(async () => {
|
||||
const seq = ++searchSeq
|
||||
try {
|
||||
await store.loadTracks(1)
|
||||
} catch (e) {
|
||||
if (seq === searchSeq) toast.error(String(e))
|
||||
}
|
||||
}, 400)
|
||||
searchTimer = setTimeout(() => {
|
||||
if (view.value !== 'feiniu') return
|
||||
void fillRemainingFeiniu()
|
||||
}, 300)
|
||||
}
|
||||
|
||||
const isFiltering = computed(() => !!filterKeyword.value)
|
||||
|
||||
/** 关键字规范化:全角空格→半角、压缩连续空白、转小写(中文不受影响) */
|
||||
function normalizeKeyword(s: string) {
|
||||
return s
|
||||
.replace(/\u3000/g, ' ')
|
||||
.trim()
|
||||
.replace(/\s+/g, ' ')
|
||||
.toLowerCase()
|
||||
}
|
||||
|
||||
const filterKeyword = computed(() => normalizeKeyword(store.searchKeyword))
|
||||
|
||||
/**
|
||||
* 保证飞牛曲库的筛选覆盖全库。
|
||||
* 关键字在两个视图之间共享,所以「带着关键字从本地切回飞牛曲库」时
|
||||
* 也必须补齐分页,否则只会在已加载的前几页里筛,结果数明显偏小。
|
||||
* 挂载阶段由 onMounted 的串行链负责,此处只在挂载后响应视图 / 关键字变化。
|
||||
*/
|
||||
function ensureFeiniuFilterCoverage() {
|
||||
if (!mountedReady) return
|
||||
if (view.value !== 'feiniu' || !filterKeyword.value) return
|
||||
void fillRemainingFeiniu()
|
||||
}
|
||||
watch([view, filterKeyword], ensureFeiniuFilterCoverage)
|
||||
|
||||
function matchesKeyword(t: PlayableItem, kw: string) {
|
||||
// 曲库条目(PlayableItem)的字段是 title=歌名 / artistNames=歌手 / album=专辑。
|
||||
// 千万不要用 musicdl 的 songName/singers——那是「发现音乐」的结构,用错字段
|
||||
// 会导致 haystack 只剩专辑,表现为"歌名/歌手都搜不到"。
|
||||
return `${t.title ?? ''} ${t.artistNames ?? ''} ${t.album ?? ''}`.toLowerCase().includes(kw)
|
||||
}
|
||||
|
||||
const filteredTracks = computed(() => {
|
||||
const kw = filterKeyword.value
|
||||
if (!kw) return store.tracks
|
||||
return store.tracks.filter((t) => matchesKeyword(t, kw))
|
||||
})
|
||||
|
||||
const filteredLocalTracks = computed(() => {
|
||||
const kw = filterKeyword.value
|
||||
if (!kw) return store.localTracks
|
||||
return store.localTracks.filter((t) => matchesKeyword(t, kw))
|
||||
})
|
||||
|
||||
function refreshFeiniu() {
|
||||
store.loadTracks(1).catch((e) => toast.error(String(e)))
|
||||
}
|
||||
@@ -69,23 +144,66 @@ function refreshLocal() {
|
||||
}
|
||||
|
||||
function playFeiniu() {
|
||||
if (store.tracks.length) store.playQueue(store.tracks, 0)
|
||||
// 有筛选时只播放筛选结果
|
||||
if (filteredTracks.value.length) store.playQueue(filteredTracks.value, 0)
|
||||
}
|
||||
function playLocal() {
|
||||
if (store.localTracks.length) store.playQueue(store.localTracks, 0)
|
||||
if (filteredLocalTracks.value.length) store.playQueue(filteredLocalTracks.value, 0)
|
||||
}
|
||||
function playActivePlaylist() {
|
||||
if (activePlaylist.value?.items.length) store.playQueue(activePlaylist.value.items, 0)
|
||||
}
|
||||
|
||||
// ===== 滚动加载更多(飞牛曲库分页)=====
|
||||
// ===== 列表增量渲染 + 滚动加载更多 =====
|
||||
/**
|
||||
* 一次挂载多少行。曲库没有虚拟滚动,补齐分页后行数可达 MAX_QUEUE_TRACKS(4000),
|
||||
* 一次性挂载 4000 个 TrackItem(每个含封面 <img> 与下拉菜单)会明显卡顿,
|
||||
* 因此改成「先渲染一屏,滚到底再追加」(与发现音乐页、播放队列同一策略)。
|
||||
*/
|
||||
const LIST_STEP = 200
|
||||
const renderLimit = ref(LIST_STEP)
|
||||
|
||||
/** 当前视图正在展示的完整列表 */
|
||||
const activeList = computed<PlayableItem[]>(() => {
|
||||
if (view.value === 'feiniu') return filteredTracks.value
|
||||
if (view.value === 'local') return filteredLocalTracks.value
|
||||
return activePlaylist.value?.items ?? []
|
||||
})
|
||||
const visibleFeiniu = computed(() => filteredTracks.value.slice(0, renderLimit.value))
|
||||
const visibleLocal = computed(() => filteredLocalTracks.value.slice(0, renderLimit.value))
|
||||
const visiblePlaylistItems = computed(() => (activePlaylist.value?.items ?? []).slice(0, renderLimit.value))
|
||||
/** 还有没渲染出来的行 */
|
||||
const hasMoreRows = computed(() => renderLimit.value < activeList.value.length)
|
||||
/** 实际渲染出来的行数(提示文案用) */
|
||||
const shownRows = computed(() => Math.min(renderLimit.value, activeList.value.length))
|
||||
/** 哨兵是否显示:要么还有行没渲染,要么飞牛曲库还有分页没拉 */
|
||||
const showSentinel = computed(
|
||||
() => hasMoreRows.value || (view.value === 'feiniu' && store.hasMoreTracks)
|
||||
)
|
||||
|
||||
// 换视图 / 换关键字 / 换歌单时把渲染窗口收回一屏(监听放在 activePlaylistId 声明之后)
|
||||
|
||||
const loadMoreRef = ref<HTMLElement | null>(null)
|
||||
let loadMoreObserver: IntersectionObserver | null = null
|
||||
onMounted(() => {
|
||||
loadMoreObserver = new IntersectionObserver(
|
||||
(entries) => {
|
||||
if (!entries.some((e) => e.isIntersecting)) return
|
||||
store.loadMoreTracks().catch(() => {})
|
||||
// 先把已加载的数据渲染出来,都渲染完了再向 NAS 要下一页
|
||||
if (renderLimit.value < activeList.value.length) {
|
||||
renderLimit.value += LIST_STEP
|
||||
// 哨兵节点没换位置、仍处于交叉状态时 IntersectionObserver 不会再触发,
|
||||
// 需要重新 observe 一次才能连续追加
|
||||
nextTick(() => {
|
||||
const el = loadMoreRef.value
|
||||
if (el && loadMoreObserver) {
|
||||
loadMoreObserver.unobserve(el)
|
||||
loadMoreObserver.observe(el)
|
||||
}
|
||||
})
|
||||
return
|
||||
}
|
||||
if (view.value === 'feiniu' && store.hasMoreTracks) store.loadMoreTracks().catch(() => {})
|
||||
},
|
||||
{ rootMargin: '400px' }
|
||||
)
|
||||
@@ -118,6 +236,11 @@ const editorOpen = ref(false)
|
||||
// 切换歌单时关闭编辑器,避免对着已切换的目标继续编辑
|
||||
watch(activePlaylistId, () => (editorOpen.value = false))
|
||||
|
||||
// 换视图 / 换关键字 / 换歌单时把增量渲染窗口收回一屏,避免「切回来看到一屏旧内容」
|
||||
watch([view, filterKeyword, activePlaylistId], () => {
|
||||
renderLimit.value = LIST_STEP
|
||||
})
|
||||
|
||||
// 切到歌单视图时自动选中第一个
|
||||
watch(
|
||||
[view, () => store.playlists.length],
|
||||
@@ -159,9 +282,44 @@ function removePlaylist() {
|
||||
activePlaylistId.value = ''
|
||||
}
|
||||
|
||||
// ===== 视图与筛选持久化:曲库页每次挂载都会重置本地状态,
|
||||
// 而"搜索结果每次都要重新输"是用户明确反馈的问题 → 存 localStorage(跨重启) =====
|
||||
const LIB_VIEW_KEY = 'thing.music.library.view'
|
||||
const LIB_FILTER_KEY = 'thing.music.library.filter'
|
||||
|
||||
watch(
|
||||
() => [view.value, store.searchKeyword] as const,
|
||||
([v, kw]) => {
|
||||
try {
|
||||
localStorage.setItem(LIB_VIEW_KEY, v)
|
||||
localStorage.setItem(LIB_FILTER_KEY, kw ?? '')
|
||||
} catch {
|
||||
/* 存储不可用时静默 */
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
onMounted(async () => {
|
||||
await store.init()
|
||||
if (store.config.loggedIn) store.loadTracks(1).catch(() => {})
|
||||
try {
|
||||
// 恢复上次的视图与筛选关键字
|
||||
const savedView = localStorage.getItem(LIB_VIEW_KEY)
|
||||
if (savedView === 'feiniu' || savedView === 'local' || savedView === 'playlists') {
|
||||
view.value = savedView
|
||||
}
|
||||
store.searchKeyword = localStorage.getItem(LIB_FILTER_KEY) ?? ''
|
||||
await store.init()
|
||||
// 进入曲库页:命中新鲜窗口直接用内存缓存(不请求),过期才后台静默刷新,
|
||||
// 避免每次切页都清空列表 + 重新拉取 + 重下封面
|
||||
if (store.config.loggedIn) await store.ensureTracksFresh().catch(() => {})
|
||||
// 恢复的是本地视图时自动扫描(标签有缓存,通常很快),否则恢复的筛选无内容可筛
|
||||
if (view.value === 'local') void store.scanLocal().catch(() => {})
|
||||
} finally {
|
||||
// 挂载初始化结束才让「视图 / 关键字变化 → 补齐分页」的监听生效,
|
||||
// 避免它与上面的首页请求并发(并发会因列表整体替换而丢页);
|
||||
// 随后按同一串行顺序补一次,覆盖「启动时已带关键字」的情况
|
||||
mountedReady = true
|
||||
ensureFeiniuFilterCoverage()
|
||||
}
|
||||
})
|
||||
|
||||
/** 表格表头与 TrackItem 行保持同一条网格 */
|
||||
@@ -169,10 +327,9 @@ const GRID = { gridTemplateColumns: '28px 36px minmax(0,1fr) 74px 28px' }
|
||||
|
||||
const listEmptyHint = computed(() => {
|
||||
if (view.value === 'feiniu') {
|
||||
if (store.searchKeyword.trim()) return '没有匹配「' + store.searchKeyword.trim() + '」的曲目'
|
||||
return store.config.loggedIn ? '曲库为空,试试刷新或检查 NAS 曲库目录' : '请先在「设置 → 飞牛音乐连接」登录'
|
||||
}
|
||||
return '暂无本地音乐,点击「扫描本地曲库」或先到「发现音乐」下载'
|
||||
return '暂无本地音乐,点击「扫描本地曲库」,或到「设置 → 存储与上传」添加本地曲库目录'
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -249,15 +406,19 @@ const listEmptyHint = computed(() => {
|
||||
|
||||
<!-- ===== 右:内容(key 随来源变化,复用全局 tab-animate 切换动画) ===== -->
|
||||
<section :key="view" class="tab-animate flex min-w-0 flex-1 flex-col">
|
||||
<!-- 未登录态 -->
|
||||
<div v-if="needsLogin" class="flex min-h-0 flex-1 items-center justify-center px-6">
|
||||
<!-- 未登录态:**只挡飞牛曲库**。本地曲库与「我的歌单」完全不依赖 NAS 登录,
|
||||
此前把它们一起挡掉,等于让「只用发现音乐 + 本地曲库」的用户点进来只看得到登录提示 -->
|
||||
<div
|
||||
v-if="view === 'feiniu' && needsLogin"
|
||||
class="flex min-h-0 flex-1 items-center justify-center px-6"
|
||||
>
|
||||
<Empty>
|
||||
<EmptyMedia>
|
||||
<Music2 class="size-8 text-muted-foreground" />
|
||||
</EmptyMedia>
|
||||
<EmptyTitle>还没有可用的飞牛音乐连接</EmptyTitle>
|
||||
<EmptyTitle>飞牛曲库需要一个可用的音乐连接</EmptyTitle>
|
||||
<EmptyDescription>
|
||||
到「设置 → 飞牛音乐连接」添加并登录,或先到「发现音乐」下载歌曲到本地曲库。
|
||||
到「设置 → 飞牛音乐连接」添加并登录。本地曲库与「我的歌单」不依赖 NAS,可直接在左侧切换查看。
|
||||
</EmptyDescription>
|
||||
</Empty>
|
||||
</div>
|
||||
@@ -266,36 +427,65 @@ const listEmptyHint = computed(() => {
|
||||
<!-- 工具栏 -->
|
||||
<header class="flex shrink-0 items-center gap-2 border-b px-4 py-2.5">
|
||||
<template v-if="view === 'feiniu'">
|
||||
<div class="relative w-full max-w-sm">
|
||||
<div class="relative w-full max-w-[280px]">
|
||||
<Search class="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
|
||||
<Input
|
||||
v-model="store.searchKeyword"
|
||||
class="h-8 pl-8"
|
||||
placeholder="搜索歌名 / 歌手 / 专辑"
|
||||
placeholder="搜索歌名 / 歌手 / 专辑(本地筛选)"
|
||||
@input="onSearchInput"
|
||||
@keydown.enter="onSearchInput"
|
||||
/>
|
||||
</div>
|
||||
<Button variant="outline" size="sm" class="h-8" :disabled="store.loading" @click="refreshFeiniu">
|
||||
<RefreshCw :class="store.loading ? 'size-3.5 animate-spin' : 'size-3.5'" />
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
class="h-8"
|
||||
:disabled="store.loading || store.refreshing"
|
||||
@click="refreshFeiniu"
|
||||
>
|
||||
<RefreshCw :class="store.loading || store.refreshing ? 'size-3.5 animate-spin' : 'size-3.5'" />
|
||||
刷新
|
||||
</Button>
|
||||
<span class="ml-1 text-[11.5px] text-muted-foreground">
|
||||
{{ store.tracks.length }}<template v-if="store.total > store.tracks.length"> / {{ store.total }}</template> 首
|
||||
<span class="ml-1 shrink-0 whitespace-nowrap text-[11.5px] text-muted-foreground">
|
||||
<template v-if="isFiltering">
|
||||
匹配 {{ filteredTracks.length }} / 已加载 {{ store.tracks.length }} 首
|
||||
</template>
|
||||
<template v-else>
|
||||
{{ store.tracks.length }}<template v-if="store.total > store.tracks.length"> / {{ store.total }}</template> 首
|
||||
</template>
|
||||
</span>
|
||||
<Button size="sm" class="ml-auto h-8" :disabled="!store.tracks.length" @click="playFeiniu">
|
||||
<Button size="sm" class="ml-auto h-8" :disabled="!filteredTracks.length" @click="playFeiniu">
|
||||
<Play class="size-3.5" /> 播放全部
|
||||
</Button>
|
||||
</template>
|
||||
|
||||
<template v-else-if="view === 'local'">
|
||||
<!-- 结构与飞牛曲库完全一致:搜索框 → 操作按钮 → 计数 → 播放全部;
|
||||
提示语与筛选字段(歌名 / 歌手 / 专辑)也保持一致。
|
||||
宽度收窄到与飞牛曲库同宽,把余量留给右侧的匹配数与「播放全部」 -->
|
||||
<div class="relative w-full max-w-[280px]">
|
||||
<Search class="pointer-events-none absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
|
||||
<Input
|
||||
v-model="store.searchKeyword"
|
||||
class="h-8 pl-8"
|
||||
placeholder="搜索歌名 / 歌手 / 专辑(本地筛选)"
|
||||
@input="onSearchInput"
|
||||
@keydown.enter="onSearchInput"
|
||||
/>
|
||||
</div>
|
||||
<Button variant="outline" size="sm" class="h-8" :disabled="store.localScanBusy" @click="refreshLocal">
|
||||
<Loader2 v-if="store.localScanBusy" class="size-3.5 animate-spin" />
|
||||
<FolderOpen v-else class="size-3.5" />
|
||||
扫描本地曲库
|
||||
</Button>
|
||||
<span class="text-[11.5px] text-muted-foreground">{{ store.localTracks.length }} 首</span>
|
||||
<Button size="sm" class="ml-auto h-8" :disabled="!store.localTracks.length" @click="playLocal">
|
||||
<span class="ml-1 shrink-0 whitespace-nowrap text-[11.5px] text-muted-foreground">
|
||||
<template v-if="isFiltering">
|
||||
匹配 {{ filteredLocalTracks.length }} / 已扫描 {{ store.localTracks.length }} 首
|
||||
</template>
|
||||
<template v-else>{{ store.localTracks.length }} 首</template>
|
||||
</span>
|
||||
<Button size="sm" class="ml-auto h-8" :disabled="!filteredLocalTracks.length" @click="playLocal">
|
||||
<Play class="size-3.5" /> 播放全部
|
||||
</Button>
|
||||
</template>
|
||||
@@ -344,8 +534,8 @@ const listEmptyHint = computed(() => {
|
||||
<!-- 表头 -->
|
||||
<div
|
||||
v-if="
|
||||
(view === 'feiniu' && store.tracks.length) ||
|
||||
(view === 'local' && store.localTracks.length) ||
|
||||
(view === 'feiniu' && filteredTracks.length) ||
|
||||
(view === 'local' && filteredLocalTracks.length) ||
|
||||
(view === 'playlists' && activePlaylist?.items.length)
|
||||
"
|
||||
class="grid h-8 items-center gap-3 px-2 text-[11px] text-muted-foreground"
|
||||
@@ -365,26 +555,25 @@ const listEmptyHint = computed(() => {
|
||||
</div>
|
||||
<Empty v-else-if="!store.tracks.length">
|
||||
<EmptyMedia><Music2 class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>{{ store.searchKeyword.trim() ? '没有匹配的曲目' : '曲库为空' }}</EmptyTitle>
|
||||
<EmptyTitle>曲库为空</EmptyTitle>
|
||||
<EmptyDescription>{{ listEmptyHint }}</EmptyDescription>
|
||||
</Empty>
|
||||
<Empty v-else-if="!filteredTracks.length">
|
||||
<EmptyMedia><Search class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>没有匹配「{{ store.searchKeyword.trim() }}」的曲目</EmptyTitle>
|
||||
<EmptyDescription>
|
||||
已在{{ store.tracks.length }}首曲库中筛选(歌名 / 歌手 / 专辑)。
|
||||
</EmptyDescription>
|
||||
</Empty>
|
||||
<template v-else>
|
||||
<TrackItem
|
||||
v-for="(t, i) in store.tracks"
|
||||
v-for="(t, i) in visibleFeiniu"
|
||||
:key="t.guid || i"
|
||||
:item="t"
|
||||
:index="i"
|
||||
:context="store.tracks"
|
||||
:context="filteredTracks"
|
||||
:active="store.current?.guid === t.guid"
|
||||
/>
|
||||
<div
|
||||
v-if="store.hasMoreTracks"
|
||||
ref="loadMoreRef"
|
||||
class="flex items-center justify-center gap-2 py-4 text-[12px] text-muted-foreground"
|
||||
>
|
||||
<Loader2 v-if="store.loadingMore" class="size-3.5 animate-spin" />
|
||||
正在加载更多…
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
@@ -395,13 +584,18 @@ const listEmptyHint = computed(() => {
|
||||
<EmptyTitle>暂无本地音乐</EmptyTitle>
|
||||
<EmptyDescription>{{ listEmptyHint }}</EmptyDescription>
|
||||
</Empty>
|
||||
<template v-else>
|
||||
<Empty v-else-if="store.localTracks.length && !filteredLocalTracks.length">
|
||||
<EmptyMedia><Search class="size-8 text-muted-foreground" /></EmptyMedia>
|
||||
<EmptyTitle>没有匹配「{{ store.searchKeyword.trim() }}」的本地曲目</EmptyTitle>
|
||||
<EmptyDescription>已在扫描到的 {{ store.localTracks.length }} 首中筛选。</EmptyDescription>
|
||||
</Empty>
|
||||
<template v-else-if="filteredLocalTracks.length">
|
||||
<TrackItem
|
||||
v-for="(t, i) in store.localTracks"
|
||||
v-for="(t, i) in visibleLocal"
|
||||
:key="t.guid || i"
|
||||
:item="t"
|
||||
:index="i"
|
||||
:context="store.localTracks"
|
||||
:context="filteredLocalTracks"
|
||||
:active="store.current?.guid === t.guid"
|
||||
/>
|
||||
</template>
|
||||
@@ -422,7 +616,7 @@ const listEmptyHint = computed(() => {
|
||||
</Button>
|
||||
</Empty>
|
||||
<TrackItem
|
||||
v-for="(t, i) in activePlaylist.items"
|
||||
v-for="(t, i) in visiblePlaylistItems"
|
||||
:key="`${t.source}:${t.guid}:${i}`"
|
||||
:item="t"
|
||||
:index="i"
|
||||
@@ -439,6 +633,17 @@ const listEmptyHint = computed(() => {
|
||||
<EmptyDescription>点击左侧「新建歌单」开始整理你的收藏。</EmptyDescription>
|
||||
</Empty>
|
||||
</template>
|
||||
|
||||
<!-- 增量渲染 / 分页共用哨兵:滚到这里先追加一批行,行渲染完了再向 NAS 要下一页 -->
|
||||
<div
|
||||
v-if="showSentinel && activeList.length"
|
||||
ref="loadMoreRef"
|
||||
class="flex items-center justify-center gap-2 py-4 text-[12px] text-muted-foreground"
|
||||
>
|
||||
<Loader2 v-if="store.loadingMore" class="size-3.5 animate-spin" />
|
||||
<template v-if="hasMoreRows">已显示 {{ shownRows }} / {{ activeList.length }} 首,继续滚动加载</template>
|
||||
<template v-else>正在加载更多…</template>
|
||||
</div>
|
||||
</div>
|
||||
</ScrollArea>
|
||||
</template>
|
||||
|
||||
@@ -106,26 +106,26 @@ async function uploadToFeiniu() {
|
||||
|
||||
<template>
|
||||
<div
|
||||
class="group grid h-11 items-center gap-3 rounded-md px-2 outline-none transition-colors focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
class="group grid h-11 items-center gap-3 rounded-md px-2 transition-colors"
|
||||
:class="[
|
||||
showAlbum
|
||||
? 'grid-cols-[28px_36px_minmax(0,1fr)_minmax(0,0.75fr)_74px_28px]'
|
||||
: 'grid-cols-[28px_36px_minmax(0,1fr)_74px_28px]',
|
||||
isCurrent ? 'bg-accent/60' : 'hover:bg-accent/40'
|
||||
]"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@dblclick="play"
|
||||
@keydown.enter.prevent="play"
|
||||
>
|
||||
<!-- 序号 / 播放态指示:悬停时原位切换,不占用固定的空白列 -->
|
||||
<div class="flex size-7 items-center justify-center text-[11.5px] tabular-nums text-muted-foreground">
|
||||
<!-- 序号 / 播放态指示 / 播放按钮。
|
||||
行本身不再是 role=button(内部还嵌着下拉菜单的按钮,嵌套交互元素对读屏是噪音);
|
||||
播放改由下面这个**常驻 DOM** 的按钮承担——原来它是 hover 才 display:none→block,
|
||||
而 display:none 的元素无法获得焦点,键盘用户根本按不到 -->
|
||||
<div class="relative flex size-7 items-center justify-center text-[11.5px] tabular-nums text-muted-foreground">
|
||||
<span v-if="isCurrent" class="music-eq" :class="{ 'is-paused': !store.playing }"><i /><i /><i /></span>
|
||||
<template v-else>
|
||||
<span class="group-hover:hidden">{{ index + 1 }}</span>
|
||||
<span class="transition-opacity group-hover:opacity-0">{{ index + 1 }}</span>
|
||||
<button
|
||||
type="button"
|
||||
class="hidden text-foreground group-hover:block"
|
||||
class="absolute inset-0 flex items-center justify-center rounded text-foreground opacity-0 outline-none transition-opacity group-hover:opacity-100 focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||
:aria-label="'播放 ' + item.title"
|
||||
@click.stop="play"
|
||||
>
|
||||
@@ -223,9 +223,11 @@ async function uploadToFeiniu() {
|
||||
>
|
||||
<Cloud class="size-4" /> 上传到飞牛曲库
|
||||
</DropdownMenuItem>
|
||||
<DropdownMenuItem disabled>
|
||||
<FolderOpen class="size-4" /> {{ item.dir || '未知目录' }}
|
||||
</DropdownMenuItem>
|
||||
<!-- 所在目录只是信息,不是动作:用 disabled 的菜单项展示会让人以为点了没反应 -->
|
||||
<div class="flex items-center gap-2 px-2 py-1.5 text-[11.5px] text-muted-foreground">
|
||||
<FolderOpen class="size-3.5 shrink-0" />
|
||||
<span class="truncate" :title="item.dir || ''">{{ item.dir || '未知目录' }}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template v-if="playlistId">
|
||||
|
||||
@@ -22,6 +22,7 @@ const editing = ref<Partial<FeiniuConnection> | null>(null)
|
||||
const editOpen = ref(false)
|
||||
const password = ref('')
|
||||
const testing = ref(false)
|
||||
const saving = ref(false)
|
||||
|
||||
function newForm() {
|
||||
editing.value = { name: '', kind: 'lan', baseUrl: '', username: '', accessCode: '', insecure: false, fnId: '' }
|
||||
@@ -30,46 +31,94 @@ function newForm() {
|
||||
}
|
||||
|
||||
function editForm(c: FeiniuConnection) {
|
||||
editing.value = { ...c }
|
||||
// 历史数据里的 frp 等内网转发方式已并入「局域网」
|
||||
editing.value = { ...c, kind: c.kind === 'fnconnect' ? 'fnconnect' : 'lan' }
|
||||
password.value = ''
|
||||
editOpen.value = true
|
||||
}
|
||||
|
||||
async function save() {
|
||||
if (!editing.value) return
|
||||
if (!editing.value.name?.trim() || !editing.value.baseUrl?.trim()) {
|
||||
toast.error('请填写名称与服务器地址')
|
||||
if (!editing.value || saving.value) return
|
||||
const draft = { ...editing.value }
|
||||
if (!draft.name?.trim()) {
|
||||
toast.error('请填写名称')
|
||||
return
|
||||
}
|
||||
// 局域网需要服务器地址;FnConnect 需要飞牛 ID(服务器地址在登录时自动解析)
|
||||
if (draft.kind === 'fnconnect') {
|
||||
if (!draft.fnId?.trim()) {
|
||||
toast.error('请填写飞牛 ID')
|
||||
return
|
||||
}
|
||||
} else if (!draft.baseUrl?.trim()) {
|
||||
toast.error('请填写服务器地址')
|
||||
return
|
||||
}
|
||||
const pw = password.value
|
||||
saving.value = true
|
||||
try {
|
||||
const id = await store.saveConnection({
|
||||
id: editing.value.id || '',
|
||||
name: editing.value.name.trim(),
|
||||
kind: editing.value.kind || 'lan',
|
||||
baseUrl: editing.value.baseUrl.trim(),
|
||||
username: editing.value.username || '',
|
||||
accessCode: editing.value.accessCode || '',
|
||||
insecure: !!editing.value.insecure,
|
||||
fnId: editing.value.fnId || ''
|
||||
id: draft.id || '',
|
||||
name: draft.name.trim(),
|
||||
kind: draft.kind || 'lan',
|
||||
baseUrl: draft.baseUrl?.trim() || '',
|
||||
username: draft.username || '',
|
||||
accessCode: draft.accessCode || '',
|
||||
insecure: !!draft.insecure,
|
||||
fnId: draft.fnId?.trim() || '',
|
||||
relay: !!draft.relay
|
||||
})
|
||||
if (password.value) {
|
||||
await store.login(id, editing.value.username || '', password.value)
|
||||
}
|
||||
// 先关闭对话框再登录:FnConnect 登录要先探测可达地址(可能数秒),
|
||||
// 若等待其完成才关窗,观感就是「已保存但对话框卡住」。
|
||||
editOpen.value = false
|
||||
toast.success('已保存')
|
||||
if (pw && id) {
|
||||
void store
|
||||
.login(id, draft.username || '', pw)
|
||||
.then(() => toast.success('登录成功'))
|
||||
.catch((e) => toast.error(`登录失败:${e}`))
|
||||
}
|
||||
} catch (e) {
|
||||
toast.error(String(e))
|
||||
} finally {
|
||||
saving.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function test(c: FeiniuConnection) {
|
||||
/** 测试当前对话框里的草案(无需先保存,新建连接也可以直接测) */
|
||||
async function test() {
|
||||
const d = editing.value
|
||||
if (!d || testing.value) return
|
||||
if (!password.value) {
|
||||
toast.error('请输入密码再测试')
|
||||
return
|
||||
}
|
||||
if (d.kind === 'fnconnect') {
|
||||
if (!d.fnId?.trim()) {
|
||||
toast.error('请填写飞牛 ID')
|
||||
return
|
||||
}
|
||||
} else if (!d.baseUrl?.trim()) {
|
||||
toast.error('请填写服务器地址')
|
||||
return
|
||||
}
|
||||
testing.value = true
|
||||
try {
|
||||
await store.testConnection(c.id, c.username, password.value)
|
||||
await store.testConnection(
|
||||
{
|
||||
id: d.id || '',
|
||||
name: d.name?.trim() || '测试',
|
||||
kind: d.kind || 'lan',
|
||||
baseUrl: d.baseUrl?.trim() || '',
|
||||
username: d.username || '',
|
||||
accessCode: d.accessCode || '',
|
||||
insecure: !!d.insecure,
|
||||
fnId: d.fnId?.trim() || '',
|
||||
relay: !!d.relay
|
||||
},
|
||||
d.username || '',
|
||||
password.value
|
||||
)
|
||||
toast.success('连接成功')
|
||||
} catch (e) {
|
||||
toast.error(String(e))
|
||||
@@ -93,8 +142,9 @@ async function remove(c: FeiniuConnection) {
|
||||
toast.success('已删除')
|
||||
}
|
||||
|
||||
/** kind → 展示名:局域网涵盖 frp / 内网转发等直连方式,其余为 FnConnect */
|
||||
function kindLabel(k: string) {
|
||||
return k === 'lan' ? '局域网' : k === 'frp' ? 'frp 域名' : 'FnConnect'
|
||||
return k === 'fnconnect' ? 'FnConnect' : '局域网'
|
||||
}
|
||||
|
||||
onMounted(() => store.refreshConnections())
|
||||
@@ -122,7 +172,8 @@ onMounted(() => store.refreshConnections())
|
||||
<Badge v-if="store.activeId === c.id" variant="default" class="text-[10px]">激活</Badge>
|
||||
</div>
|
||||
<div class="truncate text-xs text-muted-foreground">
|
||||
{{ c.baseUrl }}<template v-if="c.username"> · {{ c.username }}</template>
|
||||
{{ c.baseUrl }}<template v-if="c.kind === 'fnconnect' && c.relay"> · 中继</template
|
||||
><template v-if="c.username"> · {{ c.username }}</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex shrink-0 items-center gap-1">
|
||||
@@ -167,7 +218,7 @@ onMounted(() => store.refreshConnections())
|
||||
</div>
|
||||
</div>
|
||||
<p v-if="!store.connections.length" class="text-xs text-muted-foreground">
|
||||
还没有连接。新建一个并填写 NAS 地址(局域网 http://192.168.x.x:5666、frp 域名或 FnConnect fnId)。
|
||||
还没有连接。新建一个并填写 NAS 地址(局域网 http://192.168.x.x:5666,frp 等内网转发同样填最终访问地址)或 FnConnect fnId。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -179,17 +230,17 @@ onMounted(() => store.refreshConnections())
|
||||
<div class="flex flex-col gap-3">
|
||||
<div class="space-y-1.5">
|
||||
<Label>名称</Label>
|
||||
<Input v-model="editing!.name" placeholder="如:家里 NAS / frp 远程 / FnConnect" />
|
||||
<Input v-model="editing!.name" placeholder="如:家里 NAS / FnConnect 远程" />
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label>类型</Label>
|
||||
<div class="flex gap-2">
|
||||
<Button
|
||||
v-for="k in (['lan', 'frp', 'fnconnect'] as const)"
|
||||
v-for="k in (['lan', 'fnconnect'] as const)"
|
||||
:key="k"
|
||||
type="button"
|
||||
size="sm"
|
||||
:variant="editing!.kind === k ? 'default' : 'outline'"
|
||||
:variant="(editing!.kind ?? 'lan') === k ? 'default' : 'outline'"
|
||||
@click="editing!.kind = k"
|
||||
>
|
||||
{{ kindLabel(k) }}
|
||||
@@ -197,15 +248,19 @@ onMounted(() => store.refreshConnections())
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="editing!.kind === 'fnconnect'" class="space-y-1.5">
|
||||
<Label>FnConnect fnId(fnos.net/xxx 或裸 id)</Label>
|
||||
<Input v-model="editing!.fnId" placeholder="fnos.net/zy2060537" />
|
||||
<Label>飞牛 ID</Label>
|
||||
<Input v-model="editing!.fnId" placeholder="请输入飞牛 ID,如 abc123" />
|
||||
<p class="text-xs text-muted-foreground">
|
||||
保存后点登录会自动解析到可达地址;服务器地址会回填。
|
||||
即 fnos.net/ 后面的那段(也可直接粘贴 fnos.net/abc123)。
|
||||
保存后点登录会自动解析到可达地址(内网 / 公网 / 中继),服务器地址会回填。
|
||||
</p>
|
||||
</div>
|
||||
<div v-else class="space-y-1.5">
|
||||
<Label>服务器地址</Label>
|
||||
<Input v-model="editing!.baseUrl" placeholder="http://192.168.1.10:5666 或 https://xxx.xxx.com" />
|
||||
<Input
|
||||
v-model="editing!.baseUrl"
|
||||
placeholder="http://192.168.1.10:5666 或 https://xxx.xxx.com(frp 填转发后的地址)"
|
||||
/>
|
||||
</div>
|
||||
<div class="space-y-1.5">
|
||||
<Label>账号</Label>
|
||||
@@ -221,17 +276,14 @@ onMounted(() => store.refreshConnections())
|
||||
</div>
|
||||
</div>
|
||||
<DialogFooter class="gap-2">
|
||||
<Button variant="outline" :disabled="testing" @click="test(editing as unknown as FeiniuConnection)">
|
||||
<Button variant="outline" :disabled="testing || saving" @click="test">
|
||||
<Loader2 v-if="testing" class="size-4 animate-spin" /> 测试
|
||||
</Button>
|
||||
<Button @click="save">保存</Button>
|
||||
<Button :disabled="saving" @click="save">
|
||||
<Loader2 v-if="saving" class="size-4 animate-spin" /> 保存
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
|
||||
<p class="text-xs text-muted-foreground">
|
||||
提示:上传音乐到 NAS(「下载到飞牛」/ 上传 / 删除)已改用 <strong class="font-medium">WebDAV</strong>,
|
||||
在「存储与上传」分组里配置,无需在此登录文件服务。
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
Reference in new issue
Block a user