Merge branch 'develop' into test

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

@@ -579,26 +579,35 @@ export default defineComponent({
             />
           </NFormItem>
           <NFormItem label="所属人" path="userId">
-            {{ 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>}}
-
+            {{
+              label: () =>
+                  <div>
+                    所属人
+                    {/*<NTooltip style={"padding-left: 10px"}>*/}
+                    {/*  {{*/}
+                    {/*    default: () => '请选择作者属性和项目再选择所属人',*/}
+                    {/*    trigger: () => (*/}
+                    {/*        <span>*/}
+                    {/*             <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">

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

@@ -272,7 +272,7 @@ export default defineComponent({
           type: 'selection'
         },
         {
-          title: '曲目信息',
+          title: '曲目名称',
           key: 'id',
           render: (row: any) => (
             <>
@@ -478,18 +478,6 @@ 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

@@ -271,7 +271,7 @@ export default defineComponent({
           type: 'selection'
         },
         {
-          title: '曲目信息',
+          title: '曲目名称',
           key: 'id',
           render: (row: any) => (
             <>

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

@@ -296,7 +296,7 @@ export default defineComponent({
           type: 'selection'
         },
         {
-          title: '曲目信息',
+          title: '曲目名称',
           key: 'id',
           render: (row: any) => (
             <>

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

@@ -265,7 +265,7 @@ export default defineComponent({
           type: 'selection'
         },
         {
-          title: '曲目信息',
+          title: '曲目名称',
           key: 'id',
           render: (row: any) => (
             <>