上传组件兼容element-plus最新版本

master
RuoYi 3 years ago
parent 299e69968e
commit 59c114b6c0
  1. 4
      src/components/FileUpload/index.vue
  2. 26
      src/components/ImageUpload/index.vue

@ -170,7 +170,9 @@ function listToString(list, separator) {
let strs = ""; let strs = "";
separator = separator || ","; separator = separator || ",";
for (let i in list) { 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) : ''; return strs != '' ? strs.substr(0, strs.length - 1) : '';
} }

@ -109,11 +109,7 @@ watch(() => props.modelValue, val => {
// //
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);
emit("update:modelValue", listToString(fileList.value));
}
} }
// //
@ -183,24 +179,10 @@ function listToString(list, separator) {
let strs = ""; let strs = "";
separator = separator || ","; separator = separator || ",";
for (let i in list) { 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) : "";
} }
</script> </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>
Loading…
Cancel
Save