Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/state.ts

@@ -1836,6 +1836,8 @@ export const fillWordColor = () => {
     stemEl?.classList.remove('noteActive')
     // stemLine?.classList.remove('noteActive')
     svgEl?.parentElement?.classList.remove('voiceActive')
+    const si = state.times[prevActiveNoteIndex].si || 0;
+    svgEl?.parentElement?.querySelectorAll('rect')?.[si]?.classList.remove('rectActive');
   }
   const activeNoteId = state.times[state.activeNoteIndex]?.svgElement?.attrs?.id
   const svgEl = document.getElementById(`vf-${activeNoteId}`)
@@ -1849,7 +1851,13 @@ export const fillWordColor = () => {
     // const parentVoice = svgEl?.parentElement;
     // 简谱模式下，二分音符和全音符才显示音符右侧的"-"
     if (state.times[state.activeNoteIndex].noteElement?.length?.realValue >= 0.5) {
-      svgEl?.parentElement?.classList.add('voiceActive');
+      // 如果是二分音符，只亮该音符后面那个"-"，本小节其它的"-"不亮
+      if (state.times[state.activeNoteIndex].noteElement?.length?.realValue === 0.5) {
+        const si = state.times[state.activeNoteIndex].si || 0;
+        svgEl?.parentElement?.querySelectorAll('rect')[si].classList.add('rectActive');
+      } else {
+        svgEl?.parentElement?.classList.add('voiceActive');
+      }
     }
   }
   prevActiveNoteIndex = state.activeNoteIndex

src/view/music-score/index.module.less

@@ -52,6 +52,10 @@
             stroke: #FFC121;
         }
     }
+    .rectActive {
+        fill: #FFC121;
+        stroke: #FFC121;
+    }
     .vf-numbered_note_lines {
         rect {
             fill: #FFFFFF;