Merge branch 'feature-tianyong' into gym-test

src/helpers/customMusicScore.ts

@@ -698,6 +698,11 @@ const transSinglePage = () => {
 			needTransTop = Math.min(maxTop, needTransTop)
 			// @ts-ignore
 			document.getElementById('osmdSvgPage1').style.transform = `translateY(-${needTransTop}px)`;
+			// 一行谱需要同时偏移光标的位置
+			const cursorDom = document.getElementById('cursorImg-0') || null;
+			if (cursorDom) {
+				cursorDom.style.transform = state.musicRenderType === 'staff' ? `translate(11Px, -${needTransTop}px)` : `translate(6.3Px, -${needTransTop}px)`;
+			}
 			// document.querySelector('.staffline').style.transform = `translateY(-${needTransTop}px)`;
 			// const musicLine =  document.querySelector('.staffline').querySelector('.vf-measure').querySelector('.vf-custom-bg').getBoundingClientRect();
 			// const needTransDistance = svgPage.height / 2 - (musicLine.top - svgPage.top)
@@ -713,6 +718,12 @@ const transSinglePage = () => {
 			const needY = svgPage.height - (staffLine.y+staffLine.height) - 10;
 			// @ts-ignore
 			document.getElementById('osmdSvgPage1').style.transform = `translateY(${needY}px)`;
+			// 一行谱需要同时偏移光标的位置
+			const cursorDom = document.getElementById('cursorImg-0') || null;
+			if (cursorDom) {
+				cursorDom.style.transform = state.musicRenderType === 'staff' ? `translate(6Px, ${needY}px)` : `translate(6.3Px, ${needY}px)`;
+				console.log('一行谱11111')
+			}
 		}
 	}
 }

src/page-instrument/simple-detail/index.module.less

@@ -46,7 +46,7 @@ body {
         }
         #cursorImg-0 {
             margin-top: -20PX !important;
-            transform: translateX(6PX) !important;
+            // transform: translateX(6PX) !important;
         }
     }
 }

src/page-instrument/view-detail/index.module.less

@@ -129,7 +129,7 @@
     .jianpuTone {
         #cursorImg-0 {
             width: 18Px;
-            transform: translateX(6.3Px) !important;
+            transform: translateX(6.3Px);
         }
     }