adtec-core-package 2.8.2 → 2.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "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 上传文件数量
@@ -199,6 +201,10 @@ const props = defineProps({
   autoUpload: {
     type: Boolean,
     default: true
+  },
+  showOptMessage: {
+    type:Boolean,
+    default:true
   }
 })
 const mousemove = (fileName: string) => {
@@ -256,12 +262,19 @@ const success = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles
       loadingFiles.value.splice(i, 1)
     }
   }
-  ElMessage.success('上传成功')
-  emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
+  if (response.code === '0') {
+    props.showOptMessage && ElMessage.success('上传成功')
+    emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
+  }
   loading.value = false
 }
 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) => {
@@ -319,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) {
@@ -397,18 +413,20 @@ const remove = async (file: UploadFile, isConfirm: boolean = true) => {
 const progress = (event: { percent: number }, file: UploadFile) => {
   loading.value = true
 }
-const confirm = async () => {
+const confirm = async (autoDelete: boolean=true) => {
   try {
     loading.value = true
-    if (props.isConfirmDelete && deleteFiles.value.length > 0) {
+    if (props.isConfirmDelete && deleteFiles.value.length > 0 && autoDelete) {
       await documentApi.delSysUploadFiles(deleteFiles.value.map(item => item.id))
-      if (!loadingFiles.value?.length) {
-        ElMessage.success('操作成功')
-        emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
-      }
     }
     if (!props.autoUpload) {
-      ref_upload.value?.submit()
+      //此处判断是否存在需要上传的文件
+      if (hasPendingFiles.value) {
+        ref_upload.value?.submit()
+      } else {
+        props.showOptMessage && ElMessage.success('操作成功')
+        emit('success', { files: props.uploadFilesList, deleteFiles: deleteFiles.value })
+      }
     }
   } catch (err: any) {
     frameworkUtils.messageError(err)