From 42c1ea3c89c3bc335c19eb33f9a9b352e2807d15 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 01 四月 2025 19:14:59 +0800
Subject: [PATCH] 添加新群号：287842588
---
src/components/ImageUpload/index.vue | 91 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 36 deletions(-)
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index f30eeab..90999e1 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="component-upload-image">
<el-upload
+ multiple
:action="uploadImgUrl"
list-type="picture-card"
:on-success="handleUploadSuccess"
@@ -8,8 +9,8 @@
:limit="limit"
:on-error="handleUploadError"
:on-exceed="handleExceed"
- name="file"
- :on-remove="handleRemove"
+ ref="imageUpload"
+ :before-remove="handleDelete"
:show-file-list="true"
:headers="headers"
:file-list="fileList"
@@ -46,6 +47,7 @@
<script setup>
import { getToken } from "@/utils/auth";
+import { isExternal } from "@/utils/validate";
const props = defineProps({
modelValue: [String, Object, Array],
@@ -73,6 +75,8 @@
const { proxy } = getCurrentInstance();
const emit = defineEmits();
+const number = ref(0);
+const uploadList = ref([]);
const dialogImageUrl = ref("");
const dialogVisible = ref(false);
const baseUrl = import.meta.env.VITE_APP_BASE_API;
@@ -90,7 +94,7 @@
// 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
fileList.value = list.map(item => {
if (typeof item === "string") {
- if (item.indexOf(baseUrl) === -1) {
+ if (item.indexOf(baseUrl) === -1 && !isExternal(item)) {
item = { name: baseUrl + item, url: baseUrl + item };
} else {
item = { name: item, url: item };
@@ -102,23 +106,7 @@
fileList.value = [];
return [];
}
-});
-
-// 鍒犻櫎鍥剧墖
-function handleRemove(file, files) {
- const findex = fileList.value.map(f => f.name).indexOf(file.name);
- if (findex > -1) {
- fileList.value.splice(findex, 1);
- emit("update:modelValue", listToString(fileList.value));
- }
-}
-
-// 涓婁紶鎴愬姛鍥炶皟
-function handleUploadSuccess(res) {
- fileList.value.push({ name: res.fileName, url: res.fileName });
- emit("update:modelValue", listToString(fileList.value));
- proxy.$modal.closeLoading();
-}
+},{ deep: true, immediate: true });
// 涓婁紶鍓峫oading鍔犺浇
function handleBeforeUpload(file) {
@@ -137,9 +125,11 @@
isImg = file.type.indexOf("image") > -1;
}
if (!isImg) {
- proxy.$modal.msgError(
- `鏂囦欢鏍煎紡涓嶆纭�, 璇蜂笂浼�${props.fileType.join("/")}鍥剧墖鏍煎紡鏂囦欢!`
- );
+ proxy.$modal.msgError(`鏂囦欢鏍煎紡涓嶆纭紝璇蜂笂浼�${props.fileType.join("/")}鍥剧墖鏍煎紡鏂囦欢!`);
+ return false;
+ }
+ if (file.name.includes(',')) {
+ proxy.$modal.msgError('鏂囦欢鍚嶄笉姝ｇ‘锛屼笉鑳藉寘鍚嫳鏂囬�楀彿!');
return false;
}
if (props.fileSize) {
@@ -149,7 +139,8 @@
return false;
}
}
- proxy.$modal.loading("涓婁紶涓�");
+ proxy.$modal.loading("姝ｅ湪涓婁紶鍥剧墖锛岃绋嶅��...");
+ number.value++;
}
// 鏂囦欢涓暟瓒呭嚭
@@ -157,9 +148,44 @@
proxy.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
}
+// 涓婁紶鎴愬姛鍥炶皟
+function handleUploadSuccess(res, file) {
+ if (res.code === 200) {
+ uploadList.value.push({ name: res.fileName, url: res.fileName });
+ uploadedSuccessfully();
+ } else {
+ number.value--;
+ proxy.$modal.closeLoading();
+ proxy.$modal.msgError(res.msg);
+ proxy.$refs.imageUpload.handleRemove(file);
+ uploadedSuccessfully();
+ }
+}
+
+// 鍒犻櫎鍥剧墖
+function handleDelete(file) {
+ const findex = fileList.value.map(f => f.name).indexOf(file.name);
+ if (findex > -1 && uploadList.value.length === number.value) {
+ fileList.value.splice(findex, 1);
+ emit("update:modelValue", listToString(fileList.value));
+ return false;
+ }
+}
+
+// 涓婁紶缁撴潫澶勭悊
+function uploadedSuccessfully() {
+ if (number.value > 0 && uploadList.value.length === number.value) {
+ fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
+ uploadList.value = [];
+ number.value = 0;
+ emit("update:modelValue", listToString(fileList.value));
+ proxy.$modal.closeLoading();
+ }
+}
+
// 涓婁紶澶辫触
function handleUploadError() {
- proxy.$modal.msgError("涓婁紶澶辫触");
+ proxy.$modal.msgError("涓婁紶鍥剧墖澶辫触");
proxy.$modal.closeLoading();
}
@@ -174,7 +200,9 @@
let strs = "";
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) : "";
}
@@ -183,15 +211,6 @@
<style scoped lang="scss">
// .el-upload--picture-card 鎺у埗鍔犲彿閮ㄥ垎
:deep(.hide .el-upload--picture-card) {
- display: none;
-}
-// 鍘绘帀鍔ㄧ敾鏁堟灉
-:deep(.el-list-enter-active),
-:deep(.el-list-leave-active) {
- transition: all 0s;
-}
-:deep(.el-list-enter, .el-list-leave-active) {
- opacity: 0;
- transform: translateY(0);
+ display: none;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3