Merge branch 'develop' into test

src/views/music-library/music-sheet/component/music-list.tsx

@@ -501,9 +501,9 @@ export default defineComponent({
               clearable
             />
           </NFormItem>
-          <NFormItem label="渲染所选声轨" path="musicSheetType">
+          <NFormItem label="同时渲染所选声轨" path="musicSheetType">
             <NSelect
-              placeholder="请选择同时渲染所选声轨"
+              placeholder="请选择是否同时渲染所选声轨"
               v-model:value={state.searchForm.musicSheetType}
               options={getSelectDataFromObj(musicSheetType)}
               clearable

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

@@ -747,22 +747,20 @@ export default defineComponent({
               // 初始化音轨和原音
               forms.multiTracksSelection = data.multiTracksSelection ? data.multiTracksSelection.split(',') : []
 
-              const existSoundList = data.musicSheetSoundList || []
+              const existSoundList = data.musicSheetSoundList ? data.musicSheetSoundList : []
               const tracks = [] as any
               state.partListNames.forEach((item: any) => {
-                let audioFileUrl
+                let audioFileUrl = null
                 existSoundList.forEach((next: any) => {
                   if (next.track == item.value) {
                     audioFileUrl = next.audioFileUrl
                   }
                 })
-                if (audioFileUrl) {
-                  forms.musicSheetSoundList.push({
-                    audioFileUrl: audioFileUrl, // 原音
-                    track: item.value // 轨道
-                  })
-                  tracks.push(item.value)
-                }
+                forms.musicSheetSoundList.push({
+                  audioFileUrl: audioFileUrl, // 原音
+                  track: item.value // 轨道
+                })
+                tracks.push(item.value)
               })
 
               // 处理没有声轨，但有原音
@@ -1328,7 +1326,12 @@ export default defineComponent({
                           }
                         ]}
                       >
-                        <NCheckboxGroup v-model:value={forms.multiTracksSelection}>
+                        <NCheckboxGroup v-model:value={forms.multiTracksSelection}
+                        onUpdateValue={()=>{
+                          console.log("multiTracksSelection",forms.multiTracksSelection)
+                          console.log("musicSheetSoundList",forms.musicSheetSoundList)
+                        }}
+                        >
                           <NGrid yGap={2} cols={4}>
                             {state.partListNames.map((item: any) => (
                               <NGi>

src/views/music-library/project-music-sheet/module/gym/addMusic.tsx

@@ -248,7 +248,7 @@ export default defineComponent({
         key: 'composer'
       },
       {
-        title: '曲目类型',
+        title: '同时渲染所选声轨',
         key: 'musicSheetType',
         render: (row: any) => {
           return (
@@ -620,9 +620,9 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="曲目类型" path="musicSheetType">
+                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
                   <NSelect
-                    placeholder="请选择曲目类型"
+                    placeholder="请选择是否同时渲染所选声轨"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable

src/views/music-library/project-music-sheet/module/gym/music-sheet-gym.tsx

@@ -318,7 +318,7 @@ export default defineComponent({
           )
         },
         {
-          title: '曲目类型',
+          title: '同时渲染所选声轨',
           key: 'musicSheetType',
           render: (row: any) => {
             return (
@@ -639,7 +639,7 @@ export default defineComponent({
             preset="dialog"
             showIcon={false}
             title={'添加曲目'}
-            style={{ width: '1200px' }}
+            style={{ width: '1300px' }}
           >
             <AddMusic
               onClose={() => (state.showAddDialog = false)}

src/views/music-library/project-music-sheet/module/gyt/addMusic.tsx

@@ -245,7 +245,7 @@ export default defineComponent({
         key: 'composer'
       },
       {
-        title: '曲目类型',
+        title: '同时渲染所选声轨',
         key: 'musicSheetType',
         render: (row: any) => {
           return (
@@ -530,9 +530,9 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="曲目类型" path="musicSheetType">
+                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
                   <NSelect
-                    placeholder="请选择曲目类型"
+                    placeholder="请选择是否同时渲染所选声轨"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable

src/views/music-library/project-music-sheet/module/gyt/music-sheet-gyt.tsx

@@ -318,7 +318,7 @@ export default defineComponent({
           )
         },
         {
-          title: '曲目类型',
+          title: '同时渲染所选声轨',
           key: 'musicSheetType',
           render: (row: any) => {
             return (
@@ -646,7 +646,7 @@ export default defineComponent({
             preset="dialog"
             showIcon={false}
             title={'添加曲目'}
-            style={{ width: '1200px' }}
+            style={{ width: '1300px' }}
           >
             <AddMusic
               onClose={() => (state.showAddDialog = false)}

src/views/music-library/project-music-sheet/module/klx/addMusic.tsx

@@ -290,7 +290,7 @@ export default defineComponent({
         key: 'composer'
       },
       {
-        title: '曲目类型',
+        title: '同时渲染所选声轨',
         key: 'musicSheetType',
         render: (row: any) => {
           return (
@@ -990,9 +990,9 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="曲目类型" path="musicSheetType">
+                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
                   <NSelect
-                    placeholder="请选择曲目类型"
+                    placeholder="请选择是否同时渲染所选声轨"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable

src/views/music-library/project-music-sheet/module/klx/music-sheet-klx.tsx

@@ -336,7 +336,7 @@ export default defineComponent({
           )
         },
         {
-          title: '曲目类型',
+          title: '同时渲染所选声轨',
           key: 'musicSheetType',
           render: (row: any) => {
             return (
@@ -691,7 +691,7 @@ export default defineComponent({
             preset="dialog"
             showIcon={false}
             title={'添加曲目'}
-            style={{ width: '1200px' }}
+            style={{ width: '1300px' }}
           >
             <AddMusic
               onClose={() => (state.showAddDialog = false)}

src/views/music-library/project-music-sheet/module/kt/addMusic.tsx

@@ -227,7 +227,7 @@ export default defineComponent({
         key: 'composer'
       },
       {
-        title: '曲目类型',
+        title: '同时渲染所选声轨',
         key: 'musicSheetType',
         render: (row: any) => {
           return (
@@ -537,9 +537,9 @@ export default defineComponent({
                     clearable
                   />
                 </NFormItem>
-                <NFormItem label="曲目类型" path="musicSheetType">
+                <NFormItem label="同时渲染所选声轨" path="musicSheetType">
                   <NSelect
-                    placeholder="请选择曲目类型"
+                    placeholder="请选择是否同时渲染所选声轨"
                     v-model:value={state.searchForm.musicSheetType}
                     options={getSelectDataFromObj(musicSheetType)}
                     clearable

src/views/music-library/project-music-sheet/module/kt/music-sheet-kt.tsx

@@ -305,7 +305,7 @@ export default defineComponent({
           )
         },
         {
-          title: '曲目类型',
+          title: '同时渲染所选声轨',
           key: 'musicSheetType',
           render: (row: any) => {
             return (
@@ -628,7 +628,7 @@ export default defineComponent({
             preset="dialog"
             showIcon={false}
             title={'添加曲目'}
-            style={{ width: '1200px' }}
+            style={{ width: '1300px' }}
           >
             <AddMusic
               onClose={() => (state.showAddDialog = false)}