Merge branch 'develop' into test

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

@@ -164,7 +164,7 @@ export default defineComponent({
         },
         {
           title: '适用项目',
-          minWidth: '150px',
+          width: '300px',
           key: 'projectName',
           render(row: any) {
             return (

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

@@ -700,16 +700,16 @@ export default defineComponent({
               }
             })
           }
-          console.log('forms.subjectIds',forms.subjectIds)
           forms.sourceType = data.sourceType
           forms.musicSheetExtend = data.musicSheetExtend
-          forms.repeatedBeats = data.isPlayBeat
 
 
           // 获取渐变 和 是否多声部
           try {
             const extConfigJson = data.extConfigJson ? JSON.parse(data.extConfigJson) : {}
             forms.graduals = extConfigJson.gradualTimes || {}
+            forms.repeatedBeats = !!extConfigJson.repeatedBeats
+
           } catch (error) {}
           setOwnerName()
           axios.get(data.xmlFileUrl).then((res: any) => {

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

@@ -57,7 +57,7 @@ export default defineComponent({
         },
         KLX: {
           availableType: null as any, //可用途径 ORG 机构 PLATFORM 平台
-          musicSheetCategoryId: null as any,
+          musicTagIds: null as any,
           paymentType: null as any, // 是否收费
           musicPrice: null as any, // 曲目价格
           topFlag: null as any, // 是否置顶(0:否;1:是)
@@ -227,7 +227,7 @@ export default defineComponent({
             forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
           } else if (key === 'KLX') {
             forms.useProjectParamConfig[key]['availableType'] = next.availableType
-            forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
+            forms.useProjectParamConfig[key]['musicTagIds'] = next.musicTagIds?.split(',')||[]
             forms.useProjectParamConfig[key]['paymentType'] = next.paymentType
             forms.useProjectParamConfig[key]['musicPrice'] = next.musicPrice
             forms.useProjectParamConfig[key]['topFlag'] = next.topFlag
@@ -277,8 +277,12 @@ export default defineComponent({
                   return !(val === null || val === undefined || val === '')
                 })
                 if (every) {
+                 let appData = value as any;
+                  if (appKey === 'KLX') {
+                    appData['musicTagIds'] = appData['musicTagIds'].join(',')
+                  }
                   applicationExtends.push({
-                    ...value,
+                    ...appData,
                     musicSheetId: props.id,
                     applicationId: appKeyIdMap.get(key)
                   })
@@ -487,7 +491,7 @@ export default defineComponent({
                         </NFormItem>
                         <NFormItem
                           label="曲目标签"
-                          path="useProjectParamConfig.KLX.musicSheetCategoryId"
+                          path="useProjectParamConfig.KLX.musicTagIds"
                           rule={[
                             {
                               required: klxFileRequire.value,
@@ -503,7 +507,7 @@ export default defineComponent({
                             multiple
                             labelField={'name'}
                             valueField={'id'}
-                            v-model:value={forms.useProjectParamConfig.KLX.musicSheetCategoryId}
+                            v-model:value={forms.useProjectParamConfig.KLX.musicTagIds}
                             options={state.musicSheetCategoryOptions.KLX}
                             maxTagCount={3}
                           ></NSelect>
@@ -516,7 +520,6 @@ export default defineComponent({
                               required: klxFileRequire.value,
                               message: '请选择是否收费',
                               trigger:'change',
-                              type:'number'
                             }
                           ]}
                         >
@@ -553,7 +556,7 @@ export default defineComponent({
                               required: klxFileRequire.value,
                               message: '请选择是否置顶',
                               trigger:'change',
-                              type:'number'
+                              type:'boolean'
                             }
                           ]}
                         >
@@ -564,13 +567,13 @@ export default defineComponent({
                             options={[
                               {
                                 label: '是',
-                                value: 1
+                                value: true
                               },
                               {
                                 label: '否',
-                                value: 0
+                                value: false
                               }
-                            ]}
+                            ] as any}
                           ></NSelect>
                         </NFormItem>
                         <NFormItem
@@ -581,7 +584,7 @@ export default defineComponent({
                               required: klxFileRequire.value,
                               message: '请选择是否精品乐谱',
                               trigger:'change',
-                              type:'number'
+                              type:'boolean'
                             }
                           ]}
                         >
@@ -592,13 +595,13 @@ export default defineComponent({
                             options={[
                               {
                                 label: '是',
-                                value: 1
+                                value: true
                               },
                               {
                                 label: '否',
-                                value: 0
+                                value: false
                               }
-                            ]}
+                            ] as any}
                           ></NSelect>
                         </NFormItem>
                         <NFormItem label="排序值" path="useProjectParamConfig.KLX.sortNo">

src/views/system-manage/param-settings/component/project-setting.tsx

@@ -82,18 +82,18 @@ export default defineComponent({
                     min={1}
                     max={999}
                 />
-                <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>
+                {/*<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>*/}
               </NFormItemGi>
             </NGrid>
           </NForm>

src/views/system-manage/system-apply/apply-operation.tsx

@@ -98,6 +98,7 @@ export default defineComponent({
               appName: forms.appName,
               clientIds: forms.clientIds,
               parentId: forms.parentId,
+              appKey:forms.appKey,
               permissionFlag: forms.permissionFlag,
               remark: forms.remark
             })
@@ -198,23 +199,25 @@ export default defineComponent({
               maxlength={100}
             ></NInput>
           </NFormItem>
-          <NFormItem
-              label="应用编码"
-              path="appKey"
-              rule={[
-                {
-                  required: false,
-                  message: '请输入应用编码'
-                }
-              ]}
-          >
-            <NInput
-                v-model:value={forms.appKey}
-                placeholder="请输入应用编码"
-                clearable
-                maxlength={100}
-            ></NInput>
-          </NFormItem>
+          {(forms.applyType==0) && (
+              <NFormItem
+                  label="应用编码"
+                  path="appKey"
+                  rule={[
+                    {
+                      required: false,
+                      message: '请输入应用编码'
+                    }
+                  ]}
+              >
+                <NInput
+                    v-model:value={forms.appKey}
+                    placeholder="请输入应用编码"
+                    clearable
+                    maxlength={100}
+                ></NInput>
+              </NFormItem>
+          )}
           <NFormItem
             label="权限客户端"
             path="clientIds"