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/ImageUpload/index.vue | 26 ++++----------------------
src/components/FileUpload/index.vue | 4 +++-
2 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 38f802b..68967d7 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -170,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) : '';
}
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 01d9392..a4e4b03 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -109,11 +109,7 @@
// 鍒犻櫎鍥剧墖
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));
- }
+ emit("update:modelValue", listToString(fileList.value));
}
// 涓婁紶鎴愬姛鍥炶皟
@@ -183,24 +179,10 @@
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) : "";
}
</script>
-
-<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);
-}
-</style>
\ No newline at end of file
--
Gitblit v1.9.3