Merge branch 'feature-tianyong' of http://git.dayaedu.com/tianyong/gym-music-score into hqy声部播放

osmd-extended

@@ -1 +1 @@
-Subproject commit 2692703cac7823ace1b04e8923c5eb4648d2b72e
+Subproject commit 95bbcad6abcccc18996d0303692417511fbb3f0d

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

@@ -84,7 +84,23 @@ export default defineComponent({
                                     <div class={styles.tit}>循环播放</div>
                                     <Switch v-model={state.setting.repeatAutoPlay}></Switch>
                                 </div>
-                        }                        
+                        }      
+                        {                      
+                            <div class={styles.cellBox}>
+                                <div class={styles.tit}>合并休止小节</div>
+                                <Switch 
+                                    v-model={state.setting.combineMultipleRest}
+                                    onChange={ async (value) => {
+                                        await checkMoveNoSave();
+                                        headTopData.settingMode = false
+                                        const _time = setTimeout(() => {
+                                            clearTimeout(_time)
+                                            refreshMusicSvg();
+                                        }, 100);
+                                    }}
+                                ></Switch>
+                            </div>
+                        }                                           
                         {/* {
                             state.isSingleLine && state.modeType === "practise" && !state.isCombineRender && !state.isPercussion && 
                                 <div class={styles.cellBox}>

src/state.ts

@@ -441,6 +441,8 @@ const state = reactive({
     reactionTimeMs: 0,
     /** 节拍器音量 */
     beatVolume: 50,
+    /** 合并休止小节 */
+    combineMultipleRest: true,
   },
   /** 后台设置的基准评测频率 */
   baseFrequency: 440,
@@ -1514,6 +1516,9 @@ function xmlToTracks(xmlString: string) {
   const partNames = Array.from(xmlParse.getElementsByTagName('part-name'));
   return partNames.reduce((arr: string[], item) => {
     const textContent = item?.textContent?.trim()
+    if (textContent?.toLocaleLowerCase() === "common") {
+      (window as any).HasCommonTrack = true;
+    }
     if (textContent != "COMMON" && textContent != "common" && textContent) {
       arr.push(textContent)
     }

src/view/music-score/index.tsx

@@ -97,7 +97,6 @@ export default defineComponent({
 					drawComposer: false, // 渲染作词家
 					// pageBackgroundColor: '#609FCF',
 					// autoGenerateMultipleRestMeasuresFromRestMeasures: state.isSingleLine ? false : true, // 连续休止小节是否合并显示
-					autoGenerateMultipleRestMeasuresFromRestMeasures: true,
 					// darkMode: true, // 暗黑模式
 					// pageFormat: 'A4_P',
 					// autoBeam: true,
@@ -115,7 +114,8 @@ export default defineComponent({
 				drawLyrics: (((!state.accompany && !state.music ) || state.playType === 'sing' || !state.isEvxml) && !state.isSimplePage) ? true : false, // 演唱模式才渲染歌词，simple页面不显示歌词
 				drawPartNames: props.showPartNames, // 是否渲染声轨名称
 				defaultColorMusic: props.musicColor, // 颜色
-				renderSingleHorizontalStaffline: state.isSingleLine ? true : false
+				renderSingleHorizontalStaffline: state.isSingleLine ? true : false,
+				autoGenerateMultipleRestMeasuresFromRestMeasures: state.setting.combineMultipleRest, // 是否自动合并休止小节
 			})
 			// osmd.EngravingRules.CompactMode = true // 紧凑模式
 			// osmd.EngravingRules.PageRightMargin = state.isSingleLine ? (window.innerWidth+200)/10 : 2;

src/view/plugins/toggleMusicSheet/choosePartName/index.module.less

@@ -1,6 +1,6 @@
 .container {
-  width: 573px;
-  height: 332px;
+  width: 490px;
+  height: 300px;
   .head{
       height: 42px;
       position: relative;