From e6f98d4a2dd96752b17506bcab9ca7bb94297fc9 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: Wed, 27 Sep 2023 17:47:09 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FileUpload/index.vue  | 18 ++++++++--------
 src/components/ImageUpload/index.vue | 32 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index d7bf228..e43030e 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -26,16 +26,16 @@
       <!-- 上传按钮 -->
       <el-button type="primary" icon="upload" v-if="!drag">选取文件</el-button>
       <!-- 上传提示 -->
-      <template #tip>
+      <template v-slot:tip>
         <div class="el-upload__tip" v-if="showTip">
-          请上传
-          <template v-if="fileSize">
-            大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
-          </template>
-          <template v-if="fileType && fileType.length > 0">
-            格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
-          </template>
-          的文件
+          <slot name="tip">
+            <template v-if="fileSize">
+              大小不超过 <b class="text-danger">{{ fileSize }}MB</b>
+            </template>
+            <template v-if="fileType">
+              格式为 <b class="text-danger">{{ fileType.join('/') }}</b>
+            </template>
+          </slot>
         </div>
       </template>
     </el-upload>
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index c7bd209..0d4c18c 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -2,6 +2,7 @@
   <div class="component-upload-image">
     <el-upload
       multiple
+      v-bind="$attrs"
       :action="uploadImgUrl"
       list-type="picture-card"
       :on-success="handleUploadSuccess"
@@ -10,7 +11,7 @@
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       name="file"
-      :data="data"
+      :data="uploadData"
       :on-remove="handleRemove"
       :show-file-list="true"
       :headers="headers"
@@ -18,18 +19,20 @@
       :on-preview="handlePictureCardPreview"
       :class="{ hide: fileList.length >= limit }">
       <el-icon class="avatar-uploader-icon"><plus /></el-icon>
+
+      <template v-slot:tip>
+        <div class="el-upload__tip" v-if="showTip">
+          <slot name="tip">
+            <template v-if="fileSize">
+              大小不超过 <b class="text-danger">{{ fileSize }}MB</b>
+            </template>
+            <template v-if="fileType">
+              格式为 <b class="text-danger">{{ fileType.join('/') }}</b>
+            </template>
+          </slot>
+        </div>
+      </template>
     </el-upload>
-    <!-- 上传提示 -->
-    <div class="el-upload__tip" v-if="showTip">
-      请上传
-      <template v-if="fileSize">
-        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
-      </template>
-      <template v-if="fileType">
-        格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
-      </template>
-      的文件
-    </div>
 
     <el-dialog v-model="dialogVisible" append-to-body>
       <el-form label-width="100px">
@@ -94,6 +97,7 @@ const uploadImgUrl = ref(baseUrl + import.meta.env.VITE_APP_UPLOAD_URL) // 上
 const headers = ref({ Authorization: 'Bearer ' + getToken() })
 const fileList = ref([])
 const showTip = computed(() => props.isShowTip && (props.fileType || props.fileSize))
+const uploadData = computed(() => props.data)
 
 watch(
   () => props.modelValue,
@@ -104,11 +108,7 @@ watch(
       // 然后将数组转为对象数组
       fileList.value = list.map((item) => {
         if (typeof item === 'string') {
-          // if (item.indexOf(baseUrl) === -1) {
-          //   item = { name: baseUrl + item, url: baseUrl + item }
-          // } else {
           item = { name: item, url: item }
-          // }
         }
         return item
       })