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

src/helpers/customMusicScore.ts

@@ -630,7 +630,10 @@ const transSinglePage = () => {
 			// 需要上移的距离
 			// console.log('need',svgPage.height,staffLine.height)
 			const rate = svgPage.height > 400 ? 1.2 : 2;
-			const needTransTop = (svgPage.height - staffLine.height) / rate;
+			let needTransTop = (svgPage.height - staffLine.height) / rate;
+			// 给个安全距离
+			const maxTop = staffLine.top - svgPage.top - 40
+			needTransTop = Math.min(maxTop, needTransTop)
 			// @ts-ignore
 			document.getElementById('osmdSvgPage1').style.transform = `translateY(-${needTransTop}px)`;
 			// document.querySelector('.staffline').style.transform = `translateY(-${needTransTop}px)`;

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

@@ -77,10 +77,10 @@ export const headTopData = reactive({
         return;
       }
       // 评测模式，只有一行谱模式
-      if (!state.isSingleLine) {
-        state.isSingleLine = true;
-        refreshMusicSvg();
-      }
+      // if (!state.isSingleLine) {
+      //   state.isSingleLine = true;
+      //   refreshMusicSvg();
+      // }
       smoothAnimationState.isShow.value = false; // 隐藏旋律线
       state.playIngSpeed = state.originSpeed;
       handleStartEvaluat();

src/page-instrument/header-top/settting/index.tsx

@@ -202,7 +202,7 @@ export default defineComponent({
                         }
                         {/** 练习模式才有单行/多行谱切换功能，跟练、评测只有单行谱模式 */}
                         {
-                            state.modeType === 'practise' ? 
+                            ["practise", "evaluating"].includes(state.modeType) ? 
                             <div class={styles.cellBox}>
                                 <div class={styles.tit}>切换谱面</div>
                                 <div class={styles.radioBox}>

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

@@ -170,7 +170,7 @@ export default defineComponent({
         state.zoom = 0.7
       }
       // 只有总控平台和预览 默认是多行谱
-      (state.isPreView || query.isCbs) && (state.isSingleLine = false)
+      //(state.isPreView || query.isCbs) && (state.isSingleLine = false)
       // Promise.all([sysMusicScoreAccompanimentQueryPage(id)]).then((values) => {
       //   getMusicInfo(values[0]);
       // });

src/state.ts

@@ -512,7 +512,7 @@ const state = reactive({
   /** 音频文件是否加载完成 */
   audioDone: false,
   /** 是否为单行谱渲染模式 */
-  isSingleLine: true,
+  isSingleLine: false,
   /** 是否是evxml */
   isEvxml: false,
   noTimes: [] as any,

src/view/selection/index.tsx

@@ -300,11 +300,12 @@ export default defineComponent({
 						// 节拍线开关
 						// 当前小节
 						// 当前小节
-						const lineShow =
-							!state.isReport &&
-							metronomeData.cursorMode === 2 &&
-							item.MeasureNumberXML === metronomeData.activeMetro?.measureNumberXML &&
-							state.times[state.activeNoteIndex].MeasureNumberXML === item.MeasureNumberXML;
+						/* 节拍指针，现在没有节拍器指针了，但是以后要加上的话，这里需要性能优化。现在这样每次节拍指针更新都会刷新这里的虚拟dom */
+						// const lineShow =
+						// 	!state.isReport &&
+						// 	metronomeData.cursorMode === 2 &&
+						// 	item.MeasureNumberXML === metronomeData.activeMetro?.measureNumberXML &&
+						// 	state.times[state.activeNoteIndex].MeasureNumberXML === item.MeasureNumberXML;
 						return (
 							<>
 								{item.staveBox && (
@@ -318,7 +319,7 @@ export default defineComponent({
 										style={item.staveBox}
 										onClick={() => handleSelection(item)}
 									>
-										{lineShow && (
+										{/* {lineShow && (
 											<div style={{height: selectData.measureHeight + 'px', position: 'relative'}}>
 												<div 
 												class={[
@@ -328,7 +329,7 @@ export default defineComponent({
 												]} 
 												style={{ left: metronomeData.activeMetro.left }}></div>
 											</div>
-										)}
+										)} */}
 										{!state.isReport &&
 											!!item.multipleRestMeasures &&
 											<MultipleRestMeasures item = {item}></MultipleRestMeasures>