From 67d22d6e60593eef3ed59815d2a3578e46672505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Thu, 25 Jul 2024 14:53:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=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/Upload/FileUpload.vue   |  6 +-
 src/components/Upload/ImageUpload.vue  | 19 ++++---
 src/components/Upload/SingleUpload.vue | 77 --------------------------
 src/views/demo/upload.vue              | 44 ++++++++++-----
 4 files changed, 46 insertions(+), 100 deletions(-)
 delete mode 100644 src/components/Upload/SingleUpload.vue

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 76ab92f5..7c8251bd 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -108,7 +108,7 @@ const props = defineProps({
     default: true,
   },
   /**
-   * 单张图片最大大小
+   * 单个文件上传大小限制(单位byte)
    */
   uploadMaxSize: {
     type: Number,
@@ -154,7 +154,7 @@ const props = defineProps({
     },
   },
   /**
-   * 请求参数
+   * 请求携带的额外参数
    */
   data: {
     type: Object,
@@ -163,7 +163,7 @@ const props = defineProps({
     },
   },
   /**
-   * 上传文件字段名
+   * 上传文件的参数名
    */
   name: {
     type: String,
diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index d0a6a9cf..905cf00e 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -10,6 +10,7 @@
     :action="props.action"
     :headers="props.headers"
     :data="props.data"
+    :name="props.name"
     :on-success="handleSuccessFile"
     :on-error="handleError"
     :accept="props.accept"
@@ -17,7 +18,7 @@
   >
     <i-ep-plus />
     <template #file="{ file }">
-      <div>
+      <div style="width: 100%">
         <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
         <span class="el-upload-list__item-actions">
           <span class="el-upload-list__item-preview" @click="previewImg(file)">
@@ -84,7 +85,7 @@ const props = defineProps({
     },
   },
   /**
-   * 请求参数
+   * 请求携带的额外参数
    */
   data: {
     type: Object,
@@ -92,6 +93,13 @@ const props = defineProps({
       return {};
     },
   },
+  /**
+   * 上传文件的参数名
+   */
+  name: {
+    type: String,
+    default: "file",
+  },
   /**
    * 文件上传数量限制
    */
@@ -190,14 +198,11 @@ const handleError = (error: any) => {
  */
 function handleRemove(removeFile: UploadFile) {
   const filePath = removeFile.url;
-
   if (filePath) {
     FileAPI.deleteByPath(filePath).then(() => {
+      valFileList.value = valFileList.value.filter((x) => x !== filePath);
       // 删除成功回调
-      emit(
-        "update:modelValue",
-        fileList.value.map((file) => file.url)
-      );
+      emit("update:modelValue", valFileList.value);
     });
   }
 }
diff --git a/src/components/Upload/SingleUpload.vue b/src/components/Upload/SingleUpload.vue
deleted file mode 100644
index 5da8039a..00000000
--- a/src/components/Upload/SingleUpload.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <!-- 上传组件 -->
-  <el-upload
-    v-model="imgUrl"
-    class="single-uploader"
-    :show-file-list="false"
-    list-type="picture-card"
-    :before-upload="handleBeforeUpload"
-    :http-request="uploadFile"
-  >
-    <img v-if="imgUrl" :src="imgUrl" class="single-uploader__image" />
-    <el-icon v-else class="single-uploader__icon"><i-ep-plus /></el-icon>
-  </el-upload>
-</template>
-
-<script setup lang="ts">
-import { UploadRawFile, UploadRequestOptions } from "element-plus";
-import FileAPI from "@/api/file";
-
-const props = defineProps({
-  modelValue: {
-    type: String,
-    default: "",
-  },
-});
-
-const emit = defineEmits(["update:modelValue"]);
-const imgUrl = useVModel(props, "modelValue", emit);
-
-/**
- * 自定义图片上传
- *
- * @param options
- */
-async function uploadFile(options: UploadRequestOptions): Promise<any> {
-  const data = await FileAPI.upload(options.file);
-  imgUrl.value = data.url;
-}
-
-/**
- * 限制用户上传文件的格式和大小
- */
-function handleBeforeUpload(file: UploadRawFile) {
-  if (file.size > 2 * 1048 * 1048) {
-    ElMessage.warning("上传图片不能大于2M");
-    return false;
-  }
-  return true;
-}
-</script>
-
-<style scoped lang="scss">
-.single-uploader {
-  overflow: hidden;
-  cursor: pointer;
-  border: 1px var(--el-border-color) solid;
-  border-radius: 6px;
-
-  &:hover {
-    border-color: var(--el-color-primary);
-  }
-
-  &__image {
-    display: block;
-    width: 178px;
-    height: 178px;
-  }
-
-  &___icon {
-    width: 178px;
-    height: 178px;
-    font-size: 28px;
-    color: #8c939d;
-    text-align: center;
-  }
-}
-</style>
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index 23f8a857..cfeb16db 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -18,6 +18,30 @@ const imageUploadArgData = [
     default: "[]",
     desc: "已经上传的图片数组",
   },
+  {
+    argsName: "action",
+    type: "String",
+    default: "FileAPI.uploadUrl",
+    desc: "文件上传地址",
+  },
+  {
+    argsName: "headers",
+    type: "Object",
+    default: "{Authorization: localStorage.getItem(TOKEN_KEY),}",
+    desc: "提示文本类型",
+  },
+  {
+    argsName: "data",
+    type: "Object",
+    default: "{}",
+    desc: "请求携带的额外参数",
+  },
+  {
+    argsName: "name",
+    type: "String",
+    default: "file",
+    desc: "上传文件的参数名",
+  },
   {
     argsName: "limit",
     type: "Number",
@@ -36,18 +60,18 @@ const imageUploadArgData = [
     default: true,
     desc: "是否显示上传按钮",
   },
-  {
-    argsName: "accept",
-    type: "String",
-    default: "image/*",
-    desc: "上传文件类型",
-  },
   {
     argsName: "upload-max-size",
     type: "Number",
     default: "2 * 1024 * 1024",
     desc: "单个图片上传大小限制(单位byte)",
   },
+  {
+    argsName: "accept",
+    type: "String",
+    default: "image/*",
+    desc: "上传文件类型",
+  },
 ];
 
 const fileUrls = ref([
@@ -172,13 +196,7 @@ const fileUploadArgData = [
         </el-table>
       </el-form-item>
       <el-form-item label="文件上传">
-        <file-upload
-          v-model="fileUrls"
-          :showUploadBtn="true"
-          :showDelBtn="true"
-          :show-tip="false"
-          :limit="3"
-        />
+        <file-upload v-model="fileUrls" />
       </el-form-item>
       <el-form-item label="参数说明">
         <el-table :data="fileUploadArgData" border>