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

osmd-extended

@@ -1 +1 @@
-Subproject commit 8646ea65db6520df8fe8d5d180d5c9dcf634e2b2
+Subproject commit 43dc4f3b6489924056a28b1c1c5a40771d150378

src/helpers/calcSpeed.ts

@@ -42,6 +42,7 @@ export const speedInfo: { [key in string]: number } = {
 	slowly: 1.333333333,
 	faster: 1.333333333,
 	"molto allargando": 1.333333333,
+	stringendo: 0.8,
 };
 
 /**

src/helpers/formateMusic.ts

@@ -850,7 +850,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 
 	let preNoteEndTime = 0; // 上一个音符的结束时间
 
-	let preNoteMeasureNumber = 0; // 上一个小节的number值
+	let preNoteMeasureNumber: any = null; // 上一个小节的number值
 
 	const _notes = [] as any[];
 	if (state.gradualTimes) {

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

@@ -107,6 +107,32 @@
         #cursorImg-0{
             // opacity: 0 !important;
         }
+        .noteActive {
+            path {
+                fill: #000000 !important;
+                stroke: #000000 !important;
+            }
+
+            rect {
+                stroke: #000000 !important;
+            }
+        }
+        .lyricActive {
+            text {
+                fill: #000000 !important;
+                stroke: #000000 !important;
+            }
+        }
+        .voiceActive {
+            rect {
+                fill: #000000 !important;
+                stroke: #000000 !important;
+            }
+        }
+        .rectActive {
+            fill: #000000 !important;
+            stroke: #000000 !important;
+        }        
    } 
 }
 

src/view/music-score/index.tsx

@@ -205,7 +205,7 @@ export default defineComponent({
 			const activeMeasureIndex = state.times[state.activeNoteIndex]?.measureListIndex || -1;
 			for (const [first, last] of state.gradual) {
 				if (first && last) {
-					// console.log('小节',first.measureIndex,last.measureIndex,activeMeasureIndex)
+					console.log('小节',first.measureIndex,last.measureIndex,activeMeasureIndex)
 					result = first.measureIndex <= activeMeasureIndex && activeMeasureIndex < last.measureIndex;
 					if (result) {
 						break;