agilebuilder-ui 1.1.32 → 1.1.33-sit2

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-browser.vue

@@ -15,66 +15,44 @@
       @chooseFile="pickBrowserFiles"
       @remove="removeFile"
     />
-    <!-- <template v-if="openCameraOrChoosePhoto && openCameraOrChoosePhoto === 'openCamera'"> -->
-      <!-- 由于直接打开capture相机属性的设置为空或者不是user/environment其中的任意一项时会打开的本地捕获音频 麦克风-->
-      <!-- 所有使用 template 可查看 https://w3c.github.io/html-media-capture/#introduction -->
+    <template
+      v-if="openCameraOrChoosePhoto === 'openChoosePhoto' || openCameraOrChoosePhoto === 'openCameraAndChoosePhoto'"
+    >
       <input
-        v-if="multiple && !disabled"
         ref="fileRef"
         type="file"
-        multiple="multiple"
-        :capture="'environment'"
+        :multiple="multipleUpload"
         name="file"
         :accept="myAccept"
         style="display: none"
         @change="uploadFiles"
       />
-      <input
-        v-else-if="!disabled"
-        ref="fileRef"
-        type="file"
-        :capture="'environment'"
-        name="file"
-        style="display: none"
-        :accept="myAccept"
-        @change="uploadFiles"
-      />
-    <!-- </template>
+    </template>
     <template v-else>
+      <!-- 由于直接打开capture相机属性的设置为空或者不是user/environment其中的任意一项时会打开的本地捕获音频 麦克风-->
+      <!-- 所有使用 template 可查看 https://w3c.github.io/html-media-capture/#introduction -->
       <input
-        v-if="multiple && !disabled"
         ref="fileRef"
         type="file"
-        multiple="multiple"
+        :multiple="multipleUpload"
+        capture="environment"
         name="file"
         :accept="myAccept"
         style="display: none"
         @change="uploadFiles"
       />
-      <input
-        v-else-if="!disabled"
-        ref="fileRef"
-        type="file"
-        name="file"
-        style="display: none"
-        :accept="myAccept"
-        @change="uploadFiles"
-      />
-    </template> -->
+    </template>
     <el-drawer v-model="fileTypeFlag" direction="btt" @close="fileTypeFlag = false">
-    <div><el-button
-        link
-        @click="confirmFileType('image')"
-      >
-        {{ $t('fsUpload.image') }}
-      </el-button></div>
       <div>
-      <el-button
-        link
-        @click="confirmFileType('video')"
-      >
-        {{ $t('fsUpload.video') }}
-      </el-button></div>
+        <el-button link @click="confirmFileType('image')">
+          {{ $t('fsUpload.image') }}
+        </el-button>
+      </div>
+      <div>
+        <el-button link @click="confirmFileType('video')">
+          {{ $t('fsUpload.video') }}
+        </el-button>
+      </div>
     </el-drawer>
   </div>
 </template>
@@ -87,6 +65,7 @@ import Compressor from 'compressorjs'
 import { ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
 import FileUploadComponent from './file-upload-component.vue'
+import { isRef } from 'vue'
 
 const props = defineProps({
   openFsUpload: {
@@ -204,6 +183,18 @@ const props = defineProps({
   }
 })
 
+const multipleUpload = ref<string | null>(null)
+if (props.multiple) {
+  multipleUpload.value = 'multiple'
+}
+const isDingTalk = ref(false)
+const authSource = window.localStorage.getItem('auth_source')
+
+if (authSource && authSource === 'dingtalk' && window.$dd) {
+  // 如果是钉钉环境 并且已经加载了钉钉jsapi
+  isDingTalk.value = true
+}
+
 const fileListResult = ref(props.fileList)
 
 let baseURL = window.$vueApp.config.globalProperties.baseURL
@@ -230,11 +221,11 @@ if (props.action) {
 
 defaultAction.value = getReplaceUrlDomain(defaultAction.value)
 
-let myAccept = ref(props.accept ? props.accept : '')
+let myAccept = ref(props.accept ? props.accept : 'image/*')
 let tempFileList = ref([])
 let isUploading = ref(false)
 let isFile = ref(false)
-const fileRef = ref(null)
+const fileRef = ref()
 const fileTypeFlag = ref(false)
 const emits = defineEmits(['remove', 'uploadend'])
 const { t } = useI18n()
@@ -256,17 +247,21 @@ function isImg(file) {
 function removeFile(param) {
   console.log('removeFile----param=', param)
   const file = param.file
-  if(file){
+  if (file) {
     emits('remove', { rmFiles: [file], serverFiles: fileListResult.value, index: param.index })
   }
 }
 function pickBrowserFiles() {
   // if (props.openCameraOrChoosePhoto && props.openCameraOrChoosePhoto === 'openCamera') {
-    // 只打开相机
-    myAccept.value = 'image/*'
+  // 只打开相机
+  myAccept.value = 'image/*'
+  if (isDingTalk.value) {
+    dingtalkChooseImage()
+  } else {
     setTimeout(() => {
       fileRef.value.click()
     })
+  }
   // } else {
   //   // 相机和文件都可以选
   //   myAccept.value = '*'
@@ -299,7 +294,7 @@ async function uploadBrowserFile() {
     limitFileSize = 30
   }
   let isCanUpload = false
-    const files = fileRef.value.files
+  const files = fileRef.value.files
   for (let i = 0; i < files.length; i++) {
     const newFile = files[i]
     isCanUpload = validateCanUploadFile(newFile, limitFileSize)
@@ -309,18 +304,24 @@ async function uploadBrowserFile() {
       break
     }
   }
-    console.error('isCanUpload=', isCanUpload)
+  console.error('isCanUpload=', isCanUpload)
   if (isCanUpload) {
     for (let i = 0; i < files.length; i++) {
       const fileObj = files[i]
-    console.error('fileObj.name=', fileObj.name, 'fileNames=', fileNames)
+      console.error('fileObj.name=', fileObj.name, 'fileNames=', fileNames)
       if (fileNames.indexOf(fileObj.name) >= 0) {
         selectFiles.push(fileObj)
       }
       if (props.beforeUpload && typeof props.beforeUpload === 'function') {
         const isMobile = true
         // eslint-disable-next-line no-useless-call
-        isCanUpload = props.beforeUpload({fileObj, files:selectFiles, isMobile, pageContext: props.pageContext, configureObj: props.configure})
+        isCanUpload = props.beforeUpload({
+          fileObj,
+          files: selectFiles,
+          isMobile,
+          pageContext: props.pageContext,
+          configureObj: props.configure
+        })
       }
     }
   }
@@ -332,7 +333,7 @@ async function uploadBrowserFile() {
     console.error('未选择任何文件')
     return
   }
-  let uploadFiles = []
+  let uploadFiles: File[] = []
   try {
     uploadFiles = await compressionImg(selectFiles)
   } catch (error) {
@@ -351,44 +352,17 @@ async function uploadBrowserFile() {
   } else {
     param.append('file', uploadFiles[0])
   }
-  param.append('systemCode', props.systemCode)
-
-  console.log('上传文件111-----defaultAction.value=',defaultAction.value, 'param=', param, 'uploadFiles=', uploadFiles)
-  window.$vueApp.config.globalProperties.$http
-    .post(defaultAction.value, param, { headers: { 'Content-Type': 'multipart/form-data', Authorization: getToken() } })
-    .then((result) => {
-      // result：批量上传时返回的是集合，单选上传时返回的是对象
-      console.log('上传后返回值==result=', result)
-      if (result) {
-        if (props.multiple) {
-          if (result.length > 0) {
-            // this.tempFileList.push(...result)
-            uploadComplete(result)
-          } else {
-            console.error('多选时上传后返回值异常')
-          }
-        } else {
-          // this.tempFileList.push(result)
-          uploadComplete(result)
-        }
-      } else {
-        console.error('上传后返回值异常')
-      }
-    })
-    .catch(() => {
-      isUploading.value = false
-    })
+  uploadFileToServer(param)
 }
 function validateCanUploadFile(file, limitFileSize) {
   let isCanUpload = true
-  console.log('上传文件--验证文件大小--file.size=', file.size, '文件线状大小,单位是M，limitFileSize=', limitFileSize)
   if (file.size > limitFileSize * 1024 * 1024) {
     // 超过最大限制
     ElMessage({
-        showClose: true,
-        type: 'warning',
-        message: t('fileUpload.exceedFileSize', { fileName: file.name, fileSize: limitFileSize })
-      })
+      showClose: true,
+      type: 'warning',
+      message: t('fileUpload.exceedFileSize', { fileName: file.name, fileSize: limitFileSize })
+    })
     // 返回false停止上传
     isCanUpload = false
   }
@@ -396,35 +370,24 @@ function validateCanUploadFile(file, limitFileSize) {
 }
 // 所有文件上传完毕后
 function uploadComplete(result) {
-  console.log('uploadComplete=开始')
-  if(!fileListResult.value){
+  if (!fileListResult.value) {
     fileListResult.value = []
   }
   if (props.multiple) {
-    console.log(
-      'uploadComplete====fileListResult.value111=',
-      JSON.stringify(fileListResult.value),
-      'result=',
-      result
-    )
     fileListResult.value = fileListResult.value.concat(result)
-    console.log('uploadComplete====fileListResult.value222=', fileListResult.value)
   } else {
     // 单选时将已选文件移除，然后再替换为新上传的文件
-    console.log('uploadComplete====fileListResult.value333=', JSON.stringify(fileListResult.value))
     const rmFiles = JSON.parse(JSON.stringify(fileListResult.value))
+    fileListResult.value = []
     fileListResult.value.push(result)
     emits('remove', { rmFiles, serverFiles: fileListResult.value, index: 0 })
-    console.log('uploadComplete====fileListResult.value444=', fileListResult.value)
   }
-  console.log('uploadComplete====fileListResult.value555=', fileListResult.value)
 
   fileRef.value.value = null
   isUploading.value = false
   fileUploadRef.value.changeFileList(fileListResult.value)
   // 表示上传完成
   emits('uploadend', fileListResult.value)
-  console.log('uploadComplete====上传完成=')
 }
 function uploadFiles() {
   uploadBrowserFiles()
@@ -433,8 +396,19 @@ function uploadBrowserFiles() {
   console.log('uploadBrowserFiles=====上传开始=')
   const files = fileRef.value.files
   if (files && files.length > 0) {
-    isUploading.value = true
-    uploadBrowserFile()
+    if (isDingTalk.value && !props.multiple && files.length > 1) {
+      // 清除文件列表
+      ElMessage({
+        showClose: true,
+        type: 'warning',
+        message: t('fsUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': 1'
+      })
+      fileRef.value.value = null
+      return
+    } else {
+      isUploading.value = true
+      uploadBrowserFile()
+    }
   } else {
     uploadNoNewFiles()
   }
@@ -448,11 +422,11 @@ function uploadNoNewFiles() {
   emits('uploadend', fileListResult.value)
 }
 
-function compressionImg(selectFiles) {
-  const uploadFilesPromises = []
+function compressionImg(selectFiles: File[]): Promise<File[]> {
+  const uploadFilesPromises: Promise<File>[] = []
   for (let i = 0; i < selectFiles.length; i++) {
     uploadFilesPromises.push(
-      new Promise((resolve, reject) => {
+      new Promise<File>((resolve, reject) => {
         console.log(`压缩前 size ${selectFiles[i].size / 1024 / 1024} MB`)
         // eslint-disable-next-line no-new
         new Compressor(selectFiles[i], {
@@ -475,6 +449,124 @@ function compressionImg(selectFiles) {
   }
   return Promise.all(uploadFilesPromises)
 }
+
+function dingtalkChooseImage() {
+  let sourceType = ['album']
+  if (props.openCameraOrChoosePhoto === 'openCameraAndChoosePhoto') {
+    sourceType = ['album', 'camera']
+  } else if (props.openCameraOrChoosePhoto === 'openChoosePhoto') {
+    sourceType = ['album']
+  } else if (props.openCameraOrChoosePhoto === 'openCamera') {
+    sourceType = ['camera']
+  }
+  let count = 1
+  if (props.multiple) {
+    count = 20
+    if (props.limit) {
+      // 限制上传数量
+      if (fileListResult.value && fileListResult.value.length > 0) {
+        if (props.limit === fileListResult.value.length) {
+          ElMessage({
+            showClose: true,
+            type: 'warning',
+            message: t('fsUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': ' + props.limit
+          })
+          return
+        }
+        count = props.limit - fileListResult.value.length
+      } else {
+        count = props.limit
+      }
+    }
+  }
+  window.top.$dd.biz.util
+    .chooseImage({
+      sourceType: sourceType,
+      count: count
+    })
+    .then(async (res) => {
+      console.log('dingtalkChooseImage res=', res)
+      // fileUploadRef.value.changeFileList(fileListResult.value)
+      if (res && res.filePaths && res.filePaths.length > 0) {
+        fetchDingTalkFile(res.files).then(async (sourceFiles) => {
+          let uploadFiles: File[] = []
+          try {
+            uploadFiles = await compressionImg(sourceFiles)
+          } catch (error) {
+            console.error('压缩图片失败', error)
+            uploadFiles = sourceFiles
+          }
+          if (uploadFiles && uploadFiles.length > 0) {
+            const param = new FormData()
+            let limitFileSize = props.limitFileSize
+            if (limitFileSize === undefined) {
+              // 默认是30M
+              limitFileSize = 30
+            }
+            if (props.multiple) {
+              if (fileListResult.value && fileListResult.value.length > 0) {
+                if (fileListResult.value.length + uploadFiles.length > props.limit) {
+                  ElMessage({
+                    showClose: true,
+                    type: 'warning',
+                    message: t('fsUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': ' + props.limit
+                  })
+                  return
+                }
+              }
+              for (let i = 0; i < uploadFiles.length; i++) {
+                param.append('files', uploadFiles[i])
+              }
+            } else {
+              param.append('file', uploadFiles[0])
+            }
+            uploadFileToServer(param)
+          }
+        })
+      }
+    })
+}
+async function fetchDingTalkFile(files: any) {
+  const uploadFiles: any = []
+  for (let index = 0; index < files.length; index++) {
+    const file = files[index]
+    const response = await fetch(file.path)
+    const blob = await response.blob()
+    // https://resource/216576ea16afcbee18c392d15814827.image
+    const fileName = file.path.replace('https://resource/', '').replace('.image', '')
+    // 构造 File 对象
+    uploadFiles.push(new File([blob], fileName + '.' + file.fileType, { type: blob.type }))
+  }
+  return uploadFiles
+}
+
+function uploadFileToServer(param: FormData) {
+  param.append('systemCode', props.systemCode)
+  window.$vueApp.config.globalProperties.$http
+    .post(defaultAction.value, param, { headers: { 'Content-Type': 'multipart/form-data', Authorization: getToken() } })
+    .then((result) => {
+      // result：批量上传时返回的是集合，单选上传时返回的是对象
+      console.log('上传后返回值==result=', result)
+      if (result) {
+        if (props.multiple) {
+          if (result.length > 0) {
+            // this.tempFileList.push(...result)
+            uploadComplete(result)
+          } else {
+            console.error('多选时上传后返回值异常')
+          }
+        } else {
+          // this.tempFileList.push(result)
+          uploadComplete(result)
+        }
+      } else {
+        console.error('上传后返回值异常')
+      }
+    })
+    .catch(() => {
+      isUploading.value = false
+    })
+}
 </script>
 
 <style lang="scss" scoped></style>

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-input.vue

@@ -1,54 +1,54 @@
 <template>
   <div>
     <el-input
-        ref="item"
+      ref="item"
+      :disabled="disabled"
+      v-model="fileNames"
+      :placeholder="$t('imatrixUIMessage.fileUpload')"
+      :readonly="true"
+    >
+      <template v-slot:append>
+        <el-button :icon="Upload" size="default" @click="openAnnexUpload" />
+      </template>
+    </el-input>
+
+    <el-dialog
+      v-model="annexUploadFlag"
+      :append-to-body="true"
+      :show-close="true"
+      :title="$t('imatrixUIMessage.upload')"
+      width="80%"
+      @close="annexUploadFlag = false"
+    >
+      <FileUploadMobile
+        ref="fileUploadRef"
         :disabled="disabled"
-        v-model="fileNames"
-        :placeholder="$t('imatrixUIMessage.fileUpload')"
-        :readonly="true"
-      >
-        <template v-slot:append>
-          <el-button :icon="Upload" size="default" @click="openAnnexUpload" />
-        </template>
-      </el-input>
-      
-      <el-dialog
-        v-model="annexUploadFlag"
-        :append-to-body="true"
-        :show-close="true"
-        :title="$t('imatrixUIMessage.upload')"
-        width="80%"
-        @close="annexUploadFlag=false"
-      >
-        <FileUploadMobile
-           ref="fileUploadRef"
-          :disabled="disabled"
-          :fileInfo="fileInfo"
-          :systemCode="systemCode"
-          :accept="accept"
-          :multiple="multiple"
-          :limit="limit"
-          :limitFileSize="limitFileSize"
-          :placeholder="placeholder"
-          :action="action"
-          :headers="headers"
-          :file-list="fileList"
-          :beforeUpload="beforeUpload"
-          :onSuccess="onSuccess"
-          :beforeRemove="beforeRemove"
-          :onRemove="onRemove"
-          :beforeDownload="beforeDownload"
-          :pageContext="pageContext"
-          :configure="configure"
-          :openFsUpload="openFsUpload"
-          :componentId="componentId"
-          :componentName="componentName"
-          :listCode="listCode"
-          :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
-          @uploadend="uploadendMobile"
-          @remove="removeMobileFile"
-        />
-      </el-dialog>
+        :fileInfo="fileInfo"
+        :systemCode="systemCode"
+        :accept="accept"
+        :multiple="multiple"
+        :limit="limit"
+        :limitFileSize="limitFileSize"
+        :placeholder="placeholder"
+        :action="action"
+        :headers="headers"
+        :file-list="fileList"
+        :beforeUpload="beforeUpload"
+        :onSuccess="onSuccess"
+        :beforeRemove="beforeRemove"
+        :onRemove="onRemove"
+        :beforeDownload="beforeDownload"
+        :pageContext="pageContext"
+        :configure="configure"
+        :openFsUpload="openFsUpload"
+        :componentId="componentId"
+        :componentName="componentName"
+        :listCode="listCode"
+        :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
+        @uploadend="uploadendMobile"
+        @remove="removeMobileFile"
+      />
+    </el-dialog>
   </div>
 </template>
 
@@ -56,9 +56,7 @@
 import { ref, defineEmits } from 'vue'
 import { ElMessage } from 'element-plus'
 import FileUploadMobile from './file-upload.vue'
-import {
-  Upload
-} from '@element-plus/icons-vue'
+import { Upload } from '@element-plus/icons-vue'
 
 const props = defineProps({
   openFsUpload: {
@@ -179,43 +177,57 @@ const props = defineProps({
 const emits = defineEmits(['remove', 'uploadend'])
 const annexUploadFlag = ref(false)
 const fileNames = ref(null)
-fileNames.value = props.fileList && props.fileList.length > 0 ? props.fileList.map((item: any) => item.showName).join(','): null
+fileNames.value =
+  props.fileList && props.fileList.length > 0 ? props.fileList.map((item: any) => item.showName).join(',') : null
 
-const openAnnexUpload = ()=>{
+const openAnnexUpload = () => {
   console.log('点击选择文件按钮---')
   annexUploadFlag.value = true
 }
 
 function uploadendMobile(fileList) {
-  const fileServerPaths = Array.from(props.fileList,({serverPath})=>serverPath)
-  console.log('uploadendMobile---props.fileList=', JSON.stringify(props.fileList),'fileServerPaths=',fileServerPaths, 'fileList=', JSON.stringify(fileList))
-  fileList.forEach(file=>{
+  const fileServerPaths = Array.from(props.fileList, ({ serverPath }) => serverPath)
+  console.log(
+    'uploadendMobile---props.fileList=',
+    JSON.stringify(props.fileList),
+    'fileServerPaths=',
+    fileServerPaths,
+    'fileList=',
+    JSON.stringify(fileList)
+  )
+  fileList.forEach((file) => {
     // 如果已经存在就不要重复添加到fileList中了
-    if(fileServerPaths.indexOf(file.serverPath) < 0){
+    if (fileServerPaths.indexOf(file.serverPath) < 0) {
       props.fileList.push({
         showName: file.name,
         serverPath: file.serverPath
       })
     }
   })
-  console.log('uploadendMobile2222---props.fileList=', JSON.stringify(props.fileList),'fileServerPaths=',fileServerPaths, 'fileList=', JSON.stringify(fileList))
-  fileNames.value =props.fileList.map((item: any) => item.showName).join(',')
+  console.log(
+    'uploadendMobile2222---props.fileList=',
+    JSON.stringify(props.fileList),
+    'fileServerPaths=',
+    fileServerPaths,
+    'fileList=',
+    JSON.stringify(fileList)
+  )
+  fileNames.value = props.fileList.map((item: any) => item.showName).join(',')
   console.log('uploadendMobile3333---fileNames.value=', fileNames.value)
   props.onSuccess()
 }
 
-
 function removeMobileFile(param) {
   // console.log('removeMobileFile---props.fileList=', props.fileList, 'param=', param)
   const deleteFile = param.rmFiles && param.rmFiles.length > 0 ? param.rmFiles[0] : null
-  if(deleteFile){
+  if (deleteFile) {
     let index = props.fileList.findIndex((item: any) => item.serverPath === deleteFile.serverPath)
     if (index > -1) {
       // eslint-disable-next-line vue/no-mutating-props
       props.fileList.splice(index, 1)
     }
   }
-  fileNames.value =props.fileList.map((item: any) => item.showName).join(',')
+  fileNames.value = props.fileList.map((item: any) => item.showName).join(',')
   props.onRemove()
 }
 
@@ -241,7 +253,7 @@ function uploadFileDone(data) {
     fileUploadRef.value.uploadFileDone(data)
   }
 }
-defineExpose({pickFileDone,uploadFileDone})
+defineExpose({ pickFileDone, uploadFileDone })
 </script>
 
 <style lang="scss" scoped></style>

package/packages/fs-upload-new/src/file-upload-mobile/file-upload.vue

@@ -224,7 +224,7 @@ function removeFile({ rmFiles, serverFiles, newFiles }) {
         // 更新字段的值
         ElMessage({
           showClose: true,
-          message: t('fileUpload.updateSuccess'),
+          message: t('fsUpload.updateSuccess'),
           type: 'success'
         })
       })

package/packages/organization-input/src/organization-input.vue

@@ -411,6 +411,17 @@ export default {
             }
           }
           return branchDeptIds.join(this.separator)
+        } else if (orgDataType === 'divisionManager') {
+          let divisionManagerArr = []
+          if (isUserTree) {
+            if (selectNodeInfo.divisionManager && selectNodeInfo.divisionManager.length > 0) {
+              divisionManagerArr = selectNodeInfo.divisionManager
+            }
+          }
+          if (divisionManagerArr && divisionManagerArr.length > 0) {
+            return divisionManagerArr.join(this.separator)
+          }
+          return null
         }
       } else {
         // 单选树时