|
@@ -1395,6 +1395,9 @@ const getMusicInfo = async (res: any) => {
|
|
|
workRecordInstrumentId = res.data?.instrumentId
|
|
|
}
|
|
|
}
|
|
|
+ // multiTracksSelection 返回为空,默认代表全部分轨
|
|
|
+ state.canSelectTracks = res.data.multiTracksSelection === "null" || res.data.multiTracksSelection === "" || res.data.multiTracksSelection === null ? [] : res.data.multiTracksSelection?.split(',');
|
|
|
+ state.canSelectTracks = state.canSelectTracks.map((item: any)=>item.trim())
|
|
|
/* 获取声轨列表 */
|
|
|
let xmlString = await fetch(res.data.xmlFileUrl).then((response) => response.text());
|
|
|
xmlString = xmlAddPartName(xmlString);
|
|
@@ -1464,7 +1467,6 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
|
|
|
if(state.isScoreRender && (partIndex===999 || (state.defaultScoreRender && partIndex===-1))){
|
|
|
// 总谱渲染
|
|
|
state.isCombineRender = true
|
|
|
- state.partListNames = tracks
|
|
|
banSongObj = musicSheetAccompanimentList.find((item: any) => {
|
|
|
return item.audioPlayType === "SING"
|
|
|
})
|
|
@@ -1484,8 +1486,8 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
|
|
|
index = 999
|
|
|
musicalInstrumentId = ''
|
|
|
}else{
|
|
|
- // 合奏只显示一个声轨
|
|
|
- track = tracks[partIndex===-1?0:partIndex]
|
|
|
+ // 合奏只显示一个声轨 当为-1时候,取tracks中 后端勾选了的第一个值
|
|
|
+ track = partIndex === -1 ? tracks.find(value => state.canSelectTracks.includes(value))! : tracks[partIndex]
|
|
|
// 根据当前的声轨 取数据
|
|
|
musicObj = musicSheetSoundList.find((item: any) => {
|
|
|
return item.audioPlayType === "PLAY" && item.track === track
|
|
@@ -1504,6 +1506,7 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
|
|
|
})
|
|
|
musicalInstrumentId = musicObj?.musicalInstrumentId
|
|
|
}
|
|
|
+ state.partListNames = tracks
|
|
|
}
|
|
|
// 当没有任何曲目的时候报错
|
|
|
if (!musicObj?.audioFileUrl && !accompanyObj?.audioFileUrl && !fanSongObj?.audioFileUrl && !banSongObj?.audioFileUrl && !fanSongObj?.solmizationFileUrl && !fanSongObj?.femaleSolmizationFileUrl) {
|
|
@@ -1680,9 +1683,6 @@ const setState = (data: any, index: number) => {
|
|
|
state.enableEvaluation = state.accompany || state.music ? true : false
|
|
|
}
|
|
|
state.isConcert = data.musicSheetType === "CONCERT" ? true : false;
|
|
|
- // multiTracksSelection 返回为空,默认代表全部分轨
|
|
|
- state.canSelectTracks = data.multiTracksSelection === "null" || data.multiTracksSelection === "" || data.multiTracksSelection === null ? [] : data.multiTracksSelection?.split(',');
|
|
|
- state.canSelectTracks = state.canSelectTracks.map((item: any)=>item.trim())
|
|
|
// 开启预备小节
|
|
|
state.isOpenPrepare = true;
|
|
|
state.extStyleConfigJson = data.extStyleConfigJson || {}
|