From c117e4b087715640b77f18c5ff8835cb0d52616f Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 10 Feb 2022 20:33:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=80=E7=9B=B4=E5=87=BA=E7=8E=B0loading?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/components/ImgUpload.vue | 7 +++++-- resources/assets/js/components/MDEditor/index.vue | 7 +++++-- resources/assets/js/components/TEditor.vue | 7 +++++-- .../assets/js/pages/manage/components/DialogUpload.vue | 2 +- resources/assets/js/pages/manage/file.vue | 5 ++++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue index 34fdf1f2..5539164e 100755 --- a/resources/assets/js/components/ImgUpload.vue +++ b/resources/assets/js/components/ImgUpload.vue @@ -224,9 +224,12 @@ this.$refs.upload.fileList.splice(fileList.indexOf(item), 1); this.$emit('input', this.$refs.upload.fileList); }, - handleProgress() { + handleProgress(event, file) { //开始上传 - this.$emit('update:uploadIng', this.uploadIng + 1); + if (file._uploadIng === undefined) { + file._uploadIng = true; + this.$emit('update:uploadIng', this.uploadIng + 1); + } }, handleSuccess (res, file) { //上传完成 diff --git a/resources/assets/js/components/MDEditor/index.vue b/resources/assets/js/components/MDEditor/index.vue index 6b6c0a65..f18f2200 100755 --- a/resources/assets/js/components/MDEditor/index.vue +++ b/resources/assets/js/components/MDEditor/index.vue @@ -248,9 +248,12 @@ /********************文件上传部分************************/ - handleProgress() { + handleProgress(event, file) { //开始上传 - this.uploadIng++; + if (file._uploadIng === undefined) { + file._uploadIng = true; + this.uploadIng++; + } }, handleSuccess(res, file) { diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue index 8a0d2b94..ea15756e 100755 --- a/resources/assets/js/components/TEditor.vue +++ b/resources/assets/js/components/TEditor.vue @@ -474,9 +474,12 @@ /********************文件上传部分************************/ - handleProgress() { + handleProgress(event, file) { //开始上传 - this.uploadIng++; + if (file._uploadIng === undefined) { + file._uploadIng = true; + this.uploadIng++; + } }, handleSuccess(res, file) { diff --git a/resources/assets/js/pages/manage/components/DialogUpload.vue b/resources/assets/js/pages/manage/components/DialogUpload.vue index f160230d..d9b1be7a 100644 --- a/resources/assets/js/pages/manage/components/DialogUpload.vue +++ b/resources/assets/js/pages/manage/components/DialogUpload.vue @@ -79,7 +79,7 @@ export default { methods: { handleProgress(event, file) { //上传时 - if (typeof file.tempId === "undefined") { + if (file.tempId === undefined) { file.tempId = $A.randomString(8); this.$emit('on-progress', file); } diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index bfb298ed..70e64761 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -1206,7 +1206,10 @@ export default { handleProgress(event, file, fileList) { //开始上传 - this.uploadIng++; + if (file._uploadIng === undefined) { + file._uploadIng = true; + this.uploadIng++; + } this.uploadUpdate(fileList); },