Sfoglia il codice sorgente

feat: 声轨名称带空格处理

TIANYONG 5 mesi fa
parent
commit
4898f01d6f
2 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 2 2
      src/helpers/formateMusic.ts
  2. 2 2
      src/view/music-score/index.tsx

+ 2 - 2
src/helpers/formateMusic.ts

@@ -883,7 +883,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 		if (state.isCombineRender) {
 			iterator.currentVoiceEntries = iterator.currentVoiceEntries.filter((item: any) => {
 				const trackName = state.isEvxml && state.evxmlAddPartName ? item.parentVoice.parent.IdString || '' : item.parentVoice.parent.Name || '';
-				return trackName === firstTrackName
+				return trackName?.trim() === firstTrackName
 			});
 		}
 		let minIndex = 0, elRealValue = 0
@@ -1060,7 +1060,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			
 			// 合并展示某些分轨,需要把展示的分轨筛选出来
 			if (state.isCombineRender && note.sourceMeasure.verticalMeasureList.length) {
-				note.sourceMeasure.verticalMeasureList = note.sourceMeasure?.verticalMeasureList.filter((item: any) => state.canSelectTracks.includes(item?.parentStaff?.parentInstrument.Name))
+				note.sourceMeasure.verticalMeasureList = note.sourceMeasure?.verticalMeasureList.filter((item: any) => state.canSelectTracks.includes(item?.parentStaff?.parentInstrument.Name?.trim()))
 			}
 
 			activeVerticalMeasureList = [note.sourceMeasure?.verticalMeasureList?.[currentTrackIndex]] || [];

+ 2 - 2
src/view/music-score/index.tsx

@@ -88,7 +88,7 @@ export default defineComponent({
 			setGlobalMusicSheet();
 			if(!osmd){
 				osmd = new OpenSheetMusicDisplay(container, {
-					drawTitle: query.downPng === 'A4' ? true : false,
+					drawTitle: false,
 					drawSubtitle: false,
 					// drawMeasureNumbers: false,
 					autoResize: false,
@@ -169,7 +169,7 @@ export default defineComponent({
 				const canSelectTracks = state.combinePartIndexs.length > 1 ? state.combinePartIndexs.map(partIndex => { return state.partListNames[partIndex] }) : state.canSelectTracks
 				for (let i = 0; i < osmd.Sheet.Instruments.length; i++) {
 					const trackName = state.isEvxml && state.evxmlAddPartName ? osmd.Sheet.Instruments[i].idString || '' : osmd.Sheet.Instruments[i].Name || '';
-					osmd.Sheet.Instruments[i].Visible = canSelectTracks.includes(trackName)
+					osmd.Sheet.Instruments[i].Visible = canSelectTracks.includes(trackName.trim())
 				}
 			}
 			if (query.downPng === 'A4') {