Explorar el Código

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

yuanliang hace 9 meses
padre
commit
eead7678ea

+ 14 - 3
src/views/music-library/music-sheet/modal/music-operation.tsx

@@ -333,7 +333,7 @@ export default defineComponent({
       subjectList: [] as any,
       showMusicSheetOwnerDialog: false, //所属人弹框
       // musicSheetOwnerData: {}, //所属人信息
-      multiTracks: null,
+      multiTracks: null as any,
       appData: [], // 应用列表
       ownerName: null as any, // 所属人名称描述
 
@@ -457,6 +457,8 @@ export default defineComponent({
         forms.multiTracksSelection = forms.multiTracksSelection.filter((track: any) => {
           return tracks.includes(track)
         })
+        // 全选选中
+        state.multiTracks = 'all'
 
         // 循环添加所在音轨的原音
         // for (let index = forms.musicSheetSoundList.length; index < state.partListNames.length; index++) {
@@ -903,6 +905,10 @@ export default defineComponent({
                   })
                 })
 
+                if (tracks.length == forms.multiTracksSelection.length) {
+                  state.multiTracks = 'all'
+                }
+
                 // 处理没有声轨,但有原音
                 existSoundList
                   .filter((next: any) => {
@@ -1489,7 +1495,12 @@ export default defineComponent({
                           ]}
                         >
                           <NCheckboxGroup v-model:value={forms.multiTracksSelection}
-                                          // onUpdateValue={(val: any) => {
+                                          onUpdateValue={(val: any) => {
+                                            if (state.partListNames.length != val.length) {
+                                              state.multiTracks = null
+                                            }else {
+                                              state.multiTracks = 'all'
+                                            }
                                           //
                                           //   let removeTracks = [] as any
                                           //   for (let i = 0; i < forms.multiTracksSelection.length; i++) {
@@ -1520,7 +1531,7 @@ export default defineComponent({
                                           //     })
                                           //   }
                                           //   forms.multiTracksSelection = val
-                                          // }}
+                                          }}
                           >
                             <NGrid yGap={2} cols={4}>
                               {state.partListNames.map((item: any) => (

+ 36 - 20
src/views/music-library/project-music-sheet/index.tsx

@@ -8,6 +8,7 @@ import MusicSheetKt from '@views/music-library/project-music-sheet/module/kt/mus
 import MusicSheetGym from '@views/music-library/project-music-sheet/module/gym/music-sheet-gym'
 import MusicSheetGyt from '@views/music-library/project-music-sheet/module/gyt/music-sheet-gyt'
 import MusicSheetKlx from '@views/music-library/project-music-sheet/module/klx/music-sheet-klx'
+import { disAuthCheckStatus } from '@/utils/directive/authDirective'
 
 export default defineComponent({
   name: 'project-music-sheet',
@@ -40,6 +41,17 @@ export default defineComponent({
           state.appNameList.push(next.appName)
         }
       })
+
+      if (disAuthCheckStatus('musicSheet/pageByApplication1751225218734489601')) {
+        state.tabName = 'KLX'
+      } else if (disAuthCheckStatus('musicSheet/pageByApplication1751225314930851842')) {
+        state.tabName = 'GYM'
+      } else if (disAuthCheckStatus('musicSheet/pageByApplication1751225386909302786')) {
+        state.tabName = 'KT'
+      } else if (disAuthCheckStatus('musicSheet/pageByApplication1751225483038556162')) {
+        state.tabName = 'GYT'
+      }
+
       nextTick(() => tabsInstRef.value?.syncBarPosition())
     })
 
@@ -54,26 +66,30 @@ export default defineComponent({
               v-model:value={state.tabName}
               onUpdate:value={(val: any) => setTabs(val)}
             >
-              <NTabPane
-                  v-auth="musicSheet/pageByApplication1751225218734489601"
-                  name={'KLX'} tab={"酷乐秀"}>
-                      <MusicSheetKlx appKey={'KLX'}/>
-              </NTabPane>
-              <NTabPane
-                  v-auth="musicSheet/pageByApplication1751225314930851842"
-                  name={'GYM'} tab={"管乐迷"}>
-                      <MusicSheetGym appKey={'GYM'}/>
-              </NTabPane>
-              <NTabPane
-                  v-auth="musicSheet/pageByApplication1751225386909302786"
-                  name={'KT'} tab={"音乐数字课堂"}>
-                      <MusicSheetKt appKey={'KT'}/>
-              </NTabPane>
-              <NTabPane
-                  v-auth="musicSheet/pageByApplication1751225483038556162"
-                  name={'GYT'} tab={"管乐团"}>
-                      <MusicSheetGyt appKey={'GYT'}/>
-              </NTabPane>
+              {disAuthCheckStatus('musicSheet/pageByApplication1751225218734489601') && (
+                <NTabPane name={'KLX'} tab={'酷乐秀'}>
+                  <MusicSheetKlx appKey={'KLX'} />
+                </NTabPane>
+              )}
+
+              {disAuthCheckStatus('musicSheet/pageByApplication1751225314930851842') && (
+                <NTabPane v-auth="" name={'GYM'} tab={'管乐迷'}>
+                  <MusicSheetGym appKey={'GYM'} />
+                </NTabPane>
+              )}
+
+              {disAuthCheckStatus('musicSheet/pageByApplication1751225386909302786') && (
+                <NTabPane name={'KT'} tab={'音乐数字课堂'}>
+                  <MusicSheetKt appKey={'KT'} />
+                </NTabPane>
+              )}
+
+              {disAuthCheckStatus('musicSheet/pageByApplication1751225483038556162') && (
+                <NTabPane name={'GYT'} tab={'管乐团'}>
+                  <MusicSheetGyt appKey={'GYT'} />
+                </NTabPane>
+              )}
+
               {/*{state.appKeyList.map((app: any, index: number) => (*/}
               {/*  <NTabPane name={app} tab={state.appNameList[index]}>*/}
               {/*    {app === 'KT' && (*/}