Merge branch 'develop'

# Conflicts:
#	src/views/music-library/music-sheet/modal/music-operation.tsx

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

@@ -825,7 +825,8 @@ export default defineComponent({
                 rule={[
                   {
                     required: true,
-                    message: '请上传曲目封面'
+                    message: '请上传曲目封面',
+                    trigger:['input','blur']
                   }
                 ]}
               >
@@ -857,7 +858,8 @@ export default defineComponent({
                 rule={[
                   {
                     required: true,
-                    message: '请选择曲目类型'
+                    message: '请选择曲目类型',
+                    trigger:'change'
                   }
                 ]}
               >
@@ -874,7 +876,8 @@ export default defineComponent({
                 rule={[
                   {
                     required: true,
-                    message: '请选择作者属性'
+                    message: '请选择作者属性',
+                    trigger:'change'
                   }
                 ]}
               >
@@ -902,7 +905,8 @@ export default defineComponent({
                   rule={[
                     {
                       required: true,
-                      message: '请选择曲目所属人'
+                      message: '请选择曲目所属人',
+                      trigger:['input','change']
                     }
                   ]}
                 >
@@ -927,7 +931,8 @@ export default defineComponent({
                   rule={[
                     {
                       required: true,
-                      message: '请选择曲目所属机构'
+                      message: '请选择曲目所属机构',
+                      trigger:['input','change']
                     }
                   ]}
                 >
@@ -969,7 +974,9 @@ export default defineComponent({
                 rule={[
                   {
                     required: true,
-                    message: '请选择曲目所属人'
+                    message: '请选择审核版本',
+                    trigger:'change',
+                    type:'number'
                   }
                 ]}
               >
@@ -994,7 +1001,7 @@ export default defineComponent({
                              {
                                required: true,
                                message: '请选择曲目分类',
-                               trigger: ['input', 'blur']
+                               trigger: ['change']
                              }
                            ]}
               >
@@ -1223,7 +1230,9 @@ export default defineComponent({
                 rule={[
                   {
                     required: true,
-                    message: '请选择可用乐器'
+                    message: '请选择可用乐器',
+                    trigger: 'change',
+                    type: 'array'
                   }
                 ]}
               >
@@ -1238,39 +1247,44 @@ export default defineComponent({
               </NFormItemGi>
             </NGrid>
 
-            {(forms.musicSheetType) && (
-                <NGrid cols={1}>
-                  <NFormItemGi
-                      label={`${forms.musicSheetType === 'SINGLE' ? '页面渲染声轨' : '用户可切换声轨'}`}
-                      path="multiTracksSelection"
-                      rule={[
-                        {
-                          required: false,
-                          message: `请选择${forms.musicSheetType === 'SINGLE' ? '页面渲染声轨' : '用户可切换声轨'}`
-                        }
-                      ]}
-                  >
-                    <NGrid style="padding-top: 4px;">
-                      <NGi span={24}>
-                        <NRadioGroup
-                            v-model:value={state.multiTracks}
-                            onUpdateValue={(value) => {
-                              checkMultiTracks(value)
-                            }}
-                        >
-                          <NRadio value={'all'}>全选</NRadio>
-                          <NRadio value={'allUncheck'}>重置</NRadio>
-                          <NRadio value={'invert'}>反选</NRadio>
-                        </NRadioGroup>
-                      </NGi>
-                      <NGi span={24} style={"margin-top:5px"}><NFormItemGi
-                          label=''
-                          path="multiTracksSelection"
-                          rule={[
-                            {
-                              required: false,
-                            }
-                          ]}
+            {forms.musicSheetType && (
+              <NGrid cols={1}>
+                <NFormItemGi
+                  label={`${forms.musicSheetType === 'SINGLE' ? '页面渲染声轨' : '用户可切换声轨'}`}
+                  path="multiTracksSelection"
+                  rule={[
+                    {
+                      required: true,
+                      message: `请选择${
+                        forms.musicSheetType === 'SINGLE' ? '页面渲染声轨' : '用户可切换声轨'
+                      }`,
+                      trigger:'change',
+                      type:'array'
+                    }
+                  ]}
+                >
+                  <NGrid style="padding-top: 4px;">
+                    <NGi span={24}>
+                      <NRadioGroup
+                        v-model:value={state.multiTracks}
+                        onUpdateValue={(value) => {
+                          checkMultiTracks(value)
+                        }}
+                      >
+                        <NRadio value={'all'}>全选</NRadio>
+                        <NRadio value={'allUncheck'}>重置</NRadio>
+                        <NRadio value={'invert'}>反选</NRadio>
+                      </NRadioGroup>
+                    </NGi>
+                    <NGi span={24} style={'margin-top:5px'}>
+                      <NFormItemGi
+                        label=""
+                        path="multiTracksSelection"
+                        rule={[
+                          {
+                            required: false
+                          }
+                        ]}
                       >
                         <NCheckboxGroup v-model:value={forms.multiTracksSelection}>
                           <NGrid yGap={2} cols={4}>
@@ -1349,7 +1363,7 @@ export default defineComponent({
                             <UploadFile
                               desc={'原音文件'}
                               disabled={state.previewMode}
-                              size={10}
+                              size={100}
                               v-model:fileList={item.audioFileUrl}
                               tips="仅支持上传.mp3格式文件"
                               listType="image"

src/views/music-library/music-sheet/modal/use-project.tsx

@@ -375,7 +375,8 @@ export default defineComponent({
                           rule={[
                             {
                               required: gymFileRequire.value,
-                              message: '请选择曲目分类'
+                              message: '请选择曲目分类',
+                              trigger:'change',
                             }
                           ]}
                         >
@@ -396,7 +397,8 @@ export default defineComponent({
                           rule={[
                             {
                               required: gymFileRequire.value,
-                              message: '请选择收费类型'
+                              message: '请选择收费类型',
+                              trigger:'change'
                             }
                           ]}
                         >
@@ -404,7 +406,16 @@ export default defineComponent({
                             placeholder="请选择收费类型"
                             clearable
                             v-model:value={forms.useProjectParamConfig.GYM.paymentType}
-                            options={getSelectDataFromObj(musicSheetPaymentType)}
+                            options={[
+                              {
+                                label:'免费',
+                                value:'FREE'
+                              },
+                              {
+                                label:'收费',
+                                value:'CHARGE'
+                              }
+                            ]}
                           ></NSelect>
                         </NFormItem>
                         <NFormItem label="排序值" path="useProjectParamConfig.GYM.sortNo">
@@ -427,7 +438,8 @@ export default defineComponent({
                           rule={[
                             {
                               required: gytFileRequire.value,
-                              message: '请选择分类'
+                              message: '请选择分类',
+                              trigger:'change'
                             }
                           ]}
                         >
@@ -461,7 +473,8 @@ export default defineComponent({
                           rule={[
                             {
                               required: klxFileRequire.value,
-                              message: '请选择可用途径'
+                              message: '请选择可用途径',
+                              trigger:'change'
                             }
                           ]}
                         >
@@ -478,15 +491,21 @@ export default defineComponent({
                           rule={[
                             {
                               required: klxFileRequire.value,
-                              message: '请选择曲目标签'
+                              message: '请选择曲目标签',
+                              trigger:'change',
+                              type:'array'
                             }
                           ]}
                         >
                           <NSelect
                             placeholder="请选择曲目标签"
                             clearable
+                            multiple
+                            labelField={'name'}
+                            valueField={'id'}
                             v-model:value={forms.useProjectParamConfig.KLX.musicSheetCategoryId}
-                            options={[]}
+                            options={state.musicSheetCategoryOptions.KLX}
+                            maxTagCount={3}
                           ></NSelect>
                         </NFormItem>
                         <NFormItem
@@ -495,7 +514,9 @@ export default defineComponent({
                           rule={[
                             {
                               required: klxFileRequire.value,
-                              message: '请选择是否收费'
+                              message: '请选择是否收费',
+                              trigger:'change',
+                              type:'number'
                             }
                           ]}
                         >
@@ -521,7 +542,9 @@ export default defineComponent({
                           rule={[
                             {
                               required: klxFileRequire.value,
-                              message: '请输入曲目价格'
+                              message: '请输入曲目价格',
+                              trigger:['input','blur'],
+                              type:'number'
                             }
                           ]}
                         >
@@ -537,7 +560,9 @@ export default defineComponent({
                           rule={[
                             {
                               required: klxFileRequire.value,
-                              message: '请选择是否置顶'
+                              message: '请选择是否置顶',
+                              trigger:'change',
+                              type:'number'
                             }
                           ]}
                         >
@@ -563,7 +588,9 @@ export default defineComponent({
                           rule={[
                             {
                               required: klxFileRequire.value,
-                              message: '请选择是否精品乐谱'
+                              message: '请选择是否精品乐谱',
+                              trigger:'change',
+                              type:'number'
                             }
                           ]}
                         >

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

@@ -306,7 +306,16 @@ export default defineComponent({
                               state.globalPaymentType = v
                             },
                             clearable: true,
-                            options: getSelectDataFromObj(musicSheetPaymentType)
+                            options: [
+                              {
+                                label:'免费',
+                                value:'FREE'
+                              },
+                              {
+                                label:'收费',
+                                value:'CHARGE'
+                              }
+                            ]
                           })
                         ]
                       )
@@ -342,7 +351,16 @@ export default defineComponent({
             <NSelect
               placeholder="请选择收费方式"
               value={row.paymentType}
-              options={getSelectDataFromObj(musicSheetPaymentType)}
+              options={[
+                {
+                  label:'免费',
+                  value:'FREE'
+                },
+                {
+                  label:'收费',
+                  value:'CHARGE'
+                }
+              ]}
               clearable
               onUpdateValue={(value) => {
                 row['paymentType'] = value

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

@@ -117,7 +117,16 @@ export default defineComponent({
               >
                 <NSelect
                     placeholder="请选择收费方式"
-                    options={getSelectDataFromObj(musicSheetPaymentType)}
+                    options={[
+                      {
+                        label:'免费',
+                        value:'FREE'
+                      },
+                      {
+                        label:'收费',
+                        value:'CHARGE'
+                      }
+                    ]}
                     v-model:value={forms.paymentType}
                     clearable
                 />

src/views/system-manage/subject-manage/instrument/modal/instrument-save.tsx

@@ -94,7 +94,8 @@ export default defineComponent({
                   {
                     required: true,
                     message: '请选择是否支持转简谱',
-                    trigger: ['input', 'blur']
+                    trigger: ['input', 'blur'],
+                    type: 'boolean'
                   }
                 ]}
             >

src/views/system-manage/subject-manage/subject/modal/subject-save.tsx

@@ -146,7 +146,8 @@ export default defineComponent({
             rule={[
               {
                 required: true,
-                message: '请输入声部名称'
+                message: '请输入声部名称',
+                trigger: ['input', 'blur']
               }
             ]}
           >
@@ -164,7 +165,8 @@ export default defineComponent({
             rule={[
               {
                 required: true,
-                message: '请输入声部编码'
+                message: '请输入声部编码',
+                trigger: ['input', 'blur']
               }
             ]}
           >
@@ -182,7 +184,8 @@ export default defineComponent({
             rule={[
               {
                 required: true,
-                message: '请输入声部图片'
+                message: '请输入声部图片',
+                trigger: ['input', 'blur']
               }
             ]}
           >