From 48161b9e95b9edeecfd54883509ce42667127200 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Tue, 2 Nov 2021 14:35:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUpload/index.vue  | 24 ++++++++++++------------
 src/components/ImagesUpload/index.vue | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 58e13b52..ed6c93f5 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -31,9 +31,9 @@
                     </div>
                 </div>
             </div>
-            <div v-show="data.progress.percent" class="progress" :style="`width:${width}px;height:${height}px;`">
-                <el-image :src="data.progress.preview" :style="`width:${width}px;height:${height}px;`" fit="fill" />
-                <el-progress type="circle" :width="Math.min(width, height) * 0.8" :percentage="data.progress.percent" />
+            <div v-show="uploadData.progress.percent" class="progress" :style="`width:${width}px;height:${height}px;`">
+                <el-image :src="uploadData.progress.preview" :style="`width:${width}px;height:${height}px;`" fit="fill" />
+                <el-progress type="circle" :width="Math.min(width, height) * 0.8" :percentage="uploadData.progress.percent" />
             </div>
         </el-upload>
         <div v-if="!notip" class="el-upload__tip">
@@ -41,7 +41,7 @@
                 <el-alert :title="`上传图片支持 ${ ext.join(' / ') } 格式，且图片大小不超过 ${ size }MB，建议图片尺寸为 ${width}*${height}`" type="info" show-icon :closable="false" />
             </div>
         </div>
-        <el-image-viewer v-if="data.imageViewerVisible" :url-list="[url]" @close="previewClose" />
+        <el-image-viewer v-if="uploadData.imageViewerVisible" :url-list="[url]" @close="previewClose" />
     </div>
 </template>
 
@@ -97,7 +97,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:url', 'on-success'])
 
-const data = ref({
+const uploadData = ref({
     imageViewerVisible: false,
     progress: {
         preview: '',
@@ -107,11 +107,11 @@ const data = ref({
 
 // 预览
 function preview() {
-    data.value.imageViewerVisible = true
+    uploadData.value.imageViewerVisible = true
 }
 // 关闭预览
 function previewClose() {
-    data.value.imageViewerVisible = false
+    uploadData.value.imageViewerVisible = false
 }
 // 移除
 function remove() {
@@ -129,16 +129,16 @@ function beforeUpload(file) {
         proxy.$message.error(`上传图片大小不能超过 ${props.size}MB！`)
     }
     if (isTypeOk && isSizeOk) {
-        data.value.progress.preview = URL.createObjectURL(file)
+        uploadData.value.progress.preview = URL.createObjectURL(file)
     }
     return isTypeOk && isSizeOk
 }
 function onProgress(file) {
-    data.value.progress.percent = ~~file.percent
-    if (data.value.progress.percent == 100) {
+    uploadData.value.progress.percent = ~~file.percent
+    if (uploadData.value.progress.percent == 100) {
         setTimeout(() => {
-            data.value.progress.preview = ''
-            data.value.progress.percent = 0
+            uploadData.value.progress.preview = ''
+            uploadData.value.progress.percent = 0
         }, 1000)
     }
 }
diff --git a/src/components/ImagesUpload/index.vue b/src/components/ImagesUpload/index.vue
index a90f834d..14be548b 100644
--- a/src/components/ImagesUpload/index.vue
+++ b/src/components/ImagesUpload/index.vue
@@ -35,9 +35,9 @@
             <div class="image-slot" :style="`width:${width}px;height:${height}px;`">
                 <i class="el-icon-plus" />
             </div>
-            <div v-show="data.progress.percent" class="progress" :style="`width:${width}px;height:${height}px;`">
-                <el-image :src="data.progress.preview" :style="`width:${width}px;height:${height}px;`" fit="fill" />
-                <el-progress type="circle" :width="Math.min(width, height) * 0.8" :percentage="data.progress.percent" />
+            <div v-show="uploadData.progress.percent" class="progress" :style="`width:${width}px;height:${height}px;`">
+                <el-image :src="uploadData.progress.preview" :style="`width:${width}px;height:${height}px;`" fit="fill" />
+                <el-progress type="circle" :width="Math.min(width, height) * 0.8" :percentage="uploadData.progress.percent" />
             </div>
         </el-upload>
         <div v-if="!notip" class="el-upload__tip">
@@ -45,7 +45,7 @@
                 <el-alert :title="`上传图片支持 ${ ext.join(' / ') } 格式，单张图片大小不超过 ${ size }MB，建议图片尺寸为 ${width}*${height}，且图片数量不超过 ${ max } 张`" type="info" show-icon :closable="false" />
             </div>
         </div>
-        <el-image-viewer v-if="data.imageViewerVisible" :url-list="url" :initial-index="data.dialogImageIndex" @close="previewClose" />
+        <el-image-viewer v-if="uploadData.imageViewerVisible" :url-list="url" :initial-index="uploadData.dialogImageIndex" @close="previewClose" />
     </div>
 </template>
 
@@ -105,7 +105,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:url', 'on-success'])
 
-const data = ref({
+const uploadData = ref({
     dialogImageIndex: 0,
     imageViewerVisible: false,
     progress: {
@@ -116,12 +116,12 @@ const data = ref({
 
 // 预览
 function preview(index) {
-    data.value.dialogImageIndex = index
-    data.value.imageViewerVisible = true
+    uploadData.value.dialogImageIndex = index
+    uploadData.value.imageViewerVisible = true
 }
 // 关闭预览
 function previewClose() {
-    data.value.imageViewerVisible = false
+    uploadData.value.imageViewerVisible = false
 }
 // 移除
 function remove(index) {
@@ -152,15 +152,15 @@ function beforeUpload(file) {
         proxy.$message.error(`上传图片大小不能超过 ${props.size}MB！`)
     }
     if (isTypeOk && isSizeOk) {
-        data.value.progress.preview = URL.createObjectURL(file)
+        uploadData.value.progress.preview = URL.createObjectURL(file)
     }
     return isTypeOk && isSizeOk
 }
 function onProgress(file) {
-    data.value.progress.percent = ~~file.percent
-    if (data.value.progress.percent == 100) {
-        data.value.progress.preview = ''
-        data.value.progress.percent = 0
+    uploadData.value.progress.percent = ~~file.percent
+    if (uploadData.value.progress.percent == 100) {
+        uploadData.value.progress.preview = ''
+        uploadData.value.progress.percent = 0
     }
 }
 function onSuccess(res) {