Merge remote-tracking branch 'origin/hqyNewVersion' into feature/0429-musicV2

src/views/music-library/music-sheet/modal/music-create-img.tsx

@@ -60,10 +60,10 @@ export default defineComponent({
         }
         imgs = imgs.filter((item: any) => item.base64)
         if (imgs.length === 3) {
-          message.success('生成成功')
+          message.success('图片生成成功')
           handleUploadImg(imgs)
         } else {
-          message.error('生成失败')
+          message.error('图片生成失败')
         }
         // console.log('🚀 ~ 上传之前', [...imgs])
       }

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

@@ -38,6 +38,7 @@ import MusicSheetOwnerDialog from '@views/music-library/music-sheet/modal/musicS
 import { sysApplicationPage } from '@views/menu-manage/api'
 import { filterPointCategory } from '@views/teaching-manage/unit-test'
 import MusicCreateImg from './music-create-img'
+import MusiceBeatTime from './musiceBeatTime'
 
 /**
  * 获取指定元素下一个Note元素
@@ -406,7 +407,10 @@ export default defineComponent({
       list: [] as any[],
       gradualRefs: [] as any[]
     })
-
+    const beatTimeData = reactive({
+      beatTimeOpen: false,
+      musicId: ''
+    })
     watch(
       () => forms.multiTracksSelection,
       (value) => {
@@ -637,25 +641,37 @@ export default defineComponent({
           }
 
           btnLoading.value = true
+          let resData: any
           if (props.type === 'add') {
-            await musicSheetSave(obj)
-            message.success('添加成功')
+            resData = await musicSheetSave(obj)
           } else if (props.type === 'edit') {
-            await musicSheetSave({ ...obj, id: props.data.id })
-            message.success('修改成功')
+            resData = await musicSheetSave({ ...obj, id: props.data.id })
           }
-          emit('getList')
-          emit('close')
+          beatTimeData.beatTimeOpen = true
+          beatTimeData.musicId = resData.data
         } catch (e) {
           console.log(e)
+          setTimeout(() => {
+            btnLoading.value = false
+            state.isAutoSave = false
+          }, 100)
         }
-        setTimeout(() => {
-          btnLoading.value = false
-          state.isAutoSave = false
-        }, 100)
       })
     }
-
+    // 合成节拍器的回调
+    function handlerMusiceBeatTimeClose() {
+      if (props.type === 'add') {
+        message.success('添加成功')
+      } else if (props.type === 'edit') {
+        message.success('修改成功')
+      }
+      emit('getList')
+      emit('close')
+      setTimeout(() => {
+        btnLoading.value = false
+        state.isAutoSave = false
+      }, 100)
+    }
     const isPtrack = async (track: string) => {
       if (track && (track == 'P1' || track == 'P2' || track == 'P3' || track == 'P4')) {
         return true
@@ -2510,6 +2526,12 @@ export default defineComponent({
             }}
           />
         </NModal>
+        {beatTimeData.beatTimeOpen && (
+          <MusiceBeatTime
+            id={beatTimeData.musicId}
+            onClose={handlerMusiceBeatTimeClose}
+          ></MusiceBeatTime>
+        )}
       </div>
     )
   }

src/views/music-library/music-sheet/modal/musiceBeatTime/index.tsx

@@ -37,11 +37,11 @@ export default defineComponent({
           singTimeList: singBeatTime,
           solmizationTimeList: mingBeatTime
         })
-        message.success('生成成功')
+        message.success('节拍器生成成功')
         emit("close")
       }catch (err){
         console.log('🚀 ~ 音频合成失败', err)
-        message.error('生成失败')
+        message.error('节拍器生成失败')
         emit("close")
       }
     }