Browse Source

#8609,#8610,#8611 bug修复

TIANYONG 1 year ago
parent
commit
b8f505ea79

+ 2 - 2
src/helpers/metronome.ts

@@ -48,7 +48,7 @@ watch(
 				default:
 					break;
 			}
-			hideCursorTip()
+			// hideCursorTip()
 		}
 	}
 );
@@ -210,7 +210,7 @@ class Metronome {
 				}
 			}
 		}
-		// console.log(measures, measures.length);
+		console.log(measures, measures.length,6667);
 
 		let metroList: number[] = [];
 		const metroMeasure: any[] = [];

File diff suppressed because it is too large
+ 1098 - 1048
src/pages/detail/helpers.ts


+ 1 - 0
src/pages/detail/section-box/index.tsx

@@ -276,6 +276,7 @@ export default defineComponent({
           let boundingBox = null
           // let measureBg = false
           const activeNumberIndex = (item?.noteElement?.sourceMeasure?.measureNumber + 1) || -2;
+          // console.log(activeNumberIndex,'👀👀',metronomeData.activeMetro?.measureNumberXML)
           if (item.si === 0) {
             boundingBox = this.getBoundingBoxByNote(item.noteElement)
           }

+ 23 - 18
src/subpages/colexiu/buttons/index.module.less

@@ -96,30 +96,35 @@
       margin-bottom: 1px;
     }
   }
-  .botton-tips {
-    position: absolute;
-    left: -20PX;
-    bottom: -24PX;
-    background: rgba(33, 33, 33, 0.56);
-    font-size: 14PX;
-    font-weight: 500;
-    color: #FFFFFF;
-    padding: 3PX 10PX;
-    word-break: keep-all;
-    z-index: 1;
-    border-radius: 20PX;
-    &::before {
-      content: "";
+  .iconContent {
+    position: relative;
+    .arrowIcon {
       position: absolute;
-      left: 48PX;
-      top: -8PX;
+      left: 50%;
+      top: 14PX;
+      transform: translateX(-8PX);
       width: 0;
       height: 0;
       border-bottom: 8PX solid rgba(33, 33, 33, 0.56);
       border-right: 8PX solid transparent;
-      border-left: 8PX solid transparent;      
+      border-left: 8PX solid transparent;  
+      z-index: 2;      
     }
-  }    
+    .botton-tips {
+      position: absolute;
+      left: -30PX;
+      top: 22PX;
+      background: rgba(33, 33, 33, 0.56);
+      font-size: 14PX;
+      font-weight: 500;
+      color: #FFFFFF;
+      padding: 3PX 10PX;
+      word-break: keep-all;
+      z-index: 1;
+      border-radius: 20PX;
+      z-index: 9;
+    }  
+  }
 }
 .evaluatBtn {
   width: 54px;

+ 7 - 2
src/subpages/colexiu/buttons/index.tsx

@@ -276,8 +276,13 @@ export default defineComponent({
                 }}
               >
                 <ButtonIcon key="modelType" name={metronomeData.cursorMode === 1 ? 'cursor-icon-1' : metronomeData.cursorMode === 2 ? 'cursor-icon-2' : metronomeData.cursorMode === 3 ? 'cursor-icon-3' : ''} />
-                <span>{metronomeData.cursorMode === 1 ? '音符指针' : metronomeData.cursorMode === 2 ? '节拍指针' : metronomeData.cursorMode === 3 ? '关闭指针' : ''}</span>
-                {metronomeData.cursorTips && <div class={classNames(styles['botton-tips'])}>{metronomeData.cursorTips}</div>}
+                <span class={styles.iconContent}>
+                  {metronomeData.cursorMode === 1 ? '音符指针' : metronomeData.cursorMode === 2 ? '节拍指针' : metronomeData.cursorMode === 3 ? '关闭指针' : ''}
+                  {metronomeData.cursorTips && <>
+                    <i class={styles.arrowIcon}></i>
+                    <div class={classNames(styles['botton-tips'])}>{metronomeData.cursorTips}</div>
+                  </>}
+                </span>
               </Button>            
             </>             
             {detailState.initRendered && !search.lessonTrainingId && !search.questionId &&  detailState.activeDetail?.musicSheetType == 'CONCERT' && (

Some files were not shown because too many files changed in this diff