Merge branch 'develop' into test

src/views/music-library/music-sheet/modal/music-create-img.tsx

@@ -44,8 +44,9 @@ export default defineComponent({
         : 'dev'
       const apiUrl = apiUrls[environment]
       const prefix = /(localhost|192)/.test(location.host) ? 'https://dev.kt.colexiu.com' : apiUrl
+      const xmlFileUrl = encodeURIComponent(props.xmlFileUrl)
       state.productIfameSrc =
-        prefix + `/instrument/#/product-img?xmlUrl=${props.xmlFileUrl}&isCreateImg=true&isCbs=true`
+        prefix + `/instrument/#/product-img?xmlUrl=${xmlFileUrl}&isCreateImg=true&isCbs=true`
       // state.productOpen = true
     }
     const handleProductResult = (res: MessageEvent) => {

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

@@ -1,4 +1,4 @@
-import type { SelectOption } from 'naive-ui'
+import type {SelectOption} from 'naive-ui'
 import {
   NAlert,
   NButton,
@@ -20,20 +20,19 @@ import {
   useDialog,
   useMessage
 } from 'naive-ui'
-import { defineComponent, onMounted, onUnmounted, PropType, reactive, ref } from 'vue'
-import { musicSheetCategoriesQueryTree, musicSheetDetail, musicSheetSave } from '../../api'
+import {defineComponent, onMounted, PropType, reactive, ref} from 'vue'
+import {musicSheetCategoriesQueryTree, musicSheetDetail, musicSheetSave} from '../../api'
 import UploadFile from '@/components/upload-file'
 import styles from './index.module.less'
 import deepClone from '@/utils/deep.clone'
 import axios from 'axios'
-import { appKey, clientType, musicSheetSourceType, musicSheetType } from '@/utils/constant'
-import { getMapValueByKey, getSelectDataFromObj } from '@/utils/objectUtil'
-import { musicalInstrumentPage } from '@views/system-manage/subject-manage/api'
-import { subjectPage } from '@views/system-manage/api'
+import {appKey, clientType, musicSheetSourceType, musicSheetType} from '@/utils/constant'
+import {getMapValueByKey, getSelectDataFromObj} from '@/utils/objectUtil'
+import {musicalInstrumentPage} from '@views/system-manage/subject-manage/api'
+import {subjectPage} from '@views/system-manage/api'
 import MusicSheetOwnerDialog from '@views/music-library/music-sheet/modal/musicSheetOwnerDialog'
-import { sysApplicationPage } from '@views/menu-manage/api'
-import { filterPointCategory } from '@views/teaching-manage/unit-test'
-import { api_uploadFile } from '@/plugins/uploadFile'
+import {sysApplicationPage} from '@views/menu-manage/api'
+import {filterPointCategory} from '@views/teaching-manage/unit-test'
 import MusicCreateImg from './music-create-img'
 
 /**

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

@@ -94,6 +94,8 @@ export default defineComponent({
         } else {
           state.searchForm.applicationId = state.appData[0].value
         }
+        state.searchForm.orgName = null
+        state.searchForm.name = null
       }
 
       getList()

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

@@ -96,11 +96,11 @@ export default defineComponent({
       ]
       for (let i = 0; i < fieldList.length; i++) {
         const fieldValue = app[fieldList[i]]
-        if (fieldValue === null || fieldValue === undefined || fieldValue === '') {
-          return false
+        if (fieldValue != null && fieldValue != undefined && fieldValue != '') {
+          return true
         }
       }
-      return true
+      return false
     })
 
     const ktFileRequire = computed(() => {

src/views/music-library/musicUtil.ts

@@ -7,7 +7,7 @@ export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
   }
   let ownerName = '';
 
-  if (musicSheetExtend && musicSheetExtend.userName) {
+  if (musicSheetExtend) {
     const appName = musicSheetExtend.applicationName;
     if (sourceType == 'ORG') {
       const organizationRole = musicSheetExtend.organizationRole ? '-' + musicSheetExtend.organizationRole : '';