Merge branch 'hqyDevNewVersion' of http://git.dayaedu.com/liushengqiang/music-score into feature-tianyong-newVersion

src/page-instrument/simple-detail/index.tsx

@@ -45,7 +45,7 @@ export default defineComponent({
 				console.log('拖动的进度')
 				if (state.playState === 'paused') {
 					detailData.currentTime = resInfo?.content?.currentTime ? resInfo?.content?.currentTime : detailData.currentTime;
-					handlePlaying();
+					handlePlaying(true);
 				}
 			}
 			// 播放进度
@@ -126,13 +126,13 @@ export default defineComponent({
 		/**
 		 * 播放一直触发的事件
 		 */
-		const handlePlaying = () => {
+		const handlePlaying = (skipNote?: boolean) => {
 			//detailData.currentTime += 0.03
 			const currentTime = detailData.currentTime;
 			// console.log('👀～播放进度',currentTime)
 			let item = getNote(currentTime);
 			if (item) {
-				gotoNext(item);
+				gotoNext(item, skipNote);
 			}
 			state.activeNoteIndex = item?.i || 0
 			// 一行谱，需要滚动小节

src/view/music-score/index.tsx

@@ -138,7 +138,11 @@ export default defineComponent({
 			osmd.EngravingRules.DYMusicScoreId = state.examSongId || ''
 			osmd.EngravingRules.DYCustomRepeatCount = state.maxLyricNum || 0;
 			await osmd.load(musicData.score);
-			osmd.zoom = state.isSimplePage ? 0.6 : state.zoom;
+			// 对外暴露 一行谱时候 缩小谱面
+			if(state.isSimplePage){
+				state.zoom = 0.6
+			}
+			osmd.zoom = state.zoom;
 			osmd.render();
 			console.log("🚀 ~ osmd:", osmd)
 			emit("rendered", osmd);