fam/cube
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

music(ui): 统一命名 — 和弦谱(字母版) / 简谱(级数版)
deploy music / build-and-deploy (push) Successful in 1m54s
Details

Browse Source
This commit is contained in:
Fam Zheng
2026-05-10 16:09:56 +01:00
parent 5c0d860666
commit e5f3a95aa9
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/music/frontend/src/views/EditView.vue
+11 -4
View File
@@ -99,15 +99,16 @@
<h2>添加附件</h2>
<p class="hint-sub">
一次可选多个文件。video / audio / pdf / image 自动识别。
图片需要选 <b>角色</b>（吉他谱 / 简谱 / 五线谱），其它类型角色无效。
图片需要选 <b>角色</b>（和弦谱 / 简谱 / 五线谱），其它类型角色无效。
</p>
<div class="upload-row">
<label class="role-pick">
<span>角色</span>
<select v-model="uploadRole">
<option :value="null">— 自动 / 通用图 —</option>
<option value="chord">吉他谱</option>
<option value="numbered">简谱</option>
<option value="chord_letters">和弦谱（字母 G/Em/C）</option>
<option value="chord_functional">简谱（数字 1/4/5）</option>
<option value="numbered">简谱（手动上传）</option>
<option value="staff">五线谱</option>
</select>
</label>
@@ -336,7 +337,13 @@ function kindLabel(k) {
return ({ audio: '音频', video: '视频', pdf: 'PDF', image: '图片' })[k] || k
}
function roleLabel(r) {
return ({ chord: '吉他谱', numbered: '简谱', staff: '五线谱' })[r] || r
return ({
chord: '和弦谱',
chord_letters: '和弦谱',
chord_functional: '简谱',
numbered: '简谱',
staff: '五线谱',
})[r] || r
}
function fmtSize(b) {
if (b < 1024) return b + ' B'
apps/music/frontend/src/views/PlayerView.vue
+11 -12
View File
@@ -146,8 +146,8 @@
class="auto-fetch"
>
<p v-if="chordStateOf(activeTab) === 'idle'" class="hint-line">
<span v-if="activeTab === 'chord'">从 yopu.co 抓 <b>弹唱谱（字母 G/Em/C）</b>。</span>
<span v-else>从 yopu.co 抓 <b>功能谱（数字 1/4/5/6m）</b>。</span>
<span v-if="activeTab === 'chord'">从 yopu.co 抓 <b>和弦谱（字母 G/Em/C + 六线谱）</b>。</span>
<span v-else>从 yopu.co 抓 <b>简谱（数字 1/4/5/6m 级数）</b>。</span>
</p>
<p v-else-if="['pending','processing'].includes(chordStateOf(activeTab))" class="hint-line">
正在抓取，约 30-60s…
@@ -161,15 +161,15 @@
@click="startChordFetch(modeForTab(activeTab))"
>
<span v-if="['pending','processing'].includes(chordStateOf(activeTab))" class="spin">⏳</span>
<span v-else>🎸 自动抓取{{ activeTab === 'chord' ? '弹唱谱' : '功能谱' }}</span>
<span v-else>🎸 自动抓取{{ activeTab === 'chord' ? '和弦谱' : '简谱' }}</span>
</button>
</div>
</div>
<!-- 简谱 / 五线谱（手动上传的图） -->
<div v-show="['numbered', 'staff'].includes(activeTab)" class="sheet-box">
<!-- 五线谱（手动上传的图） -->
<div v-show="activeTab === 'staff'" class="sheet-box">
<img
v-for="att in roleAttachments(activeTab)"
v-for="att in roleAttachments('staff')"
:key="att.id"
:src="attachmentUrl(att.id)"
:alt="att.filename"
@@ -524,11 +524,12 @@ function roleAttachments(role) {
)
}
// chord 兼容：吉他谱 tab 显示历史 role='chord' + 新 role='chord_letters'；功能谱 tab 显示 role='chord_functional'
// 和弦谱 tab = 字母版 (chord_letters + 历史 chord)
// 简谱 tab = 数字级数版 (chord_functional) + 用户手动上传 numbered
function chordTabAttachments(tab) {
const set = tab === 'chord'
? new Set(['chord', 'chord_letters'])
: new Set(['chord_functional'])
: new Set(['chord_functional', 'numbered'])
return (selected.value?.attachments || []).filter(
a => a.kind === 'image' && set.has(a.role),
)
@@ -542,10 +543,8 @@ const tabs = computed(() => {
if (!selected.value) return []
const list = []
if (selected.value.lyrics) list.push({ key: 'lyrics', label: '歌词', count: 0 })
list.push({ key: 'chord', label: '吉他谱', count: chordTabAttachments('chord').length })
list.push({ key: 'functional', label: '功能谱', count: chordTabAttachments('functional').length })
const num = roleAttachments('numbered').length
if (num) list.push({ key: 'numbered', label: '简谱', count: num })
list.push({ key: 'chord', label: '和弦谱', count: chordTabAttachments('chord').length })
list.push({ key: 'functional', label: '简谱', count: chordTabAttachments('functional').length })
const staff = roleAttachments('staff').length
if (staff) list.push({ key: 'staff', label: '五线谱', count: staff })
if (pdfAttachments.value.length) list.push({ key: 'pdf', label: '乐谱 PDF', count: pdfAttachments.value.length })