From 8dc33219070784491a114a0148bab74acc634b71 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 25 二月 2022 11:50:03 +0800
Subject: [PATCH] 组件fileUpload支持多文件同时选择上传
---
src/components/ImageUpload/index.vue | 4 ++--
src/views/system/user/index.vue | 2 +-
src/components/FileUpload/index.vue | 20 +++++++++++++++-----
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 706aa88..ad1b36e 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="upload-file">
<el-upload
+ multiple
:action="uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
@@ -67,6 +68,8 @@
const { proxy } = getCurrentInstance();
const emit = defineEmits();
+const number = ref(0);
+const uploadList = ref([]);
const baseUrl = import.meta.env.VITE_APP_BASE_API;
const uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
const headers = ref({ Authorization: "Bearer " + getToken() });
@@ -120,6 +123,8 @@
return false;
}
}
+ proxy.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
+ number.value++;
return true;
}
@@ -130,14 +135,19 @@
// 涓婁紶澶辫触
function handleUploadError(err) {
- proxy.$modal.msgError("涓婁紶澶辫触");
+ proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
}
// 涓婁紶鎴愬姛鍥炶皟
function handleUploadSuccess(res, file) {
- proxy.$modal.msgSuccess("涓婁紶鎴愬姛");
- fileList.value.push({ name: res.fileName, url: res.fileName });
- emit("update:modelValue", listToString(fileList.value));
+ uploadList.value.push({ name: res.fileName, url: res.fileName });
+ if (uploadList.value.length === number.value) {
+ fileList.value = fileList.value.concat(uploadList.value);
+ uploadList.value = [];
+ number.value = 0;
+ emit("update:modelValue", listToString(fileList.value));
+ proxy.$modal.closeLoading();
+ }
}
// 鍒犻櫎鏂囦欢
@@ -149,7 +159,7 @@
// 鑾峰彇鏂囦欢鍚嶇О
function getFileName(name) {
if (name.lastIndexOf("/") > -1) {
- return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
+ return name.slice(name.lastIndexOf("/") + 1);
} else {
return "";
}
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index adc0428..0320855 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -157,7 +157,7 @@
return false;
}
}
- proxy.$modal.loading("涓婁紶涓�");
+ proxy.$modal.loading("姝ｅ湪涓婁紶鍥剧墖锛岃绋嶅��...");
number.value++;
}
@@ -168,7 +168,7 @@
// 涓婁紶澶辫触
function handleUploadError() {
- proxy.$modal.msgError("涓婁紶澶辫触");
+ proxy.$modal.msgError("涓婁紶鍥剧墖澶辫触");
proxy.$modal.closeLoading();
}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 367d147..3f988fa 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -413,7 +413,7 @@
userName: [{ required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, { min: 2, max: 20, message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }],
nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }],
- email: [{ type: "email", message: "'璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
+ email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
}
});
--
Gitblit v1.9.3