Merge branch 'feature-tianyong' into gym-test

osmd-extended

@@ -1 +1 @@
-Subproject commit cefcde4b54cc28228e500ac2dc73194f24e92864
+Subproject commit 40d3f7b729c40be7190fdd7a2f496f6c1f96d25e

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

@@ -85,7 +85,7 @@ export default defineComponent({
                                     <Switch v-model={state.setting.repeatAutoPlay}></Switch>
                                 </div>
                         }      
-                        {                      
+                        {   !state.isCombineRender &&                    
                             <div class={styles.cellBox}>
                                 <div class={styles.tit}>合并休止小节</div>
                                 <Switch 

src/view/plugins/toggleMusicSheet/index.tsx

@@ -104,7 +104,7 @@ export default defineComponent({
           partListNames={partListNames.value}
           onClose={(value) => {
             console.log("🚀 ~ value:", value)
-            // toggleMusicSheet.show = false
+            toggleMusicSheet.show = false
             if (value !== undefined) {
               switchMusic(value)
             }