Merge branch 'feature/0729-instrument' into test-online

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

@@ -6,7 +6,7 @@ import {
   NCascader,
   NDataTable,
   NDescriptions,
-  NDescriptionsItem,
+  NDescriptionsItem, NDropdown,
   NFormItem,
   NIcon,
   NImage,
@@ -82,6 +82,7 @@ export default defineComponent({
       musicData: {} as any,
       musicSheetCategories: [] as any,
       musicPreview: false,
+      musicPreviewScoreType: 'staff', // 预览谱面类型
       musicScore: null as any,
       showUseProject: false, // 适用项目
       useProjectData: [] as any, // 适用项目行数据
@@ -245,17 +246,26 @@ export default defineComponent({
           render(row: any) {
             return (
               <NSpace>
-                <NButton
-                  type="primary"
-                  size="small"
-                  text
-                  onClick={() => {
-                    state.musicPreview = true
-                    state.musicScore = row
-                  }}
+                <NDropdown
+                    trigger="hover"
+                    options={[
+                      { label: '五线谱', key: 'staff' },
+                      { label: '首调', key: 'firstTone' },
+                      { label: '固定调', key: 'fixedTone' }
+                    ]}
+                    onSelect={(key: string) => {
+                      state.musicPreview = true
+                      state.musicScore = row
+                      state.musicPreviewScoreType = key
+                    }}
                 >
-                  预览
-                </NButton>
+                  <NButton type="primary"
+                           size="small"
+                           text
+                           onClick={(e: Event) => e.stopPropagation()}>
+                    预览
+                  </NButton>
+                </NDropdown>
                 <NButton
                   type="primary"
                   size="small"
@@ -831,7 +841,7 @@ export default defineComponent({
           title={'曲目预览'}
           style={{ width: 'auto' }}
         >
-          <MusicPreView item={state.musicScore} isMove={1} />
+          <MusicPreView item={state.musicScore} isMove={1} scoreType={state.musicPreviewScoreType} />
         </NModal>
 
         <NModal

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

@@ -440,6 +440,9 @@ export default defineComponent({
             newMusicSheetSoundList.push({audioFileUrl: null, track: track, musicalInstrumentId: null})
           }
           tracks.push(track)
+          if(!forms.multiTracksSelection.includes(track)) {
+            forms.multiTracksSelection.push(track)
+          }
         }
 
         for (let i = 0; i < forms.musicSheetSoundList.length; i++) {

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

@@ -8,6 +8,10 @@ export default defineComponent({
       type: Object,
       default: () => {}
     },
+    scoreType: {
+      type: String,
+      default: 'staff',
+    },
     isMove: {
       type: Number,
       default: 0,
@@ -29,6 +33,7 @@ export default defineComponent({
     const prefix = /(localhost|192)/.test(location.host) ? 'https://dev.kt.colexiu.com/' : apiUrl
     let src = prefix + `/instrument/?_t=${Date.now()}&id=${props.item.id}&modelType=practise&modeType=json&Authorization=${token}&isCbs=true`
     src = props.isMove == 1 ? src + `&isMove=1` : src
+    src += '&musicRenderType=' + props.scoreType
     return () => (
       <div>
         <iframe width={'667px'} height={'375px'} frameborder="0" src={src}></iframe>

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

@@ -187,7 +187,7 @@ export default defineComponent({
           return
         }
         if (item.isConvertibleScore == null) {
-          message.error('是否支持转简谱不能为空')
+          message.error('是否支持转谱不能为空')
           return
         }
         if (item.sortNo === null || item.sortNo === undefined || item.sortNo === '') {
@@ -517,14 +517,14 @@ export default defineComponent({
         title(column: any) {
           return (
               <NSpace>
-                是否支持转简谱
+                是否支持简谱
                 <NButton
                     type="primary"
                     size="small"
                     text
                     onClick={() => {
                       dialogs.create({
-                        title: '是否支持转简谱',
+                        title: '是否支持转谱',
                         showIcon: false,
                         content: () => {
                           return h(

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

@@ -379,7 +379,7 @@ export default defineComponent({
           render: (row: any) => {
             return (
                 <div>
-                  {row.paymentType == 'VIP' ? '收费' : '免费'}
+                  {row.paymentType ? (row.paymentType == 'VIP' ? '收费' : '免费') : '--'}
                 </div>
             )
           }

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

@@ -158,7 +158,7 @@ export default defineComponent({
                   rule={[
                     {
                       required: true,
-                      message: '请选择是否支持转简谱',
+                      message: '请选择是否支持转谱',
                       trigger: ['input', 'blur'],
                       type: 'boolean'
                     }
@@ -178,7 +178,7 @@ export default defineComponent({
                         }
                       ] as any
                     }
-                    placeholder="请选择是否支持转简谱"
+                    placeholder="请选择是否支持转谱"
                     onUpdateValue={async (value: any) => {
                       if (!value) {
                         //如果不支持，修改默认谱面

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

@@ -207,7 +207,7 @@ export default defineComponent({
           return
         }
         if (item.isConvertibleScore == null) {
-          message.error('是否支持转简谱不能为空')
+          message.error('是否支持转谱不能为空')
           return
         }
         if (item.sortNo === null || item.sortNo === undefined || item.sortNo === '') {
@@ -538,14 +538,14 @@ export default defineComponent({
         title(column: any) {
           return (
               <NSpace>
-                是否支持转简谱
+                是否支持转谱
                 <NButton
                     type="primary"
                     size="small"
                     text
                     onClick={() => {
                       dialogs.create({
-                        title: '是否支持转简谱',
+                        title: '是否支持转谱',
                         showIcon: false,
                         content: () => {
                           return h(

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

@@ -49,6 +49,8 @@ export default defineComponent({
       forms.musicSheetCategoryId = data[0].musicSheetCategoryId
       forms.sortNo = data[0].sortNo
       forms.availableType = data[0].availableType
+      forms.isConvertibleScore = data[0].isConvertibleScore
+      forms.scoreType = data[0].scoreType
     })
 
     const onSubmit = async () => {
@@ -150,12 +152,12 @@ export default defineComponent({
                 />
               </NFormItem>
               <NFormItem
-                  label="支持转简谱"
+                  label="支持转谱"
                   path="isConvertibleScore"
                   rule={[
                     {
                       required: true,
-                      message: '请选择是否支持转简谱',
+                      message: '请选择是否支持转谱',
                       trigger: ['input', 'blur'],
                       type: 'boolean'
                     }
@@ -175,7 +177,7 @@ export default defineComponent({
                         }
                       ] as any
                     }
-                    placeholder="请选择是否支持转简谱"
+                    placeholder="请选择是否支持转谱"
                     onUpdateValue={async (value: any) => {
                       if (!value) {
                         //如果不支持，修改默认谱面

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

@@ -244,7 +244,7 @@ export default defineComponent({
           return
         }
         if (item.isConvertibleScore == null) {
-          message.error('是否支持转简谱不能为空')
+          message.error('是否支持转谱不能为空')
           return
         }
         if (item.sortNo === null || item.sortNo === undefined || item.sortNo === '') {
@@ -900,14 +900,14 @@ export default defineComponent({
         title(column: any) {
           return (
               <NSpace>
-                是否支持转简谱
+                是否支持转谱
                 <NButton
                     type="primary"
                     size="small"
                     text
                     onClick={() => {
                       dialogs.create({
-                        title: '是否支持转简谱',
+                        title: '是否支持转谱',
                         showIcon: false,
                         content: () => {
                           return h(

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

@@ -250,12 +250,12 @@ export default defineComponent({
                 />
               </NFormItem>
               <NFormItem
-                  label="支持转简谱"
+                  label="支持转谱"
                   path="isConvertibleScore"
                   rule={[
                     {
                       required: true,
-                      message: '请选择是否支持转简谱',
+                      message: '请选择是否支持转谱',
                       trigger: ['input', 'blur'],
                       type: 'boolean'
                     }
@@ -275,7 +275,7 @@ export default defineComponent({
                         }
                       ] as any
                     }
-                    placeholder="请选择是否支持转简谱"
+                    placeholder="请选择是否支持转谱"
                     onUpdateValue={async (value: any) => {
                       if (!value) {
                         //如果不支持，修改默认谱面

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

@@ -185,7 +185,7 @@ export default defineComponent({
           return
         }
         if (item.isConvertibleScore == null) {
-          message.error('是否支持转简谱不能为空')
+          message.error('是否支持转谱不能为空')
           return
         }
         if (!item.sortNo) {
@@ -519,14 +519,14 @@ export default defineComponent({
         title(column: any) {
           return (
               <NSpace>
-                是否支持转简谱
+                是否支持转谱
                 <NButton
                     type="primary"
                     size="small"
                     text
                     onClick={() => {
                       dialogs.create({
-                        title: '是否支持转简谱',
+                        title: '是否支持转谱',
                         showIcon: false,
                         content: () => {
                           return h(

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

@@ -153,12 +153,12 @@ export default defineComponent({
                 />
               </NFormItem>
               <NFormItem
-                  label="支持转简谱"
+                  label="支持转谱"
                   path="isConvertibleScore"
                   rule={[
                     {
                       required: true,
-                      message: '请选择是否支持转简谱',
+                      message: '请选择是否支持转谱',
                       trigger: ['input', 'blur'],
                       type: 'boolean'
                     }
@@ -178,7 +178,7 @@ export default defineComponent({
                         }
                       ] as any
                     }
-                    placeholder="请选择是否支持转简谱"
+                    placeholder="请选择是否支持转谱"
                     onUpdateValue={async (value: any) => {
                       if (!value) {
                         //如果不支持，修改默认谱面