From 1c349b83b1e951e3415eb2a7fcc2bc43aede0e4e Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Fri, 29 Jul 2022 11:38:25 +0800
Subject: [PATCH] =?UTF-8?q?(=E8=BF=98=E5=8E=9F=E4=BF=AE=E6=94=B9)fix-1940?=
 =?UTF-8?q?=20=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8A=A5=E9=94=99=E4=BA=86=E5=89=8D=E7=AB=AF=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E8=BF=98=E5=9C=A8=E6=B6=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/js/components/MinioUploader.vue | 40 +++++++++++----------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue
index e657f6f9f..167bb8c5a 100755
--- a/web_src/js/components/MinioUploader.vue
+++ b/web_src/js/components/MinioUploader.vue
@@ -135,10 +135,10 @@ export default {
     allUploadLength(len){
         if(len===this.uploadFiles.length){
           setTimeout(() => {
-            this.dropzoneUploader.removeAllFiles(true)
-            this.btnFlag = false
-            this.$emit('setcluster',this.btnFlag)
-          }, 2000);
+          this.dropzoneUploader.removeAllFiles(true)
+          this.btnFlag = false
+          this.$emit('setcluster',this.btnFlag)
+        }, 2000);
         }
     }
   },
@@ -254,7 +254,7 @@ export default {
             (currentChunk / chunks) *
             100
           ).toFixed(2)}% (${currentChunk}/${chunks})`;
-          // this.updateProgress(file, ((currentChunk / chunks) * 100).toFixed(2));
+          this.updateProgress(file, ((currentChunk / chunks) * 100).toFixed(2));
           loadMd5Next();
           return;
         }
@@ -265,7 +265,7 @@ export default {
             file.size
           } 用时：${(new Date().getTime() - time) / 1000} s`
         );
-        // this.updateProgress(file,100)
+        this.updateProgress(file,100)
         spark.destroy(); // 释放缓存
         file.uniqueIdentifier = md5; // 将文件md5赋值给文件唯一标识
         file.cmd5 = false; // 取消计算md5状态
@@ -297,11 +297,11 @@ export default {
             file.chunks = '';
             this.multipartUpload(file);
           } else {
-            // 失败如何处理
-            let info = "上传失败"
-            this.allUploadLength++
-            this.uploadError(file,info)
-            this.allUploadFiles.push({name:file.name,status:2,info:info})
+          // 失败如何处理
+          let info = "上传失败"
+          this.allUploadLength++
+          this.uploadError(file,info)
+          this.allUploadFiles.push({name:file.name,status:2,info:info})
             return;
           }
           return;
@@ -321,16 +321,12 @@ export default {
               this.uploadError(file,info)
               this.allUploadLength++
               this.allUploadFiles.push({name:file.name,status:1,info:info})
-              return;
             }
-          }          
+          }
           console.log('文件已上传完成');
-          this.allUploadLength++
-          this.allUploadFiles.push({name:file.name,status:0,info:'上传成功'})
-          this.updateProgress(file, 100);
           this.progress = 100;
           this.status = this.dropzoneParams.data('upload-complete');
-          this.finishUpload(file);
+          // this.finishUpload(file);
         } else {
         // 断点续传
           this.multipartUpload(file);
@@ -338,10 +334,6 @@ export default {
       } catch (error) {
         this.emitDropzoneFailed(file);
         console.log(error);
-        let info = "上传失败"
-        this.allUploadLength++
-        this.uploadError(file,info)
-        this.allUploadFiles.push({name:file.name,status:2,info:info})
       }
 
       async function addAttachment(file) {
@@ -511,7 +503,6 @@ export default {
           console.log(error);
           //this.emitDropzoneFailed(file);
           //console.log(error);
-          throw error;
         }
       }
 
@@ -547,11 +538,6 @@ export default {
           await uploadChunk(e);
         }catch(err){
           console.log(err)
-          let info = "上传失败"
-          this.allUploadLength++
-          this.uploadError(file,info)
-          this.allUploadFiles.push({name:file.name,status:2,info:info});
-          return;
         }
         
         fileReader.abort();