浏览代码

fix: #10345 bug修复

TIANYONG 1 年之前
父节点
当前提交
b08d62db69

+ 3 - 1
src/helpers/formateMusic.ts

@@ -1119,7 +1119,9 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 				const idx = noteIds.filter((item: any) => item === svgElement?.attrs.id)?.length || 0
 				const idx = noteIds.filter((item: any) => item === svgElement?.attrs.id)?.length || 0
 				evNoteStartTime = note?.noteTimeInfo[idx]?.begin
 				evNoteStartTime = note?.noteTimeInfo[idx]?.begin
 				evNoteEndTime = note?.noteTimeInfo[idx]?.end
 				evNoteEndTime = note?.noteTimeInfo[idx]?.end
-				relativeTime = evNoteStartTime - fixtime
+				if (evNoteStartTime) {
+					relativeTime = evNoteStartTime - fixtime
+				}
 				// usetime = evNoteStartTime - fixtime
 				// usetime = evNoteStartTime - fixtime
 			}
 			}
 			svgElement?.attrs.id && noteIds.push(svgElement?.attrs.id)
 			svgElement?.attrs.id && noteIds.push(svgElement?.attrs.id)

+ 1 - 1
src/page-instrument/header-top/index.tsx

@@ -514,7 +514,7 @@ export default defineComponent({
                       headData.speedShow = !headData.speedShow;
                       headData.speedShow = !headData.speedShow;
                     }}
                     }}
                   >
                   >
-                    <Badge class={styles.badge} content={state.playState === "play" ? state.playIngSpeed : state.speed}>
+                    <Badge class={styles.badge} content={state.playState === "play" ? Math.floor(state.playIngSpeed) : Math.floor(state.speed)}>
                       <img class={styles.iconBtn} src={headImg("icon_speed.svg")} />
                       <img class={styles.iconBtn} src={headImg("icon_speed.svg")} />
                     </Badge>
                     </Badge>
                     <span>速度</span>
                     <span>速度</span>

+ 7 - 6
src/page-instrument/header-top/speed/index.tsx

@@ -29,12 +29,13 @@ export default defineComponent({
 		watch(
 		watch(
 			() => speed.value,
 			() => speed.value,
 			() => {
 			() => {
-				if ( Math.abs(Number(speed.value) - Number(state.speed)) >= 1 ) {
-					speed.value = Math.floor(speed.value)
-					handleSetSpeed(speed.value);
-				} else {
-					speed.value = state.speed;
-				}
+				handleSetSpeed(speed.value);
+				// if ( Math.abs(Number(speed.value) - Number(state.speed)) >= 1 ) {
+				// 	speed.value = Math.floor(speed.value)
+				// 	handleSetSpeed(speed.value);
+				// } else {
+				// 	//speed.value = state.speed;
+				// }
 			}
 			}
 		);
 		);
 
 

+ 1 - 0
src/view/music-score/index.tsx

@@ -119,6 +119,7 @@ export default defineComponent({
 			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 9 : 10; // 老师端顶部间距
 			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 9 : 10; // 老师端顶部间距
 			osmd.EngravingRules.PageTopMarginNarrow = 3;
 			osmd.EngravingRules.PageTopMarginNarrow = 3;
 			osmd.EngravingRules.PageLeftMargin = 2;
 			osmd.EngravingRules.PageLeftMargin = 2;
+			osmd.EngravingRules.BreathMarkDistance = 0.1; // 呼吸标记距离音符的位置,百分比
 			// 老师端上课页面,左右两边有功能按钮,所以左右边距需要加大
 			// 老师端上课页面,左右两边有功能按钮,所以左右边距需要加大
 			// if (state.isAttendClass && state.platform === IPlatform.PC) {
 			// if (state.isAttendClass && state.platform === IPlatform.PC) {
 			// 	osmd.EngravingRules.PageLeftMargin = 7;
 			// 	osmd.EngravingRules.PageLeftMargin = 7;