Browse Source

添加显示

lex 7 months ago
parent
commit
807ec941fe

+ 56 - 32
src/views/music-library/music-sheet/component/music-list.tsx

@@ -6,7 +6,8 @@ import {
   NCascader,
   NDataTable,
   NDescriptions,
-  NDescriptionsItem, NDropdown,
+  NDescriptionsItem,
+  NDropdown,
   NFormItem,
   NIcon,
   NImage,
@@ -34,7 +35,7 @@ import { subjectPage } from '@/views/system-manage/api'
 import MusicPreView from '../modal/musicPreView'
 import UseProject from '@views/music-library/music-sheet/modal/use-project'
 import { getMapValueByKey } from '@/utils/filters'
-import { appKey, musicSheetSourceType, musicSheetType } from '@/utils/constant'
+import { appKey, musicSheetSourceType } from '@/utils/constant'
 import { getSelectDataFromObj } from '@/utils/objectUtil'
 import { sysApplicationPage } from '@views/menu-manage/api'
 import { getOwnerName, copyText } from '@views/music-library/musicUtil'
@@ -42,8 +43,8 @@ import styles from './music-list.module.less'
 import MusicCreateImg from '../modal/music-create-img'
 import TheTooltip from '@components/TheTooltip'
 import { HelpCircleOutline } from '@vicons/ionicons5'
-import {musicalInstrumentPage} from "@views/system-manage/subject-manage/api";
-import MusiceBeatTime from "../modal/musiceBeatTime"
+import { musicalInstrumentPage } from '@views/system-manage/subject-manage/api'
+import MusiceBeatTime from '../modal/musiceBeatTime'
 
 export default defineComponent({
   name: 'music-list',
@@ -60,7 +61,7 @@ export default defineComponent({
       },
       searchForm: {
         keyword: null,
-        musicSheetType: null,
+        isScoreRender: null,
         subjectId: null, //声部ID
         sourceType: null, //来源类型/作者属性(PLATFORM: 平台; ORG: 机构; PERSON: 个人
         composer: null, //作曲人/音乐人
@@ -73,7 +74,7 @@ export default defineComponent({
         musicCategoryId: null, //曲目分类
         musicalInstrumentId: null, // 乐器ID
         dataCorrect: null, // 数据修复
-        generateMetronomeAudio: null, // 是否生成节拍器音频
+        generateMetronomeAudio: null // 是否生成节拍器音频
       },
       dataList: [] as any,
       subjectList: [] as any,
@@ -140,14 +141,14 @@ 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 label="谱渲染">
+                  {row.isScoreRender ? '支持' : '不支持'}
                 </NDescriptionsItem>
                 <NDescriptionsItem label="分类">
                   <TheTooltip content={row.musicCategoryName} />
                 </NDescriptionsItem>
                 <NDescriptionsItem label="可用声部">
-                  <TheTooltip content={row.subjectNames}/>
+                  <TheTooltip content={row.subjectNames} />
                 </NDescriptionsItem>
                 {/*<NDescriptionsItem label="可用乐器">*/}
                 {/*  <TheTooltip content={row.musicalInstrumentNames} />*/}
@@ -250,22 +251,24 @@ export default defineComponent({
             return (
               <NSpace>
                 <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
-                    }}
+                  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 type="primary"
-                           size="small"
-                           text
-                           onClick={(e: Event) => e.stopPropagation()}>
+                  <NButton
+                    type="primary"
+                    size="small"
+                    text
+                    onClick={(e: Event) => e.stopPropagation()}
+                  >
                     预览
                   </NButton>
                 </NDropdown>
@@ -287,6 +290,7 @@ export default defineComponent({
                   type="primary"
                   size="small"
                   text
+                  disabled={row.playMode === 'MIDI'}
                   v-auth="musicSheet/save1751241178962984962"
                   onClick={() => {
                     state.visiableMusic = true
@@ -590,11 +594,22 @@ export default defineComponent({
               clearable
             />
           </NFormItem>
-          <NFormItem label="谱面渲染" path="musicSheetType">
+          <NFormItem label="总谱渲染" path="isScoreRender">
             <NSelect
-              placeholder="请选择谱面渲染"
-              v-model:value={state.searchForm.musicSheetType}
-              options={getSelectDataFromObj(musicSheetType)}
+              placeholder="请选择总谱渲染"
+              v-model:value={state.searchForm.isScoreRender}
+              options={
+                [
+                  {
+                    label: '支持',
+                    value: true
+                  },
+                  {
+                    label: '不支持',
+                    value: false
+                  }
+                ] as any
+              }
               clearable
             />
           </NFormItem>
@@ -887,7 +902,11 @@ export default defineComponent({
           title={'曲目预览'}
           style={{ width: 'auto' }}
         >
-          <MusicPreView item={state.musicScore} isMove={1} scoreType={state.musicPreviewScoreType} />
+          <MusicPreView
+            item={state.musicScore}
+            isMove={1}
+            scoreType={state.musicPreviewScoreType}
+          />
         </NModal>
 
         <NModal
@@ -928,9 +947,14 @@ export default defineComponent({
             }}
           />
         </NModal>
-        {
-          state.beatTimeOpen && <MusiceBeatTime id={ state.productItem.id } onClose={()=>{state.beatTimeOpen = false}}></MusiceBeatTime>
-        }
+        {state.beatTimeOpen && (
+          <MusiceBeatTime
+            id={state.productItem.id}
+            onClose={() => {
+              state.beatTimeOpen = false
+            }}
+          ></MusiceBeatTime>
+        )}
       </div>
     )
   }

+ 3 - 1
src/views/music-library/music-sheet/modal/music-operationV2.tsx

@@ -1679,7 +1679,9 @@ export default defineComponent({
                   }}
                 >
                   <NRadio value="MP3">MP3</NRadio>
-                  {/*{forms.playMode == 'MIDI' && (<NRadio value="MIDI">MID</NRadio>)}*/}
+                  {forms.playMode == 'MIDI' && props.type === 'preview' && (
+                    <NRadio value="MIDI">MID</NRadio>
+                  )}
                 </NRadioGroup>
               </NFormItemGi>
               {forms.playMode === 'MP3' && (