|
@@ -402,9 +402,8 @@ export default defineComponent({
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- let musicSheetAccompanimentList = [];
|
|
|
if (state.bSongFile) {
|
|
|
- musicSheetAccompanimentList.push({
|
|
|
+ forms.musicSheetAccompanimentList.push({
|
|
|
musicSheetId: props.data.id,
|
|
|
audioFileUrl: state.bSongFile,
|
|
|
audioPlayType: 'SING'
|
|
@@ -844,13 +843,14 @@ export default defineComponent({
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList ? data.musicSheetAccompanimentList : []
|
|
|
- forms.musicSheetAccompanimentList.forEach((next: any) => {
|
|
|
+ let musicSheetAccompanimentList = data.musicSheetAccompanimentList ? data.musicSheetAccompanimentList : []
|
|
|
+ musicSheetAccompanimentList.forEach((next: any) => {
|
|
|
let audioPlayType = next.audioPlayType;
|
|
|
if (audioPlayType && audioPlayType == 'SING') {
|
|
|
state.bSongFile = next.audioFileUrl;
|
|
|
} else {
|
|
|
state.musicSheetAccompanimentUrlList.push(next.audioFileUrl)
|
|
|
+ forms.musicSheetAccompanimentList.push(next)
|
|
|
}
|
|
|
})
|
|
|
|
|
@@ -864,6 +864,7 @@ export default defineComponent({
|
|
|
for (let i = 0; i < state.musicSheetSoundList.length; i++) {
|
|
|
if (state.musicSheetSoundList[i].musicalInstrumentId == next) {
|
|
|
item.audioFileUrl = state.musicSheetSoundList[i].audioFileUrl
|
|
|
+ forms.multiInstrumentSelection.push(next)
|
|
|
break
|
|
|
}
|
|
|
}
|
|
@@ -1495,9 +1496,10 @@ export default defineComponent({
|
|
|
state.musicSheetAccompanimentUrlList = state.musicSheetAccompanimentUrls?.split(',').filter(Boolean)
|
|
|
|
|
|
// 清除伴奏
|
|
|
- forms.musicSheetAccompanimentList = forms.musicSheetAccompanimentList.filter((next: any) => {
|
|
|
- return next.audioPlayType == 'SING'
|
|
|
- })
|
|
|
+ // forms.musicSheetAccompanimentList = forms.musicSheetAccompanimentList.filter((next: any) => {
|
|
|
+ // return next.audioPlayType == 'SING'
|
|
|
+ // })
|
|
|
+ forms.musicSheetAccompanimentList = []
|
|
|
for (let i = 0; i < state.musicSheetAccompanimentUrlList.length; i++) {
|
|
|
forms.musicSheetAccompanimentList.push({
|
|
|
audioFileUrl: state.musicSheetAccompanimentUrlList[i],
|