소스 검색

feat: 多轨合并显示不支持合并休止小节

TIANYONG 7 달 전
부모
커밋
8861cd3f88
3개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      osmd-extended
  2. 1 1
      src/page-instrument/header-top/settting/index.tsx
  3. 1 1
      src/view/plugins/toggleMusicSheet/index.tsx

+ 1 - 1
osmd-extended

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

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

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

+ 1 - 1
src/view/plugins/toggleMusicSheet/index.tsx

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