优化图片上传

src/components/ImageUpload/index.vue

@@ -1,38 +1,52 @@
 <template>
-  <el-upload :action="uploadImgUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload" :on-exceed="handleExceed"
+  <div class="component-upload-image">
-    :on-remove="handleRemove" :on-error="handleUploadError" name="file" :show-file-list="true" :limit="limit" :file-list="fileList"
+    <el-upload
-    :on-preview="handlePictureCardPreview" :class="{hide: fileList.length >= limit}" list-type="picture-card" :headers="headers">
+      multiple
-    <el-icon class="el-icon--upload">
+      :action="uploadImgUrl"
-      <Plus />
+      list-type="picture-card"
-    </el-icon>
+      :on-success="handleUploadSuccess"
+      :before-upload="handleBeforeUpload"
+      :limit="limit"
+      :on-error="handleUploadError"
+      :on-exceed="handleExceed"
+      name="file"
+      :data="data"
+      :on-remove="handleRemove"
+      :show-file-list="true"
+      :headers="headers"
+      :file-list="fileList"
+      :on-preview="handlePictureCardPreview"
+      :class="{ hide: fileList.length >= limit }"
+    >
+      <el-icon class="avatar-uploader-icon"><plus /></el-icon>
+    </el-upload>
     <!-- 上传提示 -->
-    <template #tip>
+    <div class="el-upload__tip" v-if="showTip">
-      <div class="el-upload__tip">
       请上传
-        <template v-if="fileSize">大小不超过<b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+      <template v-if="fileSize">
-        <template v-if="fileType">格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+        大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
+      </template>
+      <template v-if="fileType">
+        格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b>
+      </template>
       的文件
     </div>
-    </template>
+
-  </el-upload>
+    <el-dialog v-model="dialogVisible" title="预览" width="800px" append-to-body>
-  <el-dialog v-model="dialogVisible" title="预览" width="800" append-to-body>
       <img :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto" />
     </el-dialog>
+  </div>
 </template>
 
-<script>
+<script setup>
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth'
-import { getCurrentInstance, watch } from "vue";
 
-export default {
+const props = defineProps({
-  name: "uploadImage",
-  emits: ["input"],
-  props: {
   modelValue: [String, Object, Array],
   // 图片数量限制
   limit: {
     type: Number,
-      default: 1,
+    default: 5,
   },
   // 大小限制(MB)
   fileSize: {
@@ -42,149 +56,131 @@ export default {
   // 文件类型, 例如['png', 'jpg', 'jpeg']
   fileType: {
     type: Array,
-      default: () => ["png", "jpg", "jpeg"],
+    default: () => ['png', 'jpg', 'jpeg'],
   },
   // 是否显示提示
   isShowTip: {
     type: Boolean,
     default: true,
   },
-    // 上传地址
+  // 上传携带的参数
-    uploadUrl: {
+  data: {
-      type: String,
+    type: Object,
-      default: import.meta.env.VITE_APP_UPLOAD_URL ?? "/Common/UploadFile",
   },
-    column: [String],
+})
-  },
-  setup(props, ctx) {
-    const { proxy } = getCurrentInstance();
 
-    const dialogImageUrl = ref("");
+const { proxy } = getCurrentInstance()
-    const dialogVisible = ref(false);
+const emit = defineEmits()
-    const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const number = ref(0)
-    const uploadImgUrl = ref(baseUrl + props.uploadUrl); // 上传的图片服务器地址
+const uploadList = ref([])
-    const headers = ref({ Authorization: "Bearer " + getToken() });
+const dialogImageUrl = ref('')
-    const fileList = ref([]);
+const dialogVisible = ref(false)
-    const showTip = computed(
+const baseUrl = import.meta.env.VITE_APP_BASE_API
-      () => props.isShowTip && (props.fileType || props.fileSize)
+const uploadImgUrl = ref(baseUrl + import.meta.env.VITE_APP_UPLOAD_URL ?? '/Common/UploadFile') // 上传的图片服务器地址
-    );
+const headers = ref({ Authorization: 'Bearer ' + getToken() })
+const fileList = ref([])
+const showTip = computed(() => props.isShowTip && (props.fileType || props.fileSize))
 
-    watch(
+watch(
   () => props.modelValue,
   (val) => {
     if (val) {
       // 首先将值转为数组
-          const list = Array.isArray(val) ? val : props.modelValue.split(",");
+      const list = Array.isArray(val) ? val : props.modelValue.split(',')
       // 然后将数组转为对象数组
       fileList.value = list.map((item) => {
-            if (typeof item === "string") {
+        if (typeof item === 'string') {
-              item = { name: item, url: item };
+          if (item.indexOf(baseUrl) === -1) {
-            }
+            item = { name: baseUrl + item, url: baseUrl + item }
-            return item;
-          });
           } else {
-          fileList.value = [];
+            item = { name: item, url: item }
-          return [];
+          }
+        }
+        return item
+      })
+    } else {
+      fileList.value = []
+      return []
     }
   },
-      {
+  { deep: true, immediate: true },
-        immediate: true,
+)
-        deep: true,
-      }
-    );
 
-    // 删除图片
+// 删除图片
-    function handleRemove(file, files) {
+function handleRemove(file, files) {
-      const findex = fileList.value.map((f) => f.name).indexOf(file.name);
+  emit('update:modelValue', listToString(fileList.value))
-      if (findex > -1) {
+}
-        fileList.value.splice(findex, 1);
-        ctx.emit("input", props.column, listToString(fileList.value));
-      }
-    }
 
-    // 上传成功回调
+// 上传成功回调
-    function handleUploadSuccess(res) {
+function handleUploadSuccess(res) {
-      console.log(res);
+  uploadList.value.push({ name: res.data.fileName, url: res.data.url })
-      fileList.value.push({ name: res.data.fileName, url: res.data.url });
+  if (uploadList.value.length === number.value) {
-      ctx.emit("input", props.column, listToString(fileList.value));
+    fileList.value = fileList.value.concat(uploadList.value)
-      proxy.$modal.closeLoading();
+    uploadList.value = []
+    number.value = 0
+    emit('update:modelValue', listToString(fileList.value))
+		// emit('success', listToString(fileList.value))
+    proxy.$modal.closeLoading()
   }
+}
 
-    // 上传前loading加载
+// 上传前loading加载
-    function handleBeforeUpload(file) {
+function handleBeforeUpload(file) {
-      let isImg = false;
+  let isImg = false
   if (props.fileType.length) {
-        let fileExtension = "";
+    let fileExtension = ''
-        if (file.name.lastIndexOf(".") > -1) {
+    if (file.name.lastIndexOf('.') > -1) {
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+      fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1)
     }
     isImg = props.fileType.some((type) => {
-          if (file.type.indexOf(type) > -1) return true;
+      if (file.type.indexOf(type) > -1) return true
-          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+      if (fileExtension && fileExtension.indexOf(type) > -1) return true
-          return false;
+      return false
-        });
+    })
   } else {
-        isImg = file.type.indexOf("image") > -1;
+    isImg = file.type.indexOf('image') > -1
   }
   if (!isImg) {
-        proxy.$modal.msgError(
+    proxy.$modal.msgError(`文件格式不正确, 请上传${props.fileType.join('/')}图片格式文件!`)
-          `文件格式不正确, 请上传${props.fileType.join("/")}图片格式文件!`
+    return false
-        );
-        return false;
   }
   if (props.fileSize) {
-        const isLt = file.size / 1024 / 1024 < props.fileSize;
+    const isLt = file.size / 1024 / 1024 < props.fileSize
     if (!isLt) {
-          proxy.$modal.msgError(
+      proxy.$modal.msgError(`上传头像图片大小不能超过 ${props.fileSize} MB!`)
-            `上传头像图片大小不能超过 ${props.fileSize} MB!`
+      return false
-          );
-          return false;
     }
   }
-      proxy.$modal.loading("上传中");
+  proxy.$modal.loading('正在上传图片，请稍候...')
-    }
+  number.value++
+}
 
-    // 文件个数超出
+// 文件个数超出
-    function handleExceed() {
+function handleExceed() {
-      proxy.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`);
+  proxy.$modal.msgError(`上传文件数量不能超过 ${props.limit} 个!`)
-    }
+}
 
-    // 上传失败
+// 上传失败
-    function handleUploadError() {
+function handleUploadError() {
-      proxy.$modal.msgError("上传失败");
+  proxy.$modal.msgError('上传图片失败')
-      proxy.$modal.closeLoading();
+  proxy.$modal.closeLoading()
-    }
+}
 
-    // 预览
+// 预览
-    function handlePictureCardPreview(file) {
+function handlePictureCardPreview(file) {
-      dialogImageUrl.value = file.url;
+  dialogImageUrl.value = file.url
-      dialogVisible.value = true;
+  dialogVisible.value = true
-    }
+}
 
-    // 对象转成指定字符串分隔
+// 对象转成指定字符串分隔
-    function listToString(list, separator) {
+function listToString(list, separator) {
-      let strs = "";
+  let strs = ''
-      separator = separator || ",";
+  separator = separator || ','
   for (let i in list) {
-        strs += list[i].url.replace(baseUrl, "") + separator;
+    if (undefined !== list[i].url && list[i].url.indexOf('blob:') !== 0) {
+      strs += list[i].url.replace(baseUrl, '') + separator
     }
-      return strs != "" ? strs.substr(0, strs.length - 1) : "";
   }
-
+  return strs != '' ? strs.substr(0, strs.length - 1) : ''
-    return {
+}
-      dialogImageUrl,
-      dialogVisible,
-      uploadImgUrl,
-      headers,
-      fileList,
-      showTip,
-      handleRemove,
-      handleUploadSuccess,
-      handleBeforeUpload,
-      handleExceed,
-      handleUploadError,
-      handlePictureCardPreview,
-    };
-  },
-};
 </script>