|
@@ -296,7 +296,6 @@ export default defineComponent({
|
|
const arr = musics.forEach((item: any) => {
|
|
const arr = musics.forEach((item: any) => {
|
|
list.push({'name': item.name,'code': item.code})
|
|
list.push({'name': item.name,'code': item.code})
|
|
})
|
|
})
|
|
- console.log(999,list)
|
|
|
|
}
|
|
}
|
|
if (musics && musics.length > 1) {
|
|
if (musics && musics.length > 1) {
|
|
return true;
|
|
return true;
|
|
@@ -346,9 +345,18 @@ export default defineComponent({
|
|
// 解析xml,获取分轨信息
|
|
// 解析xml,获取分轨信息
|
|
const analyzeXml = async () => {
|
|
const analyzeXml = async () => {
|
|
const details = data.musics[data.musicIndex];
|
|
const details = data.musics[data.musicIndex];
|
|
- if (details.xmlFileUrl) {
|
|
|
|
- const res = await fetch(details.xmlFileUrl).then((response) => response.text());
|
|
|
|
- filterTracks(res)
|
|
|
|
|
|
+ if (details.musicalInstruments?.length > 1) {
|
|
|
|
+ if (details.xmlFileUrl) {
|
|
|
|
+ const res = await fetch(details.xmlFileUrl).then((response) => response.text());
|
|
|
|
+ filterTracks(res)
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ // showMusicImg: 'first' as 'staff' | 'first' | 'fixed',
|
|
|
|
+ const { defaultScore, transferFlag } = details.musicalInstruments[0] || {}
|
|
|
|
+ let musicImgType: 'staff' | 'first' | 'fixed' = 'staff';
|
|
|
|
+ musicImgType = defaultScore === 'STAVE' ? 'staff' : defaultScore === 'JIAN' ? 'fixed' : defaultScore === 'FIRST' ? 'first' : 'staff'
|
|
|
|
+ data.showMusicImg = musicImgType
|
|
|
|
+ data.showTransBtn = transferFlag
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -383,11 +391,11 @@ export default defineComponent({
|
|
data.trackList = arr;
|
|
data.trackList = arr;
|
|
let track = arr.find((item: any) => item.value === data.selectMusicInstrumentIndex)?.track
|
|
let track = arr.find((item: any) => item.value === data.selectMusicInstrumentIndex)?.track
|
|
track = track.replace(/[0-9]+/g,"").replace(/\s/g, '').toLocaleLowerCase()
|
|
track = track.replace(/[0-9]+/g,"").replace(/\s/g, '').toLocaleLowerCase()
|
|
- let musicRenderType: 'staff' | 'first' | 'fixed' = 'first'
|
|
|
|
|
|
+ let musicRenderType: 'staff' | 'first' | 'fixed' = 'staff'
|
|
let canTrans = true;
|
|
let canTrans = true;
|
|
data.musics[data.musicIndex]?.musicalInstruments.forEach((item: any) => {
|
|
data.musics[data.musicIndex]?.musicalInstruments.forEach((item: any) => {
|
|
if (item.code.toLocaleLowerCase() === track) {
|
|
if (item.code.toLocaleLowerCase() === track) {
|
|
- musicRenderType = item.defaultScore === 'STAVE' ? 'staff' : item.defaultScore === 'JIAN' ? 'fixed' : item.defaultScore === 'FIRST' ? 'first' : 'first'
|
|
|
|
|
|
+ musicRenderType = item.defaultScore === 'STAVE' ? 'staff' : item.defaultScore === 'JIAN' ? 'fixed' : item.defaultScore === 'FIRST' ? 'first' : 'staff'
|
|
canTrans = item.transferFlag
|
|
canTrans = item.transferFlag
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -701,6 +709,7 @@ export default defineComponent({
|
|
actions={_actions.value}
|
|
actions={_actions.value}
|
|
placement="top-start"
|
|
placement="top-start"
|
|
onSelect={(item: any) => {
|
|
onSelect={(item: any) => {
|
|
|
|
+ console.log(9999,item)
|
|
data.showMusicImg = item.value;
|
|
data.showMusicImg = item.value;
|
|
data.popoverShow = false;
|
|
data.popoverShow = false;
|
|
musicIframeLoad();
|
|
musicIframeLoad();
|
|
@@ -776,7 +785,8 @@ export default defineComponent({
|
|
}}
|
|
}}
|
|
/>
|
|
/>
|
|
</Popup>
|
|
</Popup>
|
|
-
|
|
|
|
|
|
+ {
|
|
|
|
+ data.showChangeVoice &&
|
|
<Popup
|
|
<Popup
|
|
class="popup-custom van-scale"
|
|
class="popup-custom van-scale"
|
|
transition="van-scale"
|
|
transition="van-scale"
|
|
@@ -796,6 +806,7 @@ export default defineComponent({
|
|
}}
|
|
}}
|
|
/>
|
|
/>
|
|
</Popup>
|
|
</Popup>
|
|
|
|
+ }
|
|
</div>
|
|
</div>
|
|
);
|
|
);
|
|
}
|
|
}
|