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

src/pages/detail/helpers.ts

@@ -1247,6 +1247,12 @@ export const onlyVisible = (xml: string, partIndex: number): string => {
   const metronomes = [...parts[0]?.getElementsByTagName('metronome')]
   const words = [...parts[0]?.getElementsByTagName('words')]
   const rehearsals = [...parts[0]?.getElementsByTagName('rehearsal')]
+
+  /** 第一分谱如果是约定的配置分谱则跳过 */
+	if (partListNames[0]?.toLocaleUpperCase?.() === "COMMON") {
+		partIndex++;
+		partListNames.shift();
+	}
   const visiblePartInfo = partList[partIndex]
   state.partListNames = partListNames
   if (visiblePartInfo) {

src/subpages/colexiu/plugins/toggleMusicSheet/index.tsx

@@ -21,12 +21,10 @@ export default defineComponent({
     const search = useOriginSearch()
 
     const partListNames = computed(() => {
-      const partList = state.activeDetail?.background || []
+      let partList = state.activeDetail?.background || []
+      partList = partList.filter((item: any) => !item.track?.toLocaleUpperCase()?.includes('COMMON'))
       return partList.map((item: any, index: number) => {
         const instrumentName = getInstrumentName(item.track)
-        if (!instrumentName){
-          return ''
-        }
         return {
           text: item.track + (instrumentName ? `(${instrumentName})` : ''),
           value: index,
@@ -34,11 +32,6 @@ export default defineComponent({
       }).filter(Boolean)
     })
 
-    const partIndex = computed(() => {
-      const partIndex = partListNames.value.findIndex((item: any) => item.value === state.partIndex)
-      return partIndex > -1 ? partIndex : 0
-    })
-
     const switchMusic = (index: number) => {
       // 暂停播放
       RuntimeUtils.pause()
@@ -70,7 +63,7 @@ export default defineComponent({
     return () => (
       <Popup class={styles.popup} v-model:show={toggleMusicSheet.show}>
         <ChoosePartName
-          partIndex={partIndex.value}
+          partIndex={state.partIndex}
           partListNames={partListNames.value}
           onClose={(value) => {
             console.log("🚀 ~ value:", value)

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

@@ -191,8 +191,12 @@ export const useDetail = (id: number | string): [Ref<ShaeetStatusType>, Ref<Musi
       if (res?.data?.musicSheetType == 'CONCERT') {
         const backgrounds = res?.data?.background || [];
         const partIndex = Number(search['part-index']) || 0
-        const track = backgrounds[partIndex]?.track
+        let track = backgrounds[partIndex]?.track
+        if (backgrounds[0]?.track?.toLocaleUpperCase() == 'COMMON'){
+          track = backgrounds[partIndex + 1]?.track
+        }
         const instrumentName = getInstrumentName(track)
+        console.log("🚀 ~ track:", track)
         detailState.partName =  track + (instrumentName ? `(${instrumentName})` : '')
         const _track = Object.keys(formatdata).filter((key) => key.includes(track) || track.includes(key))[0]
         data.value.code = _track