|
@@ -236,12 +236,22 @@ export const getAllNodes = (osmd: any) => {
|
|
if (state.isCombineRender) {
|
|
if (state.isCombineRender) {
|
|
for (let index = 0; index < iterator.currentVoiceEntries.length; index++) {
|
|
for (let index = 0; index < iterator.currentVoiceEntries.length; index++) {
|
|
const element = iterator.currentVoiceEntries[index];
|
|
const element = iterator.currentVoiceEntries[index];
|
|
|
|
+ /**
|
|
|
|
+ * 曲谱:合奏2-14,1752154261147389954,跳过倚音
|
|
|
|
+ */
|
|
|
|
+ if (element.isGrace) {
|
|
|
|
+ if (minIndex == index && minIndex == 0) {
|
|
|
|
+ minIndex = iterator.currentVoiceEntries.length > 1 ? 1 : 0
|
|
|
|
+ }
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
if (element.notes[0].length.realValue < elRealValue) {
|
|
if (element.notes[0].length.realValue < elRealValue) {
|
|
minIndex = index
|
|
minIndex = index
|
|
}
|
|
}
|
|
elRealValue = element.notes[0].length.realValue
|
|
elRealValue = element.notes[0].length.realValue
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
let voiceEntries = iterator.currentVoiceEntries?.[0] ? [iterator.currentVoiceEntries?.[0]] : []
|
|
let voiceEntries = iterator.currentVoiceEntries?.[0] ? [iterator.currentVoiceEntries?.[0]] : []
|
|
const voiceEntries2 = iterator.currentVoiceEntries?.[1]
|
|
const voiceEntries2 = iterator.currentVoiceEntries?.[1]
|
|
if (state.isCombineRender) {
|
|
if (state.isCombineRender) {
|
|
@@ -513,7 +523,7 @@ export const getAllNodes = (osmd: any) => {
|
|
NoteToGraphicalNoteObjectId: note.NoteToGraphicalNoteObjectId,
|
|
NoteToGraphicalNoteObjectId: note.NoteToGraphicalNoteObjectId,
|
|
cursorBox,
|
|
cursorBox,
|
|
skipNextNote,
|
|
skipNextNote,
|
|
- measureNumberPrinted,
|
|
|
|
|
|
+ measureNumberPrinted, // 当前小节数(从1开始)
|
|
difftime,
|
|
difftime,
|
|
octaveOffset: activeVerticalMeasureList[0]?.octaveOffset,
|
|
octaveOffset: activeVerticalMeasureList[0]?.octaveOffset,
|
|
frequency: note.pitch?.frequency,
|
|
frequency: note.pitch?.frequency,
|