Merge branch 'develop'

src/utils/constant.ts

@@ -233,8 +233,8 @@ export const heardLevelType = {
 
 // 曲目类型
 export const musicSheetType = {
-  SINGLE: '独奏',
-  CONCERT: '合奏'
+  SINGLE: '是',
+  CONCERT: '否'
 } as any
 
 // 作者属性

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

@@ -119,7 +119,7 @@ export default defineComponent({
             return (
                 <NDescriptions labelPlacement="left" column={1}>
                   <NDescriptionsItem label="音乐人">{row.composer}</NDescriptionsItem>
-                  <NDescriptionsItem label="类型">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
+                  <NDescriptionsItem label="同时渲染所选声轨">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
                   <NDescriptionsItem label="分类"><TheTooltip content={row.musicCategoryName}/></NDescriptionsItem>
                   <NDescriptionsItem label="可用声部"><TheTooltip content={row.subjectNames}/></NDescriptionsItem>
                 </NDescriptions>
@@ -500,9 +500,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)
               })
 
               // 处理没有声轨，但有原音
@@ -797,7 +795,7 @@ export default defineComponent({
             model={forms}
             ref={formsRef}
             label-placement="left"
-            label-width="130"
+            label-width="150"
             disabled={state.previewMode}
           >
             <NAlert showIcon={false} style={{ marginBottom: '12px' }}>
@@ -886,24 +884,6 @@ export default defineComponent({
             </NGrid>
             <NGrid cols={2}>
               <NFormItemGi
-                label="曲目类型"
-                path="musicSheetType"
-                rule={[
-                  {
-                    required: true,
-                    message: '请选择曲目类型',
-                    trigger: 'change'
-                  }
-                ]}
-              >
-                <NSelect
-                  placeholder="请选择曲目类型"
-                  v-model:value={forms.musicSheetType}
-                  options={getSelectDataFromObj(musicSheetType)}
-                />
-              </NFormItemGi>
-
-              <NFormItemGi
                 label="作者属性"
                 path="sourceType"
                 rule={[
@@ -929,76 +909,58 @@ export default defineComponent({
                   }}
                 />
               </NFormItemGi>
-            </NGrid>
-            <NGrid cols={2}>
               {forms.sourceType === 'PERSON' && (
-                <NFormItemGi
-                  label="所属人"
-                  path="musicSheetExtend.userId"
-                  rule={[
-                    {
-                      required: true,
-                      message: '请选择曲目所属人',
-                      trigger: ['input', 'change']
-                    }
-                  ]}
-                >
-                  <NButton
-                    disabled={state.previewMode || !forms.sourceType}
-                    type="primary"
-                    size="small"
-                    text
-                    //v-auth="orchestraSubsidyStandard/update1597887579789053953"
-                    onClick={() => {
-                      state.showMusicSheetOwnerDialog = true
-                    }}
+                  <NFormItemGi
+                      label="所属人"
+                      path="musicSheetExtend.userId"
+                      rule={[
+                        {
+                          required: true,
+                          message: '请选择曲目所属人',
+                          trigger: ['input', 'change']
+                        }
+                      ]}
                   >
-                    {state.ownerName ? state.ownerName : '请选择所属人'}
-                  </NButton>
-                </NFormItemGi>
+                    <NButton
+                        disabled={state.previewMode || !forms.sourceType}
+                        type="primary"
+                        size="small"
+                        text
+                        //v-auth="orchestraSubsidyStandard/update1597887579789053953"
+                        onClick={() => {
+                          state.showMusicSheetOwnerDialog = true
+                        }}
+                    >
+                      {state.ownerName ? state.ownerName : '请选择所属人'}
+                    </NButton>
+                  </NFormItemGi>
               )}
               {forms.sourceType === 'ORG' && (
-                <NFormItemGi
-                  label="所属人"
-                  path="musicSheetExtend.organizationRoleId"
-                  rule={[
-                    {
-                      required: true,
-                      message: '请选择曲目所属机构',
-                      trigger: ['input', 'change']
-                    }
-                  ]}
-                >
-                  <NButton
-                    disabled={state.previewMode || !forms.sourceType}
-                    type="primary"
-                    size="small"
-                    text
-                    //v-auth="orchestraSubsidyStandard/update1597887579789053953"
-                    onClick={() => {
-                      state.showMusicSheetOwnerDialog = true
-                    }}
+                  <NFormItemGi
+                      label="所属人"
+                      path="musicSheetExtend.organizationRoleId"
+                      rule={[
+                        {
+                          required: true,
+                          message: '请选择曲目所属机构',
+                          trigger: ['input', 'change']
+                        }
+                      ]}
                   >
-                    {state.ownerName ? state.ownerName : '请选择所属机构'}
-                  </NButton>
-                </NFormItemGi>
+                    <NButton
+                        disabled={state.previewMode || !forms.sourceType}
+                        type="primary"
+                        size="small"
+                        text
+                        //v-auth="orchestraSubsidyStandard/update1597887579789053953"
+                        onClick={() => {
+                          state.showMusicSheetOwnerDialog = true
+                        }}
+                    >
+                      {state.ownerName ? state.ownerName : '请选择所属机构'}
+                    </NButton>
+                  </NFormItemGi>
               )}
-              <NFormItemGi
-                label="速度"
-                path="playSpeed"
-                rule={[
-                  {
-                    required: false,
-                    message: '请输入速度'
-                  }
-                ]}
-              >
-                <NInputNumber
-                  placeholder="请输入速度"
-                  v-model:value={forms.playSpeed}
-                  style="width:100%"
-                />
-              </NFormItemGi>
             </NGrid>
             <NGrid cols={2}>
               <NFormItemGi
@@ -1083,6 +1045,24 @@ export default defineComponent({
                 </NRadioGroup>
               </NFormItemGi>
             </NGrid>
+            <NGrid cols={2}>
+              <NFormItemGi
+                  label="速度"
+                  path="playSpeed"
+                  rule={[
+                    {
+                      required: false,
+                      message: '请输入速度'
+                    }
+                  ]}
+              >
+                <NInputNumber
+                    placeholder="请输入速度"
+                    v-model:value={forms.playSpeed}
+                    style="width:100%"
+                />
+              </NFormItemGi>
+            </NGrid>
             <NAlert showIcon={false} style={{ marginBottom: '12px' }}>
               曲目上传
             </NAlert>
@@ -1283,6 +1263,29 @@ export default defineComponent({
                 />
               </NFormItemGi>
             </NGrid>
+            <NGrid cols={2}>
+              <NFormItemGi
+                  label="同时渲染所选声轨"
+                  path="musicSheetType"
+                  rule={[
+                    {
+                      required: true,
+                      message: '请选择是否同时渲染所选声轨',
+                      trigger: 'change'
+                    }
+                  ]}
+              >
+                {/*<NSelect*/}
+                {/*    placeholder="请选择曲目类型"*/}
+                {/*    v-model:value={forms.musicSheetType}*/}
+                {/*    options={getSelectDataFromObj(musicSheetType)}*/}
+                {/*/>*/}
+                <NRadioGroup v-model:value={forms.musicSheetType}>
+                  <NRadio value={'SINGLE'}>是</NRadio>
+                  <NRadio value={'CONCERT'}>否</NRadio>
+                </NRadioGroup>
+              </NFormItemGi>
+            </NGrid>
 
             {forms.musicSheetType && (
               <NGrid cols={1}>
@@ -1323,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)}