Merge branch 'develop' into test

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

@@ -664,11 +664,6 @@ export default defineComponent({
         const detail = props.data
         try {
           const { data } = await musicSheetDetail({ id: detail.id })
-          forms.audioType = data.audioType
-          forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList
-          data.musicSheetAccompanimentList?.forEach((next: any) => {
-            state.musicSheetAccompanimentUrlList.push(next.audioFileUrl)
-          })
           forms.playMode = data.playMode
           forms.xmlFileUrl = data.xmlFileUrl
           forms.midiUrl = data.midiUrl
@@ -684,13 +679,10 @@ export default defineComponent({
           forms.musicCover = data.musicCover
           forms.remark = data.remark
           forms.status = data.status
-          forms.musicCategoryId = data.musicCategoryId
-          forms.evaluationStandard = data.evaluationStandard
-
           forms.musicSheetType = data.musicSheetType || 'SINGLE'
-          forms.evaluationStandard = data.evaluationStandard
-          forms.musicalInstrumentIdList = data.musicalInstrumentIds.split(',') || []
-
+          forms.sourceType = data.sourceType
+          forms.appAuditFlag = data.appAuditFlag ? 1 : 0
+          forms.midiFileUrl = data.midiFileUrl
           forms.subjectIds = []
           if (data.subjectIds) {
             const subjectIds = data.subjectIds.split(',') || []
@@ -700,10 +692,15 @@ export default defineComponent({
               }
             })
           }
-          forms.sourceType = data.sourceType
-          forms.musicSheetExtend = data.musicSheetExtend
-
-
+          forms.musicalInstrumentIdList = data.musicalInstrumentIds.split(',') || []
+          forms.musicCategoryId = data.musicCategoryId
+          data.musicSheetAccompanimentList?.forEach((next: any) => {
+            state.musicSheetAccompanimentUrlList.push(next.audioFileUrl)
+          })
+          forms.musicSheetAccompanimentList = data.musicSheetAccompanimentList
+          forms.audioType = data.audioType
+          forms.isPlayBeat = data.isPlayBeat
+          forms.isUseSystemBeat = data.isUseSystemBeat
           // 获取渐变 和 是否多声部
           try {
             const extConfigJson = data.extConfigJson ? JSON.parse(data.extConfigJson) : {}
@@ -711,6 +708,9 @@ export default defineComponent({
             forms.repeatedBeats = !!extConfigJson.repeatedBeats
 
           } catch (error) {}
+          forms.evaluationStandard = data.evaluationStandard
+          forms.musicSheetExtend = data.musicSheetExtend
+
           setOwnerName()
           axios.get(data.xmlFileUrl).then((res: any) => {
             if (res?.data) {
@@ -1316,7 +1316,7 @@ export default defineComponent({
               {forms.isPlayBeat && (
                 <NFormItemGi
                   label="播放方式"
-                  path="audioType"
+                  path="isUseSystemBeat"
                   rule={[
                     {
                       required: true,