adtec-core-package 2.8.3 → 2.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.8.3",
+  "version": "2.8.5",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/upload/CustomElUpload.vue

@@ -38,6 +38,7 @@
     @remove="remove"
     @preview="preview"
     :auto-upload="autoUpload"
+    @change="handleFileChange"
     @error="error"
     v-loading="loading"
     @exceed="exceed"
@@ -112,6 +113,7 @@ const userInfo = userInfoStore()
 const ref_upload = ref()
 const deleteFiles = ref<ISysUploadFiles[]>([])
 const hoverfileName = ref('')
+const fileList = ref<UploadFiles>([])
 const props = defineProps({
   /**
    * @description 上传文件数量
@@ -268,6 +270,11 @@ const success = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles
 }
 const loading = defineModel<boolean>('loading')
 const loadingFiles = ref<string[]>([])
+const hasPendingFiles = computed(() => {
+  return fileList.value.some(file => {
+    return file.status !== 'success' && file.status !== 'error'
+  })
+})
 // watch(
 //   loadingFiles,
 //   (val) => {
@@ -325,6 +332,9 @@ const fileClick = async (file: UploadFile & ISysUploadFiles) => {
     preview(file)
   }
 }
+const handleFileChange = (file, newFileList) => {
+  fileList.value = newFileList
+}
 // 处理覆盖逻辑
 const exceed = async (files: File[], uploadFiles: UploadUserFile[]) => {
   if (props.limit === 1 && props.overwrite && props.uploadFilesList.length >= 1) {
@@ -408,16 +418,15 @@ const confirm = async (autoDelete: boolean=true) => {
     loading.value = true
     if (props.isConfirmDelete && deleteFiles.value.length > 0 && autoDelete) {
       await documentApi.delSysUploadFiles(deleteFiles.value.map(item => item.id))
-      if (!loadingFiles.value?.length) {
+    }
+    if (!props.autoUpload) {
+      //此处判断是否存在需要上传的文件
+      if (hasPendingFiles.value) {
+        ref_upload.value?.submit()
+      } else {
         props.showOptMessage && ElMessage.success('操作成功')
         emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
       }
-    } else if (!loadingFiles.value?.length) {
-      props.showOptMessage && ElMessage.success('操作成功')
-      emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
-    }
-    if (!props.autoUpload) {
-      ref_upload.value?.submit()
     }
   } catch (err: any) {
     frameworkUtils.messageError(err)

package/src/components/workflow/TaskOperation.vue

@@ -287,6 +287,14 @@ const reloadTask = async () => {
     }
   }
 }
+const reload=()=>{
+  reloadTask()
+}
+defineExpose<{
+  reload: () => void
+}>({
+  reload,
+})
 watch(() => $props.taskId, reloadTask)
 // watchEffect(() => {
 //   //需要指定实际处理人

package/src/components/workflow/components/ProcessDetailComp.vue

@@ -153,5 +153,13 @@ watch(
   },
   { immediate: true }, // 若不需要在组件挂载时立即触发，可以设置为 false
 )
+const reload=()=>{
+  open()
+}
+defineExpose<{
+  reload: () => void
+}>({
+  reload,
+})
 </script>
 <style scoped lang="scss"></style>