agilebuilder-ui 1.1.28 → 1.1.29-dingtalkphoto1

package/lib/{tab-content-iframe-index-55b69efd.js → tab-content-iframe-index-e264aa95.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-ce3ae297.js";
+import { _ as s } from "./index-1a5b5812.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-f8882314.js → tab-content-index-d82575ce.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-ce3ae297.js";
+import { _ as f, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-1a5b5812.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-a2d815d2.js → tache-subprocess-history-e5bb058f.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-ce3ae297.js";
+import { _ as I } from "./index-1a5b5812.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.28",
+  "version": "1.1.29-dingtalkphoto1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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="multiple ? true : false"
         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="multiple ? true : false"
+        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>
@@ -204,6 +182,12 @@ const props = defineProps({
   }
 })
 
+const isDingTalk = ref(false)
+const authSource = window.localStorage.getItem('auth_source')
+if (authSource && authSource === 'dingtalk') {
+  isDingTalk.value = true
+}
+
 const fileListResult = ref(props.fileList)
 
 let baseURL = window.$vueApp.config.globalProperties.baseURL
@@ -230,11 +214,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 +240,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/*'
-    setTimeout(() => {
-      fileRef.value.click()
-    })
+  // 只打开相机
+  myAccept.value = 'image/*'
+  // if (isDingTalk.value) {
+  // dingtalkChooseImage()
+  // } else {
+  setTimeout(() => {
+    fileRef.value.click()
+  })
+  // }
   // } else {
   //   // 相机和文件都可以选
   //   myAccept.value = '*'
@@ -299,7 +287,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 +297,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
+        })
       }
     }
   }
@@ -353,7 +347,6 @@ async function uploadBrowserFile() {
   }
   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) => {
@@ -381,14 +374,13 @@ async function uploadBrowserFile() {
 }
 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 +388,23 @@ 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.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 +413,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) {
+      // 清除文件列表
+      ElMessage({
+        showClose: true,
+        type: 'warning',
+        message: t('fileUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': 1'
+      })
+      fileRef.value.value = null
+      return
+    } else {
+      isUploading.value = true
+      uploadBrowserFile()
+    }
   } else {
     uploadNoNewFiles()
   }
@@ -475,6 +466,34 @@ 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) {
+      count = props.limit
+    }
+  }
+  window.top.$dd.biz.util
+    .chooseImage({
+      sourceType: sourceType,
+      count: count
+    })
+    .then((res) => {
+      //
+      if (res && res.filePaths && res.filePaths.length > 0) {
+      }
+    })
+}
 </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/src/utils/dingtalk-util.ts

@@ -0,0 +1,37 @@
+export function checkDingtalkEnvironment() {
+  const authSource = window.localStorage.getItem('auth_source')
+  let isDingTalk = false
+  if (authSource && authSource === 'dingtalk') {
+    isDingTalk = true
+  }
+
+  if (isDingTalk) {
+    let dd: any = null
+    import('dingtalk-jsapi').then((module) => {
+      dd = module.default
+      window.$dd = dd
+      const nonceStr = '1234567890' // 必填，自定义固定字符串。
+      const timeStamp = new Date().getTime() // 必填，生成签名的时间戳
+      window.$http
+        .post(window.$vueApp.config.globalProperties.baseAPI + '/component/dingtalk/jsticket-sign', {
+          nonceStr: nonceStr, // 必填，自定义固定字符串。
+          timeStamp: timeStamp, // 必填，生成签名的时间戳
+          url: window.location.href // 必填，当前页面的url
+        })
+        .then((response: any) => {
+          dd.config({
+            agentId: response.agentId, // 必填，授权应用的agentid
+            corpId: response.corpId, //必填，企业ID
+            timeStamp: timeStamp, // 必填，生成签名的时间戳
+            nonceStr: nonceStr, // 必填，自定义固定字符串。
+            signature: response.signature, // 必填，签名
+            type: 0, //选填。0表示微应用的jsapi,1表示服务窗的jsapi；不填默认为0。该参数从dingtalk.js的0.8.3版本开始支持
+            jsApiList: ['biz.util.chooseImage'] // 必填，需要使用的jsapi列表，注意：不要带dd。
+          })
+          dd.error(function (err) {
+            console.error('dd error: ' + JSON.stringify(err))
+          })
+        })
+    })
+  }
+}