Merge branch 'iteration-20240909' into test-online

components.d.ts

@@ -15,7 +15,6 @@ declare module '@vue/runtime-core' {
     NBreadcrumb: typeof import('naive-ui')['NBreadcrumb']
     NBreadcrumbItem: typeof import('naive-ui')['NBreadcrumbItem']
     NButton: typeof import('naive-ui')['NButton']
-    NCheckbox: typeof import('naive-ui')['NCheckbox']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NCountdown: typeof import('naive-ui')['NCountdown']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
@@ -37,7 +36,6 @@ declare module '@vue/runtime-core' {
     NRadio: typeof import('naive-ui')['NRadio']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NSpace: typeof import('naive-ui')['NSpace']
-    NSpin: typeof import('naive-ui')['NSpin']
     NTooltip: typeof import('naive-ui')['NTooltip']
     Recharge: typeof import('./src/components/Lockscreen/Recharge.vue')['default']
     RouterError: typeof import('./src/components/RouterError/RouterError.vue')['default']

src/views/music-library/music-sheet/modal/music-operationV2.tsx

@@ -500,6 +500,18 @@ export default defineComponent({
           //   playMode: forms.playMode,
           //   musicalInstrumentIdList: forms.musicalInstrumentIdList
           // })
+
+          // 判断 伴唱 范唱 唱名只有上传一个都可以上传
+          let existFSFile = false
+          for (let i = 0; i < forms.fSongList.length; i++) {
+            let fSong = forms.fSongList[i]
+            if (fSong.audioFileUrl || fSong.solmizationFileUrl || fSong.femaleSolmizationFileUrl) {
+              musicSheetSoundList.push(fSong)
+              audioPlayTypes.add('SING')
+              existFSFile = true
+            }
+          }
+
           if (musicSheetType == 'SINGLE') {
             if (forms.isAllSubject) {
               if (forms.musicSheetSoundList_all_subject) {
@@ -554,17 +566,7 @@ export default defineComponent({
             })
           }
 
-          // 判断 伴唱 范唱 唱名只有上传一个都可以上传
-          let existFSFile = false
-          console.log(forms.fSongList, 'forms.fSongList')
-          for (let i = 0; i < forms.fSongList.length; i++) {
-            let fSong = forms.fSongList[i]
-            if (fSong.audioFileUrl || fSong.solmizationFileUrl || fSong.femaleSolmizationFileUrl) {
-              musicSheetSoundList.push(fSong)
-              audioPlayTypes.add('SING')
-              existFSFile = true
-            }
-          }
+          
 
           // 总谱 伴唱判断
           if (forms.scoreAudioFileUrl || state.bSongFile) {