修改

public/osmd/index.html

@@ -19,9 +19,9 @@
       overflow: hidden;
     }
 
-    .vf-text {
+    /* .vf-text {
       display: none;
-    }
+    } */
 
     #cursorImg-0 {
       display: none;
@@ -54,23 +54,12 @@
     });
     osmd.EngravingRules.RenderMultipleRestMeasures = true;
     osmd.EngravingRules.CompactMode = true;
-    osmd.EngravingRules.PageTopMarginNarrow = 5.0; // for compact mode
+    osmd.EngravingRules.PageTopMarginNarrow = 6.0; // for compact mode
     osmd.EngravingRules.PageBottomMargin = 15.0;
     osmd.EngravingRules.PageLeftMargin = 1.0
     osmd.EngravingRules.PageRightMargin = 1.0
 
-
-
-    // osmd.EngravingRules.DYMusicScoreType =
-    //     state.musicRenderType === EnumMusicRenderType.staff ? "staff" : "jianpu";
-    //   // 如果为固定调,需要加入全局
-    //   if (state.musicRenderType === EnumMusicRenderType.fixedTone) {
-    //     window.sett = {
-    //       keySignature: true,
-    //     };
-    //   }
-    // debugger
-    // console.log('osmd.EngravingRules')
+    // console.log('osmd.EngravingRules', osmd.EngravingRules)
     // osmd.EngravingRules.StaffDistance = 1.0;
     // osmd.EngravingRules.BetweenStaffDistance = 1.0;
     // osmd.EngravingRules.MinimumStaffLineDistance = 1.0;

src/views/accompany/instrument.ts

@@ -100,69 +100,69 @@ export const onlyVisible = (xml: string, partIndex: number): string => {
           }
         });
         /** word比较特殊需要精确到note位置 */
-        words.forEach((word) => {
-          let text = word.textContent || "";
-          text = ["cresc."].includes(text) ? "" : text;
-          if ((isSpecialMark(text) || isSpeedKeyword(text) || isGradientWords(text) || isRepeatWord(text) || GRADIENT_SPEED_RESET_TAG) && text) {
-            const wordContainer = word.parentElement?.parentElement;
-            const parentMeasure = wordContainer?.parentElement;
-            const measureWords = [...(parentMeasure?.childNodes || [])];
-            const wordIndex = wordContainer ? measureWords.indexOf(wordContainer) : -1;
-            if (wordContainer && parentMeasure && wordIndex > -1) {
-              const index = firstMeasures.indexOf(parentMeasure);
-              const activeMeasure = part.getElementsByTagName("measure")[index];
-              // 找当前小节是否包含word标签
-              const _words: any = Array.from(activeMeasure?.getElementsByTagName("words") || []);
-              // 遍历word标签,检查是否和第一小节重复,如果有重复则不平移word
-              const total = _words.reduce((total: any, _word) => {
-                if (_word.textContent?.includes(text)) {
-                  total++;
-                }
-                return total;
-              }, 0);
-              if (total === 0) {
-                setElementNoteBefore(wordContainer, parentMeasure, activeMeasure);
+        // words.forEach((word) => {
+        //   let text = word.textContent || "";
+        //   text = ["cresc."].includes(text) ? "" : text;
+        //   if ((isSpecialMark(text) || isSpeedKeyword(text) || isGradientWords(text) || isRepeatWord(text) || GRADIENT_SPEED_RESET_TAG) && text) {
+        //     const wordContainer = word.parentElement?.parentElement;
+        //     const parentMeasure = wordContainer?.parentElement;
+        //     const measureWords = [...(parentMeasure?.childNodes || [])];
+        //     const wordIndex = wordContainer ? measureWords.indexOf(wordContainer) : -1;
+        //     if (wordContainer && parentMeasure && wordIndex > -1) {
+        //       const index = firstMeasures.indexOf(parentMeasure);
+        //       const activeMeasure = part.getElementsByTagName("measure")[index];
+        //       // 找当前小节是否包含word标签
+        //       const _words: any = Array.from(activeMeasure?.getElementsByTagName("words") || []);
+        //       // 遍历word标签,检查是否和第一小节重复,如果有重复则不平移word
+        //       const total = _words.reduce((total: any, _word) => {
+        //         if (_word.textContent?.includes(text)) {
+        //           total++;
+        //         }
+        //         return total;
+        //       }, 0);
+        //       if (total === 0) {
+        //         setElementNoteBefore(wordContainer, parentMeasure, activeMeasure);
 
-              }
-            }
-          }
-        });
+        //       }
+        //     }
+        //   }
+        // });
         /** word比较特殊需要精确到note位置 */
-        codas.forEach((coda) => {
-          const wordContainer = coda.parentElement?.parentElement;
-          const parentMeasure = wordContainer?.parentElement;
-          const measureWords = [...(parentMeasure?.childNodes || [])];
-          const wordIndex = wordContainer ? measureWords.indexOf(wordContainer) : -1;
-          if (wordContainer && parentMeasure && wordIndex > -1) {
-            const index = firstMeasures.indexOf(parentMeasure);
-            const activeMeasure = part.getElementsByTagName("measure")[index];
+        // codas.forEach((coda) => {
+        //   const wordContainer = coda.parentElement?.parentElement;
+        //   const parentMeasure = wordContainer?.parentElement;
+        //   const measureWords = [...(parentMeasure?.childNodes || [])];
+        //   const wordIndex = wordContainer ? measureWords.indexOf(wordContainer) : -1;
+        //   if (wordContainer && parentMeasure && wordIndex > -1) {
+        //     const index = firstMeasures.indexOf(parentMeasure);
+        //     const activeMeasure = part.getElementsByTagName("measure")[index];
 
-            setElementNoteBefore(wordContainer, parentMeasure, activeMeasure);
+        //     setElementNoteBefore(wordContainer, parentMeasure, activeMeasure);
 
-          }
-        });
-        rehearsals.forEach((rehearsal) => {
-          const container = rehearsal.parentElement?.parentElement;
-          const parentMeasure = container?.parentElement;
-          // console.log(rehearsal)
-          if (parentMeasure) {
-            const index = firstMeasures.indexOf(parentMeasure);
-            part.getElementsByTagName("measure")[index]?.appendChild(container.cloneNode(true));
-            // console.log(index, parentMeasure, firstMeasures.indexOf(parentMeasure))
-          }
-        });
+        //   }
+        // });
+        // rehearsals.forEach((rehearsal) => {
+        //   const container = rehearsal.parentElement?.parentElement;
+        //   const parentMeasure = container?.parentElement;
+        //   // console.log(rehearsal)
+        //   if (parentMeasure) {
+        //     const index = firstMeasures.indexOf(parentMeasure);
+        //     part.getElementsByTagName("measure")[index]?.appendChild(container.cloneNode(true));
+        //     // console.log(index, parentMeasure, firstMeasures.indexOf(parentMeasure))
+        //   }
+        // });
       } else {
-        words.forEach((word) => {
-          const text = word.textContent || "";
-          if (isSpeedKeyword(text) && text) {
-            const wordContainer = word.parentElement?.parentElement?.parentElement;
-            if (wordContainer && wordContainer.firstElementChild && wordContainer.firstElementChild !== word) {
-              const wordParent = word.parentElement?.parentElement;
-              const fisrt = wordContainer.firstElementChild;
-              wordContainer.insertBefore(wordParent, fisrt);
-            }
-          }
-        });
+        // words.forEach((word) => {
+        //   const text = word.textContent || "";
+        //   if (isSpeedKeyword(text) && text) {
+        //     const wordContainer = word.parentElement?.parentElement?.parentElement;
+        //     if (wordContainer && wordContainer.firstElementChild && wordContainer.firstElementChild !== word) {
+        //       const wordParent = word.parentElement?.parentElement;
+        //       const fisrt = wordContainer.firstElementChild;
+        //       wordContainer.insertBefore(wordParent, fisrt);
+        //     }
+        //   }
+        // });
       }
 
       // 最后一个小节的结束线元素不在最后 调整

src/views/accompany/music-detail.module.less

@@ -4,6 +4,12 @@
   min-height: 100vh;
   display: flex;
   flex-direction: column;
+
+  :global {
+    .plyr__controls .plyr__controls__item.plyr__progress__container {
+      padding-left: 6px;
+    }
+  }
 }