agilebuilder-ui 1.1.34 → 1.1.35-sit2

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

@@ -65,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: {
@@ -181,13 +182,17 @@ const props = defineProps({
     default: () => {}
   }
 })
+
 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') {
+
+if (authSource && authSource === 'dingtalk' && window.top && window.top.$dd) {
+  console.log('当前是钉钉环境')
+  // 如果是钉钉环境 并且已经加载了钉钉jsapi
   isDingTalk.value = true
 }
 
@@ -251,13 +256,13 @@ function pickBrowserFiles() {
   // if (props.openCameraOrChoosePhoto && props.openCameraOrChoosePhoto === 'openCamera') {
   // 只打开相机
   myAccept.value = 'image/*'
-  // if (isDingTalk.value) {
-  // dingtalkChooseImage()
-  // } else {
-  setTimeout(() => {
-    fileRef.value.click()
-  })
-  // }
+  if (isDingTalk.value) {
+    dingtalkChooseImage()
+  } else {
+    setTimeout(() => {
+      fileRef.value.click()
+    })
+  }
   // } else {
   //   // 相机和文件都可以选
   //   myAccept.value = '*'
@@ -329,7 +334,7 @@ async function uploadBrowserFile() {
     console.error('未选择任何文件')
     return
   }
-  let uploadFiles = []
+  let uploadFiles: File[] = []
   try {
     uploadFiles = await compressionImg(selectFiles)
   } catch (error) {
@@ -348,32 +353,7 @@ async function uploadBrowserFile() {
   } else {
     param.append('file', uploadFiles[0])
   }
-  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
-    })
+  uploadFileToServer(param)
 }
 function validateCanUploadFile(file, limitFileSize) {
   let isCanUpload = true
@@ -399,6 +379,7 @@ function uploadComplete(result) {
   } else {
     // 单选时将已选文件移除，然后再替换为新上传的文件
     const rmFiles = JSON.parse(JSON.stringify(fileListResult.value))
+    fileListResult.value = []
     fileListResult.value.push(result)
     emits('remove', { rmFiles, serverFiles: fileListResult.value, index: 0 })
   }
@@ -421,7 +402,7 @@ function uploadBrowserFiles() {
       ElMessage({
         showClose: true,
         type: 'warning',
-        message: '文件最大上传数量: 1'
+        message: t('fsUpload.theNumberOfUploadsExceedsTheLimitTheLimitIs') + ': 1'
       })
       fileRef.value.value = null
       return
@@ -442,11 +423,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], {
@@ -483,7 +464,20 @@ function dingtalkChooseImage() {
   if (props.multiple) {
     count = 20
     if (props.limit) {
-      count = 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
@@ -491,11 +485,88 @@ function dingtalkChooseImage() {
       sourceType: sourceType,
       count: count
     })
-    .then((res) => {
-      //
+    .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>
 

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 {
         // 单选树时

package/packages/super-grid/src/apis.js

@@ -21,8 +21,8 @@ import {
 import eventBus from './eventBus'
 import { isPromise } from '../../../src/utils/common-util'
 import { updateWithPageValue } from '../../../src/utils/jump-page-utils'
-import { getGuId } from '../../../src/utils/guid.js';
-import { ElMessageBox } from 'element-plus';
+import { getGuId } from '../../../src/utils/guid.js'
+import { ElMessageBox } from 'element-plus'
 
 const apis = {
   // 列表工具栏控件刷新列表数据。添加该方法解决工具栏值清空后，列表内容没有还原问题
@@ -369,7 +369,7 @@ const apis = {
     }
     return {
       $rowDataGuId: getGuId(),
-      ...row,
+      ...row
     }
   },
   // 设置默认值null
@@ -459,23 +459,23 @@ const apis = {
             if (action === 'confirm') {
               this.saveRow(rowIndex, listCode).then((res) => {
                 // this.editRow(rowIndex, listCode, true)
-                callback?.('confirm');
-                done();
+                callback?.('confirm')
+                done()
               })
             } else if (action === 'cancel') {
               this.restoreCurrentRow(rowIndex, listCode)
-              callback?.('cancel');
-              done();
+              callback?.('cancel')
+              done()
             } else if (action === 'close') {
-              done();
+              done()
             }
-          },
+          }
         }
       )
     }
   },
-  // 编辑行
-  editRow(rowIndex, listCode, isSaveCallback) {
+  // 编辑行  SkipBeforeEdit 是否跳过编辑前校验
+  editRow(rowIndex, listCode, isSaveCallback, SkipBeforeEdit) {
     if (!listCode) {
       listCode = store.get('_list_code')
     }
@@ -516,7 +516,7 @@ const apis = {
       }
 
       let canEdit = true
-      if (isEditOptionFunction('beforeEdit', listCode)) {
+      if (!SkipBeforeEdit && isEditOptionFunction('beforeEdit', listCode)) {
         const isSubTableShowPage = gridParams.isSubTableShowPage
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
@@ -1473,7 +1473,7 @@ export const apisMixin = {
       isMulitiSelect: false,
       sql: false,
       restoreCurrentRowTimer: null
-    };
+    }
   },
   methods: {
     ...apis

package/packages/super-grid/src/dynamic-input.vue

@@ -28,7 +28,7 @@
   <div v-else :style="row.validateErrorField && row.validateErrorField === column.prop ? 'border:1px solid red' : ''">
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
-      v-if="type === 'year' || type === 'month'"
+      v-if="type === 'year' || type === 'month' || type === 'week'"
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
@@ -1844,6 +1844,11 @@ export default {
       if (this.column.dataType === 'TEXT' || this.column.dataType === 'text') {
         return this.isFormat()
       }
+      if (this.type === 'week') {
+        if (this.controlConfig && this.controlConfig.valueFormat) {
+          return this.controlConfig.valueFormat
+        }
+      }
       // timestamp毫秒值为x
       return 'x'
     },
@@ -1862,6 +1867,11 @@ export default {
         return 'MM'
       } else if (this.type === 'date') {
         return 'YYYY-MM-DD'
+      } else if (this.type === 'week') {
+        if (this.controlConfig && this.controlConfig.format) {
+          return this.controlConfig.format
+        }
+        return 'ww'
       } else if (this.type === 'time' || this.column.dataType === 'TIME') {
         return 'HH:mm:ss'
       } else if (this.column.dataType === 'DATE') {

package/packages/super-grid/src/formatter.js

@@ -1,4 +1,7 @@
 import { isDynamicDataSourceSource } from './utils'
+import dayjs from 'dayjs'
+import weekOfYear from 'dayjs/plugin/weekOfYear'
+dayjs.extend(weekOfYear)
 const formatter = {
   number: function (inputValue, options) {
     // 小数位数
@@ -19,10 +22,7 @@ const formatter = {
       }
       if (isDelimiter) {
         const inputValueStr = inputValue + ''
-        const value = inputValueStr.replace(
-          /\d{1,3}(?=(\d{3})+(\.\d*)?$)/g,
-          '$&,'
-        )
+        const value = inputValueStr.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
         if (sign) {
           return value + sign
         } else {
@@ -65,47 +65,52 @@ const formatter = {
   date: function (value, options) {
     // format格式，例如：yyyy-m-d,yyyy-m-d hh:mm:ss等等
     const format = options.format
+
     if (value != null) {
-      const date = new Date(value)
-      var y = date.getFullYear()
-      var m = date.getMonth() + 1
-      var d = date.getDate()
-      var h = date.getHours()
-      var min = date.getMinutes()
-      var s = date.getSeconds()
-      if (m < 10) {
-        m = '0' + m
-      }
-      if (d < 10) {
-        d = '0' + d
-      }
-      // if (format.indexOf('hh') >= 0) {
-      //   h = h > 12 ? h - 12 : h
-      // } else {
-      if (h < 10) {
-        h = '0' + h
-      }
-      // }
-      if (min < 10) {
-        min = '0' + min
-      }
-      if (s < 10) {
-        s = '0' + s
-      }
-      const newValue = format
-        .replace('yyyy', y)
-        .replace('mm', min)
-        .replace('M', m)
-        .replace('m', m)
-        .replace('d', d)
-        .replace('hh', h)
-        .replace('HH', h)
-        .replace('ss', s)
-      // 判断格式化的值是否包含NaN，如果包含NaN取数据库的值
-      if (newValue.indexOf('NaN') === -1) {
-        return newValue
+      if (format === 'ww') {
+        return dayjs(value).week()
+      } else {
+        const date = new Date(value)
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        var d = date.getDate()
+        var h = date.getHours()
+        var min = date.getMinutes()
+        var s = date.getSeconds()
+        if (m < 10) {
+          m = '0' + m
+        }
+        if (d < 10) {
+          d = '0' + d
+        }
+        // if (format.indexOf('hh') >= 0) {
+        //   h = h > 12 ? h - 12 : h
+        // } else {
+        if (h < 10) {
+          h = '0' + h
+        }
+        // }
+        if (min < 10) {
+          min = '0' + min
+        }
+        if (s < 10) {
+          s = '0' + s
+        }
+        const newValue = format
+          .replace('yyyy', y)
+          .replace('mm', min)
+          .replace('M', m)
+          .replace('m', m)
+          .replace('d', d)
+          .replace('hh', h)
+          .replace('HH', h)
+          .replace('ss', s)
+        // 判断格式化的值是否包含NaN，如果包含NaN取数据库的值
+        if (newValue.indexOf('NaN') === -1) {
+          return newValue
+        }
+        return value
       }
-      return value
     }
     return value
   },
@@ -117,7 +122,7 @@ const formatter = {
       return this.number(value, options) + '%'
     }
     return value
-  },
+  }
 }
 
 export function doFormat(column, value) {
@@ -132,24 +137,21 @@ export function doFormat(column, value) {
       column.formatter = {
         type: 'date',
         options: {
-          format: 'yyyy-m-d',
-        },
+          format: 'yyyy-m-d'
+        }
       }
     } else if (column.dataType === 'TIME') {
       // 默认的“TIME”类型的格式设置
       column.formatter = {
         type: 'time',
         options: {
-          format: 'yyyy-m-d hh:mm:ss',
-        },
+          format: 'yyyy-m-d hh:mm:ss'
+        }
       }
     }
   }
   const columnFormatter = column.formatter
-  if (
-    columnFormatter !== undefined &&
-    formatter[columnFormatter.type] !== undefined
-  ) {
+  if (columnFormatter !== undefined && formatter[columnFormatter.type] !== undefined) {
     return formatter[columnFormatter.type](value, columnFormatter.options)
   } else {
     return value
@@ -163,10 +165,7 @@ export function doFormatWithValueSet(column, value) {
   const valueSet = column.valueSet
   // 先处理值设置再处理格式化设置：即会对值设置的结果进行格式化设置
   if (valueSet !== undefined) {
-    if (
-      column.componentType === 'multiselect' &&
-      !isDynamicDataSourceSource(column)
-    ) {
+    if (column.componentType === 'multiselect') {
       if (typeof value === 'number') {
         // 当value是0时， value instanceof Number 为false
         value += ''
@@ -181,7 +180,9 @@ export function doFormatWithValueSet(column, value) {
           label.push(item[0].label)
         }
       })
-      value = label.join(',')
+      if(label.length > 0){
+        value = label.join(',')
+      }
     } else {
       const item = valueSet.filter((item) => {
         return item.value === value + ''