|
@@ -1566,9 +1566,31 @@ export const moveSvgDom = (skipNote?: boolean) => {
|
|
watch(
|
|
watch(
|
|
() => state.activeMeasureIndex,
|
|
() => state.activeMeasureIndex,
|
|
() => {
|
|
() => {
|
|
- console.log('当前小节',state.activeMeasureIndex)
|
|
|
|
|
|
+ // 需要减去的合并小节数
|
|
|
|
+ let needReduceMultipleRestNum = 0;
|
|
|
|
+ for(let noteIndex = 0; noteIndex < state.times.length; noteIndex++){
|
|
|
|
+ const note = state.times[noteIndex];
|
|
|
|
+ if (note.MeasureNumberXML > state.activeMeasureIndex) {
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ if (note.multipleRestMeasures) {
|
|
|
|
+ // if (note.multipleRestMeasures < note.totalMultipleRestMeasures) {
|
|
|
|
+ // needReduceMultipleRestNum += note.MeasureNumberXML - note.multipleRestMeasures + 1;
|
|
|
|
+ // } else {
|
|
|
|
+ // needReduceMultipleRestNum += note.totalMultipleRestMeasures - 1;
|
|
|
|
+ // }
|
|
|
|
+ // needReduceMultipleRestNum += note.MeasureNumberXML - note.multipleRestMeasures + 1;
|
|
|
|
+ needReduceMultipleRestNum += 1;
|
|
|
|
+ }
|
|
|
|
+ // if (note.multipleRestMeasures === 0 && state.times[noteIndex-1]?.multipleRestMeasures) {
|
|
|
|
+ // needReduceMultipleRestNum += state.times[noteIndex-1]?.multipleRestMeasures
|
|
|
|
+ // }
|
|
|
|
+ }
|
|
|
|
+ needReduceMultipleRestNum = needReduceMultipleRestNum >= 0 ? needReduceMultipleRestNum : 0;
|
|
|
|
+ const matchMeasureNum = state.activeMeasureIndex - needReduceMultipleRestNum
|
|
|
|
+ console.log('选中的小节',matchMeasureNum,'需要减去的小节',needReduceMultipleRestNum,'当前的小节',state.activeMeasureIndex)
|
|
state.vfmeasures.forEach((item: any, idx: number) => {
|
|
state.vfmeasures.forEach((item: any, idx: number) => {
|
|
- if (idx === (state.activeMeasureIndex-1)) {
|
|
|
|
|
|
+ if (idx === matchMeasureNum) {
|
|
item.querySelector('.vf-custom-bg')?.setAttribute("fill", "#132D4C")
|
|
item.querySelector('.vf-custom-bg')?.setAttribute("fill", "#132D4C")
|
|
item.querySelector('.vf-custom-bot')?.setAttribute("fill", "#040D1E")
|
|
item.querySelector('.vf-custom-bot')?.setAttribute("fill", "#040D1E")
|
|
} else {
|
|
} else {
|