From 59c114b6c0adf877dd19fec814f4f43d2ea327f6 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 09 四月 2022 13:57:17 +0800
Subject: [PATCH] 上传组件兼容element-plus最新版本
---
src/components/FileUpload/index.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 706aa88..68967d7 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() });
@@ -92,7 +95,7 @@
fileList.value = [];
return [];
}
-});
+},{ deep: true, immediate: true });
// 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
function handleBeforeUpload(file) {
@@ -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 "";
}
@@ -160,7 +170,9 @@
let strs = "";
separator = separator || ",";
for (let i in list) {
- strs += list[i].url + separator;
+ if(undefined !== list[i].url) {
+ strs += list[i].url + separator;
+ }
}
return strs != '' ? strs.substr(0, strs.length - 1) : '';
}
--
Gitblit v1.9.3