Merge branch 'develop' into test

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

@@ -37,6 +37,7 @@ import {getOwnerName} from '@views/music-library/musicUtil'
 import styles from './music-list.module.less'
 import MusicCreateImg from '../modal/music-create-img'
 import TheTooltip from "@components/TheTooltip";
+import { HelpCircleOutline } from '@vicons/ionicons5'
 
 export default defineComponent({
   name: 'music-list',
@@ -578,14 +579,27 @@ export default defineComponent({
             />
           </NFormItem>
           <NFormItem label="所属人" path="userId">
-            <NSelect
-              filterable
-              placeholder="请选择所属人"
-              disabled={state.userIdDisable || (!state.searchForm.applicationId && !state.searchForm.sourceType)}
-              v-model:value={state.searchForm.userId}
-              options={state.userIdData}
-              clearable
-            ></NSelect>
+            {{ label: () => <div>所属人<NTooltip style={"padding-left: 10px"}>
+                {{
+                  default: () => '请选择作者属性和项目再选择所属人',
+                  trigger: () => (
+                      <span style="overflow: hidden;display: inline-block;max-width: 200px;white-space: nowrap;text-overflow: ellipsis;">
+                  <NIcon size="20">
+                      <HelpCircleOutline/>
+                  </NIcon>
+                </span>
+                  )
+                }}
+              </NTooltip></div>, default: () =><NSelect
+                  filterable
+                  placeholder="请选择所属人"
+                  disabled={state.userIdDisable || (!state.searchForm.applicationId && !state.searchForm.sourceType)}
+                  v-model:value={state.searchForm.userId}
+                  options={state.userIdData}
+                  clearable
+              ></NSelect>}}
+
+
           </NFormItem>
           <NFormItem label="适用项目" path="useAppId">
             <NSelect

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

@@ -8,13 +8,13 @@ import {
   NDatePicker,
   NDescriptions,
   NDescriptionsItem,
-  NFormItem,
+  NFormItem, NIcon,
   NImage,
   NInput,
   NModal,
   NSelect,
   NSpace,
-  NTag,
+  NTag, NTooltip,
   useDialog,
   useMessage
 } from 'naive-ui'
@@ -42,6 +42,7 @@ import { filterTimes } from '@/utils/dateUtil'
 import deepClone from '@/utils/deep.clone'
 import { getOwnerName } from '@views/music-library/musicUtil'
 import MusicPreView from "@views/music-library/music-sheet/modal/musicPreView";
+import {HelpCircleOutline} from "@vicons/ionicons5";
 
 export default defineComponent({
   name: 'project-music-sheet-mec',
@@ -307,6 +308,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
+                <NDescriptionsItem label="多声轨渲染">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)}/>
                 </NDescriptionsItem>
@@ -318,17 +320,6 @@ export default defineComponent({
           )
         },
         {
-          title: '多声轨渲染',
-          key: 'musicSheetType',
-          render: (row: any) => {
-            return (
-              <div>
-                {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-              </div>
-            )
-          }
-        },
-        {
           title: '伴奏类型',
           key: 'audioType',
           render: (row: any) => {
@@ -487,6 +478,18 @@ export default defineComponent({
                 options={state.userIdData}
                 clearable
               ></NSelect>
+              <NTooltip style={"padding-left: 10px"}>
+                {{
+                  default: () => '请选择作者属性和项目再选择所属人',
+                  trigger: () => (
+                      <span style="overflow: hidden;display: inline-block;max-width: 200px;white-space: nowrap;text-overflow: ellipsis;">
+                  <NIcon size="20">
+                      <HelpCircleOutline/>
+                  </NIcon>
+                </span>
+                  )
+                }}
+              </NTooltip>
             </NFormItem>
             <NFormItem label="曲目类型" path="subjectType">
               <NSelect

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

@@ -307,6 +307,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
+                <NDescriptionsItem label="多声轨渲染">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)}/>
                 </NDescriptionsItem>
@@ -318,17 +319,6 @@ export default defineComponent({
           )
         },
         {
-          title: '多声轨渲染',
-          key: 'musicSheetType',
-          render: (row: any) => {
-            return (
-              <div>
-                {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-              </div>
-            )
-          }
-        },
-        {
           title: '伴奏类型',
           key: 'audioType',
           render: (row: any) => {

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

@@ -325,6 +325,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
+                <NDescriptionsItem label="多声轨渲染">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)}/>
                 </NDescriptionsItem>
@@ -336,17 +337,6 @@ export default defineComponent({
           )
         },
         {
-          title: '多声轨渲染',
-          key: 'musicSheetType',
-          render: (row: any) => {
-            return (
-              <div>
-                {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-              </div>
-            )
-          }
-        },
-        {
           title: '伴奏类型',
           key: 'audioType',
           render: (row: any) => {

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

@@ -294,6 +294,7 @@ export default defineComponent({
                 <NDescriptionsItem label="曲目来源">
                   {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                 </NDescriptionsItem>
+                <NDescriptionsItem label="多声轨渲染">{getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}</NDescriptionsItem>
                 <NDescriptionsItem label="所属人">
                   <TheTooltip content={getOwnerName(row.musicSheetExtend, row.sourceType)} />
                 </NDescriptionsItem>
@@ -305,17 +306,6 @@ export default defineComponent({
           )
         },
         {
-          title: '多声轨渲染',
-          key: 'musicSheetType',
-          render: (row: any) => {
-            return (
-              <div>
-                {getMapValueByKey(row.musicSheetType, new Map(Object.entries(musicSheetType)))}
-              </div>
-            )
-          }
-        },
-        {
           title: '伴奏类型',
           key: 'audioType',
           render: (row: any) => {