Merge branch '2023-7-31_合奏'

src/pages/detail/helpers.ts

@@ -235,7 +235,7 @@ export const getAllNodes = (osmd: any) => {
       for (const v of voiceEntries) {
         // 始终只取第一个声部中第一个音符的时间
         let note: any = v.notes[0]
-        if (['Piano'].includes(state.activeDetail?.code)) {
+        if (['Piano'].includes(state.activeDetail?.code) || state.activeDetail?.musicSheetType == 'CONCERT') {
           let _notes = []
           try {
             _notes = iterator.currentVoiceEntries

src/pages/detail/tick-popup/index.tsx

@@ -33,7 +33,6 @@ export default defineComponent({
       <Popup
         show={state.activeTick > -1}
         closeable
-        close-icon-position="bottom-right"
         onClickCloseIcon={() => {
           RunTimeUtils.stopTick()
           this.sendMessage()

src/subpages/colexiu/buttons/index.tsx

@@ -117,7 +117,7 @@ export default defineComponent({
   name: 'Colexiu-Buttons',
   props: {
     onSetMusicScoreType: {
-      type: Function,
+      type: Object,
       default: (n: any) => {},
     },
   },

src/subpages/colexiu/index.d.ts

@@ -62,6 +62,8 @@ export type MusicSheelDetail = {
   musicFirstSvg?: string
   /**后台曲谱设置的速度 */
   playSpeed?: number
+  /** 曲谱类型 */
+  musicSheetType?: string
 }
 
 export type ShaeetStatusType = 'loading' | 'error' | 'success'

src/subpages/colexiu/index.tsx

@@ -401,7 +401,7 @@ export default defineComponent({
           {!renderLoading.value && <UnitTest />}
 
           {/* 切换曲谱 */}
-          {!search.lessonTrainingId && !search.questionId && detailState.activeDetail?.background?.length > 2 && (
+          {!search.lessonTrainingId && !search.questionId &&  detail.value.musicSheetType == 'CONCERT' && (
             <ToggleMusicSheet />
           )}
         </>

src/subpages/colexiu/uses/use-app.ts

@@ -105,7 +105,7 @@ export const useMp3s = async (detail: MusicSheelDetail) => {
     SettingState.sett.scoreSize = setZoom
   }
 
-  detailState.needTick = (detail.audioType === 'MP3' && detail.mp3Type === 'MP3') || detail.audioType === 'MIDI'
+  detailState.needTick = (detail.audioType === 'MP3' && detail.mp3Type === 'MP3' && detail.musicSheetType != 'CONCERT' ) || detail.audioType === 'MIDI'
   detailState.skipTick = detailState.activeDetail.extConfigJson.skipTick
   detailState.repeatedBeats = detailState.activeDetail.extConfigJson.repeatedBeats
   if (!runtime.songs['music']) {