Merge branch 'develop' into test

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

@@ -370,7 +370,7 @@ export default defineComponent({
     }
     const onRmove = (row: any): void => {
       dialog.warning({
-        title: '警告',
+        title: '提示',
         content: `删除"${row.name}"，是否继续？`,
         positiveText: '确定',
         negativeText: '取消',

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

@@ -77,12 +77,15 @@ export default defineComponent({
             return (
               <div>
                 <NButton
-                  onClick={() => {
-                    jump({
-                      tabName: 'MusicList',
-                      musicCategoryId: row.id
-                    })
-                  }}
+                    type="primary"
+                    size="small"
+                    text
+                    onClick={() => {
+                      jump({
+                        tabName: 'MusicList',
+                        musicCategoryId: row.id
+                      })
+                    }}
                 >
                   {row.musicSheetNum}
                 </NButton>
@@ -156,7 +159,7 @@ export default defineComponent({
     // 删除
     const onRemove = async (row: any) => {
       dialog.warning({
-        title: '警告',
+        title: '提示',
         content: "是否确认删除'" + row.name + "'?",
         positiveText: '确定',
         negativeText: '取消',

src/views/music-library/music-sheet/index.tsx

@@ -37,12 +37,12 @@ export default defineComponent({
               v-model:value={state.tabName}
               onUpdate:value={(val: any) => setTabs(val)}
             >
-              <NTabPane name="MusicList" tab="曲目列表" v-auth="musicSheet/page1751238894313013249">
+              <NTabPane name="MusicList" tab="曲库列表" v-auth="musicSheet/page1751238894313013249">
                 <MusicList searchId={state.searchId} musicCategoryId={state.musicCategoryId} />
               </NTabPane>
               <NTabPane
                 name="CategroryList"
-                tab="曲目分类管理"
+                tab="曲目分类"
                 v-auth="musicSheetCategories/queryTree1751238805699952641"
               >
                 <MusicSheetCategoriesList

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

@@ -544,7 +544,7 @@ export default defineComponent({
     // 删除原音
     const removeSys = (index: number) => {
       dialog.warning({
-        title: '警告',
+        title: '提示',
         content: `是否确认删除此原音？`,
         positiveText: '确定',
         negativeText: '取消',

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

@@ -23,7 +23,7 @@ export default defineComponent({
       'online': 'https://mec.colexiu.com'
     }
 
-    const environment = location.origin.includes('//dev') ? 'dev' : location.origin.includes('//test') ? 'test' : location.origin.includes('//online') ? 'online' : 'dev'
+    const environment = location.origin.includes('//dev') ? 'dev' : location.origin.includes('//test') ? 'test' : location.origin.includes('//mec.colexiu') ? 'online' : 'dev'
     const apiUrl = apiUrls[environment]
     // const prefix = /(localhost|192)/.test(location.host) ? 'http://dev.resource.colexiu.com/' : location.origin
     const prefix = /(localhost|192)/.test(location.host) ? 'https://dev.kt.colexiu.com/' : apiUrl

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

@@ -46,28 +46,28 @@ export default defineComponent({
 
       useProjectParamConfig: {
         //各个项目配置的参数
-        GYM: {
-          musicSheetCategoryId: null as any,
-          sortNo: null as any,
-          paymentType: null as any // 是否收费
-        },
-        GYT: {
-          musicSheetCategoryId: null as any,
-          sortNo: null as any
-        },
-        KLX: {
-          availableType: null as any, //可用途径 ORG 机构 PLATFORM 平台
-          musicTagIds: null as any,
-          paymentType: [] as any, // 是否收费
-          musicPrice: null as any, // 曲目价格
-          topFlag: null as any, // 是否置顶(0:否;1:是)
-          exquisiteFlag: null as any, // 精品标志
-          sortNo: null as any
-        },
-        KT: {
-          musicSheetCategoryId: null as any,
-          sortNo: null as any
-        }
+        // GYM: {
+        //   musicSheetCategoryId: null as any,
+        //   sortNo: null as any,
+        //   paymentType: null as any // 是否收费
+        // },
+        // GYT: {
+        //   musicSheetCategoryId: null as any,
+        //   sortNo: null as any
+        // },
+        // KLX: {
+        //   availableType: null as any, //可用途径 ORG 机构 PLATFORM 平台
+        //   musicTagIds: null as any,
+        //   paymentType: [] as any, // 是否收费
+        //   musicPrice: null as any, // 曲目价格
+        //   topFlag: null as any, // 是否置顶(0:否;1:是)
+        //   exquisiteFlag: null as any, // 精品标志
+        //   sortNo: null as any
+        // },
+        // KT: {
+        //   musicSheetCategoryId: null as any,
+        //   sortNo: null as any
+        // }
       } as any
     })
 
@@ -201,45 +201,45 @@ export default defineComponent({
         projectIdArr.push(project.id)
         appIdCodeMap.set(project.id, project.appKey)
       })
-      if (projectIdArr.length > 0) {
-        const { data } = await musicSheetApplicationExtendCategoryList({
-          applicationIds: projectIdArr.join(',')
-        })
-        data.forEach((next: any) => {
-          const appCode = appIdCodeMap.get(next.applicationId)
-          if (appCode) {
-            state.musicSheetCategoryOptions[appCode] = next.musicSheetCategories
-          }
-        })
-      }
-      {
-        const { data } = (await musicSheetApplicationExtendCategoryApplicationExtendInfo({
-          musicSheetId: props.id
-        })) as any
-        data.forEach((next: any) => {
-          const key = next.appKey
-          if (key === 'GYM') {
-            forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
-            forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
-            forms.useProjectParamConfig[key]['paymentType'] = next.paymentType
-          } else if (key === 'GYT') {
-            forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
-            forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
-          } else if (key === 'KLX') {
-            forms.useProjectParamConfig[key]['availableType'] = next.availableType
-            forms.useProjectParamConfig[key]['musicTagIds'] = next.musicTagIds?.split(',')||[]
-            forms.useProjectParamConfig[key]['paymentType'] = next.paymentType?.split(',')||[]
-            forms.useProjectParamConfig[key]['musicPrice'] = next.musicPrice
-            forms.useProjectParamConfig[key]['topFlag'] = next.topFlag
-            forms.useProjectParamConfig[key]['exquisiteFlag'] = next.exquisiteFlag
-            forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
-          } else if (key === 'KT') {
-            forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
-            forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
-          }
-          // forms.useProjectParamConfig[key] = next
-        })
-      }
+      // if (projectIdArr.length > 0) {
+        // const { data } = await musicSheetApplicationExtendCategoryList({
+        //   applicationIds: projectIdArr.join(',')
+        // })
+        // data.forEach((next: any) => {
+        //   const appCode = appIdCodeMap.get(next.applicationId)
+        //   if (appCode) {
+        //     state.musicSheetCategoryOptions[appCode] = next.musicSheetCategories
+        //   }
+        // })
+      // }
+      // {
+      //   const { data } = (await musicSheetApplicationExtendCategoryApplicationExtendInfo({
+      //     musicSheetId: props.id
+      //   })) as any
+      //   data.forEach((next: any) => {
+      //     const key = next.appKey
+      //     if (key === 'GYM') {
+      //       forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
+      //       forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
+      //       forms.useProjectParamConfig[key]['paymentType'] = next.paymentType
+      //     } else if (key === 'GYT') {
+      //       forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
+      //       forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
+      //     } else if (key === 'KLX') {
+      //       forms.useProjectParamConfig[key]['availableType'] = next.availableType
+      //       forms.useProjectParamConfig[key]['musicTagIds'] = next.musicTagIds?.split(',')||[]
+      //       forms.useProjectParamConfig[key]['paymentType'] = next.paymentType?.split(',')||[]
+      //       forms.useProjectParamConfig[key]['musicPrice'] = next.musicPrice
+      //       forms.useProjectParamConfig[key]['topFlag'] = next.topFlag
+      //       forms.useProjectParamConfig[key]['exquisiteFlag'] = next.exquisiteFlag
+      //       forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
+      //     } else if (key === 'KT') {
+      //       forms.useProjectParamConfig[key]['musicSheetCategoryId'] = next.musicSheetCategoryId
+      //       forms.useProjectParamConfig[key]['sortNo'] = next.sortNo
+      //     }
+      //     // forms.useProjectParamConfig[key] = next
+      //   })
+      // }
 
       state.loading = false
     })
@@ -264,45 +264,45 @@ export default defineComponent({
             appKeyIdMap.set(project.appKey, project.id)
           })
           // 获取选择的应用项目
-          const applicationExtends = [] as any
-          state.selectAppKey.forEach((appKey: any) => {
-            Object.keys(forms.useProjectParamConfig).forEach((key) => {
-              if (appKey === key) {
-                const value = forms.useProjectParamConfig[key]
-                if (!value['sortNo']) {
-                  value['sortNo'] = 0
-                }
-                //除了排序号，其他字段都不为空时才保存数据
-                const every = Object.values(value).every((val: any) => {
-                  return !(val === null || val === undefined || val === '')
-                })
-                if (every) {
-                 let appData = value as any;
-                  if (appKey === 'KLX') {
-                    appData['musicTagIds'] = appData['musicTagIds'].join(',')
-                    appData['paymentType'] = appData['paymentType'].join(',')
-                  }
-                  applicationExtends.push({
-                    ...appData,
-                    musicSheetId: props.id,
-                    applicationId: appKeyIdMap.get(key)
-                  })
-                }
-              }
-            })
-          })
+          // const applicationExtends = [] as any
+          // state.selectAppKey.forEach((appKey: any) => {
+          //   Object.keys(forms.useProjectParamConfig).forEach((key) => {
+          //     if (appKey === key) {
+          //       const value = forms.useProjectParamConfig[key]
+          //       if (!value['sortNo']) {
+          //         value['sortNo'] = 0
+          //       }
+          //       //除了排序号，其他字段都不为空时才保存数据
+          //       const every = Object.values(value).every((val: any) => {
+          //         return !(val === null || val === undefined || val === '')
+          //       })
+          //       if (every) {
+          //        let appData = value as any;
+          //         if (appKey === 'KLX') {
+          //           appData['musicTagIds'] = appData['musicTagIds'].join(',')
+          //           appData['paymentType'] = appData['paymentType'].join(',')
+          //         }
+          //         applicationExtends.push({
+          //           ...appData,
+          //           musicSheetId: props.id,
+          //           applicationId: appKeyIdMap.get(key)
+          //         })
+          //       }
+          //     }
+          //   })
+          // })
 
           const params = {
             musicSheetId: props.id,
             useApplicationIds: forms.useApplicationIds.join(','),
-            applicationExtends: applicationExtends
+            // applicationExtends: applicationExtends
           }
           await musicSheetApplicationExtendSave(params)
           message.success('修改成功')
           emit('getList')
           emit('close')
         } catch (e) {
-          console.log(e)
+          // console.log(e)
         }
         btnLoading.value = false
       })
@@ -356,322 +356,322 @@ export default defineComponent({
               ))}
             </NCheckboxGroup>
           </NFormItem>
-          {state.selectAppKey.length > 0 && (
-            <NTabs
-              ref={tabsRef}
-              type="line"
-              v-model:value={state.tabName}
-              onUpdate:value={(val: any) => {
-                state.tabName = val
-              }}
-            >
-              {state.selectAppKey.map((item: any, index: number) => {
-                return (
-                  <NTabPane
-                    tab={state.appKeyNameMap.get(item)}
-                    name={item}
-                    displayDirective={'show'}
-                  >
-                    {item === 'GYM' && (
-                      <div>
-                        <NFormItem
-                          label="曲目分类"
-                          path="useProjectParamConfig.GYM.musicSheetCategoryId"
-                          rule={[
-                            {
-                              required: gymFileRequire.value,
-                              message: '请选择曲目分类',
-                              trigger:'change',
-                            }
-                          ]}
-                        >
-                          <NCascader
-                            valueField="id"
-                            labelField="name"
-                            children-field="children"
-                            placeholder="请选择分类"
-                            v-model:value={forms.useProjectParamConfig.GYM.musicSheetCategoryId}
-                            options={state.musicSheetCategoryOptions.GYM}
-                            onChange={() => {}}
-                            clearable
-                          />
-                        </NFormItem>
-                        <NFormItem
-                          label="是否收费"
-                          path="useProjectParamConfig.GYM.paymentType"
-                          rule={[
-                            {
-                              required: gymFileRequire.value,
-                              message: '请选择收费类型',
-                              trigger:'change'
-                            }
-                          ]}
-                        >
-                          <NSelect
-                            placeholder="请选择收费类型"
-                            clearable
-                            v-model:value={forms.useProjectParamConfig.GYM.paymentType}
-                            options={[
-                              {
-                                label:'免费',
-                                value:'FREE'
-                              },
-                              {
-                                label:'收费',
-                                value:'CHARGE'
-                              }
-                            ]}
-                          ></NSelect>
-                        </NFormItem>
-                        <NFormItem label="排序值" path="useProjectParamConfig.GYM.sortNo">
-                          <NInputNumber
-                            v-model:value={forms.useProjectParamConfig.GYM.sortNo}
-                            placeholder="请输入排序值"
-                            clearable
-                            min={0}
-                            max={9999}
-                            style={{ width: '100%' }}
-                          />
-                        </NFormItem>
-                      </div>
-                    )}
-                    {item === 'GYT' && (
-                      <div>
-                        <NFormItem
-                          label="分类"
-                          path="useProjectParamConfig.GYT.musicSheetCategoryId"
-                          rule={[
-                            {
-                              required: gytFileRequire.value,
-                              message: '请选择分类',
-                              trigger:'change'
-                            }
-                          ]}
-                        >
-                          <NCascader
-                            valueField="id"
-                            labelField="name"
-                            children-field="children"
-                            placeholder="请选择分类"
-                            v-model:value={forms.useProjectParamConfig.GYT.musicSheetCategoryId}
-                            options={state.musicSheetCategoryOptions.GYT}
-                            clearable
-                          />
-                        </NFormItem>
-                        <NFormItem label="排序值" path="useProjectParamConfig.GYT.sortNo">
-                          <NInputNumber
-                            v-model:value={forms.useProjectParamConfig.GYT.sortNo}
-                            placeholder="请输入排序值"
-                            clearable
-                            min={0}
-                            max={9999}
-                            style={{ width: '100%' }}
-                          />
-                        </NFormItem>
-                      </div>
-                    )}
-                    {item === 'KLX' && (
-                      <div>
-                        <NFormItem
-                          label="可用途径"
-                          path="useProjectParamConfig.KLX.availableType"
-                          rule={[
-                            {
-                              required: klxFileRequire.value,
-                              message: '请选择可用途径',
-                              trigger:'change'
-                            }
-                          ]}
-                        >
-                          <NSelect
-                            placeholder="请选择可用途径"
-                            clearable
-                            v-model:value={forms.useProjectParamConfig.KLX.availableType}
-                            options={getSelectDataFromObj(musicSheetAvailableType)}
-                          ></NSelect>
-                        </NFormItem>
-                        <NFormItem
-                          label="曲目标签"
-                          path="useProjectParamConfig.KLX.musicTagIds"
-                          rule={[
-                            {
-                              required: klxFileRequire.value,
-                              message: '请选择曲目标签',
-                              trigger:'change',
-                              type:'array'
-                            }
-                          ]}
-                        >
-                          <NSelect
-                            placeholder="请选择曲目标签"
-                            clearable
-                            multiple
-                            labelField={'name'}
-                            valueField={'id'}
-                            v-model:value={forms.useProjectParamConfig.KLX.musicTagIds}
-                            options={state.musicSheetCategoryOptions.KLX}
-                            maxTagCount={3}
-                          ></NSelect>
-                        </NFormItem>
-                        <NFormItem
-                          label="是否收费"
-                          path="useProjectParamConfig.KLX.paymentType"
-                          rule={[
-                            {
-                              required: klxFileRequire.value,
-                              message: '请选择是否收费',
-                              trigger:'change',
-                              type:'array'
-                            }
-                          ]}
-                        >
-                          <NSelect
-                            placeholder="请选择是否收费"
-                            clearable
-                            v-model:value={forms.useProjectParamConfig.KLX.paymentType}
-                            options={getSelectDataFromObj(musicSheetPaymentType)}
-                            multiple
-                            onUpdate:value={() => {
-                              const free = 'FREE'
-                              if(forms.useProjectParamConfig.KLX.paymentType[forms.useProjectParamConfig.KLX.paymentType.length - 1] == free) {
-                                forms.useProjectParamConfig.KLX.paymentType = [free]
-                              } else if (forms.useProjectParamConfig.KLX.paymentType.length > 1 && forms.useProjectParamConfig.KLX.paymentType.includes(free)) {
-                                forms.useProjectParamConfig.KLX.paymentType.splice(forms.useProjectParamConfig.KLX.paymentType.indexOf(free), 1)
-                              }
-                              if (!forms.useProjectParamConfig.KLX.paymentType.includes('CHARGE')) {
-                                forms.useProjectParamConfig.KLX.musicPrice = 0
-                              }
-                            }}
-                          ></NSelect>
-                        </NFormItem>
-                        {forms.useProjectParamConfig.KLX.paymentType?.includes('CHARGE') && (
-                            <NFormItem
-                                label="曲目价格"
-                                path="useProjectParamConfig.KLX.musicPrice"
-                                rule={[
-                                  {
-                                    required: klxFileRequire.value,
-                                    message: '请输入曲目价格',
-                                    trigger: ['input', 'blur'],
-                                    type: 'number'
-                                  }
-                                ]}
-                            >
-                              <NInputNumber
-                                  style={'width:100%'}
-                                  placeholder="请输入曲目价格"
-                                  v-model:value={forms.useProjectParamConfig.KLX.musicPrice}
-                              />
-                            </NFormItem>
-                        )
-                        }
-                        <NFormItem
-                          label="是否置顶"
-                          path="useProjectParamConfig.KLX.topFlag"
-                          rule={[
-                            {
-                              required: klxFileRequire.value,
-                              message: '请选择是否置顶',
-                              trigger:'change',
-                              type:'boolean'
-                            }
-                          ]}
-                        >
-                          <NSelect
-                            placeholder="请选择是否置顶"
-                            clearable
-                            v-model:value={forms.useProjectParamConfig.KLX.topFlag}
-                            options={[
-                              {
-                                label: '是',
-                                value: true
-                              },
-                              {
-                                label: '否',
-                                value: false
-                              }
-                            ] as any}
-                          ></NSelect>
-                        </NFormItem>
-                        <NFormItem
-                          label="精品乐谱"
-                          path="useProjectParamConfig.KLX.exquisiteFlag"
-                          rule={[
-                            {
-                              required: klxFileRequire.value,
-                              message: '请选择是否精品乐谱',
-                              trigger:'change',
-                              type:'boolean'
-                            }
-                          ]}
-                        >
-                          <NSelect
-                            placeholder="请选择是否精品乐谱"
-                            clearable
-                            v-model:value={forms.useProjectParamConfig.KLX.exquisiteFlag}
-                            options={[
-                              {
-                                label: '是',
-                                value: true
-                              },
-                              {
-                                label: '否',
-                                value: false
-                              }
-                            ] as any}
-                          ></NSelect>
-                        </NFormItem>
-                        <NFormItem label="排序值" path="useProjectParamConfig.KLX.sortNo">
-                          <NInputNumber
-                            v-model:value={forms.useProjectParamConfig.KLX.sortNo}
-                            placeholder="请输入排序值"
-                            clearable
-                            min={0}
-                            max={9999}
-                            style={{ width: '100%' }}
-                          />
-                        </NFormItem>
-                      </div>
-                    )}
-                    {item === 'KT' && (
-                      <div>
-                        <NFormItem
-                          label="乐谱教材"
-                          path="useProjectParamConfig.KT.musicSheetCategoryId"
-                          rule={[
-                            {
-                              required: ktFileRequire.value,
-                              message: '请选择乐谱教材'
-                            }
-                          ]}
-                        >
-                          <NCascader
-                            valueField="id"
-                            labelField="name"
-                            children-field="children"
-                            placeholder="请选择乐谱教材"
-                            v-model:value={forms.useProjectParamConfig.KT.musicSheetCategoryId}
-                            options={state.musicSheetCategoryOptions.KT}
-                            clearable
-                          />
-                        </NFormItem>
-                        <NFormItem label="排序值" path="useProjectParamConfig.KT.sortNo">
-                          <NInputNumber
-                            v-model:value={forms.useProjectParamConfig.KT.sortNo}
-                            placeholder="请输入排序值"
-                            clearable
-                            min={0}
-                            max={9999}
-                            style={{ width: '100%' }}
-                          />
-                        </NFormItem>
-                      </div>
-                    )}
-                  </NTabPane>
-                )
-              })}
-            </NTabs>
-          )}
+          {/*{state.selectAppKey.length > 0 && (*/}
+          {/*  <NTabs*/}
+          {/*    ref={tabsRef}*/}
+          {/*    type="line"*/}
+          {/*    v-model:value={state.tabName}*/}
+          {/*    onUpdate:value={(val: any) => {*/}
+          {/*      state.tabName = val*/}
+          {/*    }}*/}
+          {/*  >*/}
+          {/*    {state.selectAppKey.map((item: any, index: number) => {*/}
+          {/*      return (*/}
+          {/*        <NTabPane*/}
+          {/*          tab={state.appKeyNameMap.get(item)}*/}
+          {/*          name={item}*/}
+          {/*          displayDirective={'show'}*/}
+          {/*        >*/}
+          {/*          {item === 'GYM' && (*/}
+          {/*            <div>*/}
+          {/*              <NFormItem*/}
+          {/*                label="曲目分类"*/}
+          {/*                path="useProjectParamConfig.GYM.musicSheetCategoryId"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: gymFileRequire.value,*/}
+          {/*                    message: '请选择曲目分类',*/}
+          {/*                    trigger:'change',*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NCascader*/}
+          {/*                  valueField="id"*/}
+          {/*                  labelField="name"*/}
+          {/*                  children-field="children"*/}
+          {/*                  placeholder="请选择分类"*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.GYM.musicSheetCategoryId}*/}
+          {/*                  options={state.musicSheetCategoryOptions.GYM}*/}
+          {/*                  onChange={() => {}}*/}
+          {/*                  clearable*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem*/}
+          {/*                label="是否收费"*/}
+          {/*                path="useProjectParamConfig.GYM.paymentType"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: gymFileRequire.value,*/}
+          {/*                    message: '请选择收费类型',*/}
+          {/*                    trigger:'change'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NSelect*/}
+          {/*                  placeholder="请选择收费类型"*/}
+          {/*                  clearable*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.GYM.paymentType}*/}
+          {/*                  options={[*/}
+          {/*                    {*/}
+          {/*                      label:'免费',*/}
+          {/*                      value:'FREE'*/}
+          {/*                    },*/}
+          {/*                    {*/}
+          {/*                      label:'收费',*/}
+          {/*                      value:'CHARGE'*/}
+          {/*                    }*/}
+          {/*                  ]}*/}
+          {/*                ></NSelect>*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem label="排序值" path="useProjectParamConfig.GYM.sortNo">*/}
+          {/*                <NInputNumber*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.GYM.sortNo}*/}
+          {/*                  placeholder="请输入排序值"*/}
+          {/*                  clearable*/}
+          {/*                  min={0}*/}
+          {/*                  max={9999}*/}
+          {/*                  style={{ width: '100%' }}*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*            </div>*/}
+          {/*          )}*/}
+          {/*          {item === 'GYT' && (*/}
+          {/*            <div>*/}
+          {/*              <NFormItem*/}
+          {/*                label="分类"*/}
+          {/*                path="useProjectParamConfig.GYT.musicSheetCategoryId"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: gytFileRequire.value,*/}
+          {/*                    message: '请选择分类',*/}
+          {/*                    trigger:'change'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NCascader*/}
+          {/*                  valueField="id"*/}
+          {/*                  labelField="name"*/}
+          {/*                  children-field="children"*/}
+          {/*                  placeholder="请选择分类"*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.GYT.musicSheetCategoryId}*/}
+          {/*                  options={state.musicSheetCategoryOptions.GYT}*/}
+          {/*                  clearable*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem label="排序值" path="useProjectParamConfig.GYT.sortNo">*/}
+          {/*                <NInputNumber*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.GYT.sortNo}*/}
+          {/*                  placeholder="请输入排序值"*/}
+          {/*                  clearable*/}
+          {/*                  min={0}*/}
+          {/*                  max={9999}*/}
+          {/*                  style={{ width: '100%' }}*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*            </div>*/}
+          {/*          )}*/}
+          {/*          {item === 'KLX' && (*/}
+          {/*            <div>*/}
+          {/*              <NFormItem*/}
+          {/*                label="可用途径"*/}
+          {/*                path="useProjectParamConfig.KLX.availableType"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: klxFileRequire.value,*/}
+          {/*                    message: '请选择可用途径',*/}
+          {/*                    trigger:'change'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NSelect*/}
+          {/*                  placeholder="请选择可用途径"*/}
+          {/*                  clearable*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KLX.availableType}*/}
+          {/*                  options={getSelectDataFromObj(musicSheetAvailableType)}*/}
+          {/*                ></NSelect>*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem*/}
+          {/*                label="曲目标签"*/}
+          {/*                path="useProjectParamConfig.KLX.musicTagIds"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: klxFileRequire.value,*/}
+          {/*                    message: '请选择曲目标签',*/}
+          {/*                    trigger:'change',*/}
+          {/*                    type:'array'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NSelect*/}
+          {/*                  placeholder="请选择曲目标签"*/}
+          {/*                  clearable*/}
+          {/*                  multiple*/}
+          {/*                  labelField={'name'}*/}
+          {/*                  valueField={'id'}*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KLX.musicTagIds}*/}
+          {/*                  options={state.musicSheetCategoryOptions.KLX}*/}
+          {/*                  maxTagCount={3}*/}
+          {/*                ></NSelect>*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem*/}
+          {/*                label="是否收费"*/}
+          {/*                path="useProjectParamConfig.KLX.paymentType"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: klxFileRequire.value,*/}
+          {/*                    message: '请选择是否收费',*/}
+          {/*                    trigger:'change',*/}
+          {/*                    type:'array'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NSelect*/}
+          {/*                  placeholder="请选择是否收费"*/}
+          {/*                  clearable*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KLX.paymentType}*/}
+          {/*                  options={getSelectDataFromObj(musicSheetPaymentType)}*/}
+          {/*                  multiple*/}
+          {/*                  onUpdate:value={() => {*/}
+          {/*                    const free = 'FREE'*/}
+          {/*                    if(forms.useProjectParamConfig.KLX.paymentType[forms.useProjectParamConfig.KLX.paymentType.length - 1] == free) {*/}
+          {/*                      forms.useProjectParamConfig.KLX.paymentType = [free]*/}
+          {/*                    } else if (forms.useProjectParamConfig.KLX.paymentType.length > 1 && forms.useProjectParamConfig.KLX.paymentType.includes(free)) {*/}
+          {/*                      forms.useProjectParamConfig.KLX.paymentType.splice(forms.useProjectParamConfig.KLX.paymentType.indexOf(free), 1)*/}
+          {/*                    }*/}
+          {/*                    if (!forms.useProjectParamConfig.KLX.paymentType.includes('CHARGE')) {*/}
+          {/*                      forms.useProjectParamConfig.KLX.musicPrice = 0*/}
+          {/*                    }*/}
+          {/*                  }}*/}
+          {/*                ></NSelect>*/}
+          {/*              </NFormItem>*/}
+          {/*              {forms.useProjectParamConfig.KLX.paymentType?.includes('CHARGE') && (*/}
+          {/*                  <NFormItem*/}
+          {/*                      label="曲目价格"*/}
+          {/*                      path="useProjectParamConfig.KLX.musicPrice"*/}
+          {/*                      rule={[*/}
+          {/*                        {*/}
+          {/*                          required: klxFileRequire.value,*/}
+          {/*                          message: '请输入曲目价格',*/}
+          {/*                          trigger: ['input', 'blur'],*/}
+          {/*                          type: 'number'*/}
+          {/*                        }*/}
+          {/*                      ]}*/}
+          {/*                  >*/}
+          {/*                    <NInputNumber*/}
+          {/*                        style={'width:100%'}*/}
+          {/*                        placeholder="请输入曲目价格"*/}
+          {/*                        v-model:value={forms.useProjectParamConfig.KLX.musicPrice}*/}
+          {/*                    />*/}
+          {/*                  </NFormItem>*/}
+          {/*              )*/}
+          {/*              }*/}
+          {/*              <NFormItem*/}
+          {/*                label="是否置顶"*/}
+          {/*                path="useProjectParamConfig.KLX.topFlag"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: klxFileRequire.value,*/}
+          {/*                    message: '请选择是否置顶',*/}
+          {/*                    trigger:'change',*/}
+          {/*                    type:'boolean'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NSelect*/}
+          {/*                  placeholder="请选择是否置顶"*/}
+          {/*                  clearable*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KLX.topFlag}*/}
+          {/*                  options={[*/}
+          {/*                    {*/}
+          {/*                      label: '是',*/}
+          {/*                      value: true*/}
+          {/*                    },*/}
+          {/*                    {*/}
+          {/*                      label: '否',*/}
+          {/*                      value: false*/}
+          {/*                    }*/}
+          {/*                  ] as any}*/}
+          {/*                ></NSelect>*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem*/}
+          {/*                label="精品乐谱"*/}
+          {/*                path="useProjectParamConfig.KLX.exquisiteFlag"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: klxFileRequire.value,*/}
+          {/*                    message: '请选择是否精品乐谱',*/}
+          {/*                    trigger:'change',*/}
+          {/*                    type:'boolean'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NSelect*/}
+          {/*                  placeholder="请选择是否精品乐谱"*/}
+          {/*                  clearable*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KLX.exquisiteFlag}*/}
+          {/*                  options={[*/}
+          {/*                    {*/}
+          {/*                      label: '是',*/}
+          {/*                      value: true*/}
+          {/*                    },*/}
+          {/*                    {*/}
+          {/*                      label: '否',*/}
+          {/*                      value: false*/}
+          {/*                    }*/}
+          {/*                  ] as any}*/}
+          {/*                ></NSelect>*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem label="排序值" path="useProjectParamConfig.KLX.sortNo">*/}
+          {/*                <NInputNumber*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KLX.sortNo}*/}
+          {/*                  placeholder="请输入排序值"*/}
+          {/*                  clearable*/}
+          {/*                  min={0}*/}
+          {/*                  max={9999}*/}
+          {/*                  style={{ width: '100%' }}*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*            </div>*/}
+          {/*          )}*/}
+          {/*          {item === 'KT' && (*/}
+          {/*            <div>*/}
+          {/*              <NFormItem*/}
+          {/*                label="乐谱教材"*/}
+          {/*                path="useProjectParamConfig.KT.musicSheetCategoryId"*/}
+          {/*                rule={[*/}
+          {/*                  {*/}
+          {/*                    required: ktFileRequire.value,*/}
+          {/*                    message: '请选择乐谱教材'*/}
+          {/*                  }*/}
+          {/*                ]}*/}
+          {/*              >*/}
+          {/*                <NCascader*/}
+          {/*                  valueField="id"*/}
+          {/*                  labelField="name"*/}
+          {/*                  children-field="children"*/}
+          {/*                  placeholder="请选择乐谱教材"*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KT.musicSheetCategoryId}*/}
+          {/*                  options={state.musicSheetCategoryOptions.KT}*/}
+          {/*                  clearable*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*              <NFormItem label="排序值" path="useProjectParamConfig.KT.sortNo">*/}
+          {/*                <NInputNumber*/}
+          {/*                  v-model:value={forms.useProjectParamConfig.KT.sortNo}*/}
+          {/*                  placeholder="请输入排序值"*/}
+          {/*                  clearable*/}
+          {/*                  min={0}*/}
+          {/*                  max={9999}*/}
+          {/*                  style={{ width: '100%' }}*/}
+          {/*                />*/}
+          {/*              </NFormItem>*/}
+          {/*            </div>*/}
+          {/*          )}*/}
+          {/*        </NTabPane>*/}
+          {/*      )*/}
+          {/*    })}*/}
+          {/*  </NTabs>*/}
+          {/*)}*/}
         </NForm>
         <NSpace justify="end" style={'margin-top: 10px'}>
           <NButton type="default" onClick={() => emit('close')}>

src/views/music-library/musicUtil.ts

@@ -2,8 +2,8 @@ import {getMapValueByKey} from "@/utils/objectUtil";
 import {clientType,} from "@/utils/constant";
 
 export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
-  if (musicSheetExtend == 'PLATFORM') {
-    return;
+  if (sourceType == 'PLATFORM') {
+    return "--"
   }
   let ownerName = '';
 
@@ -19,8 +19,6 @@ export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
       let typeName = getMapValueByKey(musicSheetExtend.clientType, new Map(Object.entries(clientType)));
       typeName = typeName ? '-' + typeName : '';
       ownerName += ' (' + appName + typeName + ')'
-    }else if(sourceType == 'PLATFORM'){
-      return "--"
     }
   }
   return ownerName;

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

@@ -469,7 +469,7 @@ export default defineComponent({
                 //v-auth="musicSheet/update1602302618558099458"
                 onClick={() => {
                   dialogs.warning({
-                    title: '警告',
+                    title: '提示',
                     content: `是否删除该数据？`,
                     positiveText: '确定',
                     negativeText: '取消',

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

@@ -379,7 +379,7 @@ export default defineComponent({
                 //v-auth="musicSheet/update1602302618558099458"
                 onClick={() => {
                   dialogs.warning({
-                    title: '警告',
+                    title: '提示',
                     content: `是否删除该数据？`,
                     positiveText: '确定',
                     negativeText: '取消',

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

@@ -832,7 +832,7 @@ export default defineComponent({
                 //v-auth="musicSheet/update1602302618558099458"
                 onClick={() => {
                   dialogs.warning({
-                    title: '警告',
+                    title: '提示',
                     content: `是否删除该数据？`,
                     positiveText: '确定',
                     negativeText: '取消',

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

@@ -384,7 +384,7 @@ export default defineComponent({
                 //v-auth="musicSheet/update1602302618558099458"
                 onClick={() => {
                   dialogs.warning({
-                    title: '警告',
+                    title: '提示',
                     content: `是否删除该数据？`,
                     positiveText: '确定',
                     negativeText: '取消',

src/views/system-manage/subject-manage/instrument/instrument-list.tsx

@@ -63,7 +63,7 @@ export default defineComponent({
     const onChangeStatus = (row: any) => {
       const statusStr = row.enableFlag ? '停用' : '启用'
       dialog.warning({
-        title: '警告',
+        title: '提示',
         content: `是否${statusStr}？`,
         positiveText: '确定',
         negativeText: '取消',

src/views/system-manage/subject-manage/subject-categorize/categorize-list.tsx

@@ -102,7 +102,7 @@ export default defineComponent({
     const onChangeStatus = (row: any) => {
       const statusStr = row.enableFlag ? '停用' : '启用'
       dialog.warning({
-        title: '警告',
+        title: '提示',
         content: `是否${statusStr}？`,
         positiveText: '确定',
         negativeText: '取消',