From a2dd3ee236f022a0c5606f6be362e71a3257a559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 15 Dec 2022 14:57:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6=E9=80=89=E6=8B=A9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=AA=E5=93=8D=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue  | 26 +++++++++++++-------------
 src/components/ImageUpload/index.vue |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index e727e2b..fc4f86f 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -4,7 +4,7 @@
       multiple
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
-      :file-list="fileList"
+      v-model:file-list="fileList"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
@@ -15,8 +15,7 @@
       :headers="headers"
       :auto-upload="autoUpload"
       class="upload-file-uploader"
-      ref="upload"
-    >
+      ref="upload">
       <!-- 拖拽上传 -->
       <template v-if="drag">
         <el-icon class="el-icon--upload">
@@ -63,37 +62,37 @@ const props = defineProps({
   // 数量限制
   limit: {
     type: Number,
-    default: 5,
+    default: 5
   },
   // 大小限制(MB)
   fileSize: {
     type: Number,
-    default: 5,
+    default: 5
   },
   // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileType: {
     type: Array,
-    default: () => ['doc', 'xls', 'ppt', 'txt', 'pdf'],
+    default: () => ['doc', 'xls', 'ppt', 'txt', 'pdf']
   },
   // 是否显示提示
   isShowTip: {
     type: Boolean,
-    default: true,
+    default: true
   },
   // 是否拖拽
   drag: {
     type: Boolean,
-    default: false,
+    default: false
   },
   // 自动上传
   autoUpload: {
     type: Boolean,
-    default: true,
+    default: true
   },
   // 上传携带的参数
   data: {
-    type: Object,
-  },
+    type: Object
+  }
 })
 
 const { proxy } = getCurrentInstance()
@@ -128,7 +127,7 @@ watch(
       return []
     }
   },
-  { deep: true, immediate: true },
+  { deep: true, immediate: true }
 )
 
 // 上传前校检格式和大小
@@ -170,6 +169,7 @@ function handleExceed() {
 // 上传失败
 function handleUploadError(err) {
   proxy.$modal.msgError('上传失败')
+  proxy.$modal.closeLoading()
 }
 
 // 上传成功回调
@@ -222,7 +222,7 @@ function submitUpload() {
   proxy.$refs.upload.submit()
 }
 defineExpose({
-  submitUpload,
+  submitUpload
 })
 </script>
 
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 33cc4be..29db740 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -14,7 +14,7 @@
       :on-remove="handleRemove"
       :show-file-list="true"
       :headers="headers"
-      :file-list="fileList"
+      v-model:file-list="fileList"
       :on-preview="handlePictureCardPreview"
       :class="{ hide: fileList.length >= limit }">
       <el-icon class="avatar-uploader-icon"><plus /></el-icon>