From 7b6fdb3a893275ff82ba5c868287a1e12dcd75f1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 27 Apr 2025 11:56:21 +0800
Subject: [PATCH] remove all semicolons
---
ruoyi-ui/src/components/ImageUpload/index.vue | 150 ++++++++++++++++++++++++++++++--------------------
1 files changed, 90 insertions(+), 60 deletions(-)
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
index 0bf478e..338007f 100644
--- a/ruoyi-ui/src/components/ImageUpload/index.vue
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -1,15 +1,17 @@
<template>
<div class="component-upload-image">
<el-upload
+ multiple
:action="uploadImgUrl"
list-type="picture-card"
:on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload"
+ :data="data"
:limit="limit"
:on-error="handleUploadError"
:on-exceed="handleExceed"
- name="file"
- :on-remove="handleRemove"
+ ref="imageUpload"
+ :on-remove="handleDelete"
:show-file-list="true"
:headers="headers"
:file-list="fileList"
@@ -18,7 +20,7 @@
>
<i class="el-icon-plus"></i>
</el-upload>
-
+
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
@@ -42,11 +44,20 @@
</template>
<script>
-import { getToken } from "@/utils/auth";
+import { getToken } from "@/utils/auth"
export default {
props: {
value: [String, Object, Array],
+ // 上传接口地址
+ action: {
+ type: String,
+ default: "/file/upload"
+ },
+ // 上传携带的参数
+ data: {
+ type: Object
+ },
// 图片数量限制
limit: {
type: Number,
@@ -70,32 +81,34 @@
},
data() {
return {
+ number: 0,
+ uploadList: [],
dialogImageUrl: "",
dialogVisible: false,
hideUpload: false,
- uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+ uploadImgUrl: process.env.VUE_APP_BASE_API + this.action, // 上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: []
- };
+ }
},
watch: {
value: {
handler(val) {
if (val) {
// 首先将值转为数组
- const list = Array.isArray(val) ? val : this.value.split(',');
+ const list = Array.isArray(val) ? val : this.value.split(',')
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
- item = { name: item, url: item };
+ item = { name: item, url: item }
}
- return item;
- });
+ return item
+ })
} else {
- this.fileList = [];
- return [];
+ this.fileList = []
+ return []
}
},
deep: true,
@@ -105,86 +118,103 @@
computed: {
// 是否显示提示
showTip() {
- return this.isShowTip && (this.fileType || this.fileSize);
+ return this.isShowTip && (this.fileType || this.fileSize)
},
},
methods: {
- // 删除图片
- handleRemove(file, fileList) {
- const findex = this.fileList.map(f => f.name).indexOf(file.name);
- this.fileList.splice(findex, 1);
- this.$emit("input", this.listToString(this.fileList));
- },
- // 上传成功回调
- handleUploadSuccess(res) {
- this.fileList.push({ name: res.data.url, url: res.data.url });
- this.$emit("input", this.listToString(this.fileList));
- this.loading.close();
- },
// 上传前loading加载
handleBeforeUpload(file) {
- let isImg = false;
+ let isImg = false
if (this.fileType.length) {
- let fileExtension = "";
+ let fileExtension = ""
if (file.name.lastIndexOf(".") > -1) {
- fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+ fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1)
}
isImg = this.fileType.some(type => {
- if (file.type.indexOf(type) > -1) return true;
- if (fileExtension && fileExtension.indexOf(type) > -1) return true;
- return false;
- });
+ if (file.type.indexOf(type) > -1) return true
+ if (fileExtension && fileExtension.indexOf(type) > -1) return true
+ return false
+ })
} else {
- isImg = file.type.indexOf("image") > -1;
+ isImg = file.type.indexOf("image") > -1
}
if (!isImg) {
- this.$message.error(
- `文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`
- );
- return false;
+ this.$modal.msgError(`文件格式不正确，请上传${this.fileType.join("/")}图片格式文件!`)
+ return false
+ }
+ if (file.name.includes(',')) {
+ this.$modal.msgError('文件名不正确，不能包含英文逗号!')
+ return false
}
if (this.fileSize) {
- const isLt = file.size / 1024 / 1024 < this.fileSize;
+ const isLt = file.size / 1024 / 1024 < this.fileSize
if (!isLt) {
- this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
- return false;
+ this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`)
+ return false
}
}
- this.loading = this.$loading({
- lock: true,
- text: "上传中",
- background: "rgba(0, 0, 0, 0.7)",
- });
+ this.$modal.loading("正在上传图片，请稍候...")
+ this.number++
},
// 文件个数超出
handleExceed() {
- this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+ this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`)
+ },
+ // 上传成功回调
+ handleUploadSuccess(res, file) {
+ if (res.code === 200) {
+ this.uploadList.push({ name: res.data.url, url: res.data.url })
+ this.uploadedSuccessfully()
+ } else {
+ this.number--
+ this.$modal.closeLoading()
+ this.$modal.msgError(res.msg)
+ this.$refs.imageUpload.handleRemove(file)
+ this.uploadedSuccessfully()
+ }
+ },
+ // 删除图片
+ handleDelete(file) {
+ const findex = this.fileList.map(f => f.name).indexOf(file.name)
+ if (findex > -1) {
+ this.fileList.splice(findex, 1)
+ this.$emit("input", this.listToString(this.fileList))
+ }
},
// 上传失败
handleUploadError() {
- this.$message({
- type: "error",
- message: "上传失败",
- });
- this.loading.close();
+ this.$modal.msgError("上传图片失败，请重试")
+ this.$modal.closeLoading()
+ },
+ // 上传结束处理
+ uploadedSuccessfully() {
+ if (this.number > 0 && this.uploadList.length === this.number) {
+ this.fileList = this.fileList.concat(this.uploadList)
+ this.uploadList = []
+ this.number = 0
+ this.$emit("input", this.listToString(this.fileList))
+ this.$modal.closeLoading()
+ }
},
// 预览
handlePictureCardPreview(file) {
- this.dialogImageUrl = file.url;
- this.dialogVisible = true;
+ this.dialogImageUrl = file.url
+ this.dialogVisible = true
},
// 对象转成指定字符串分隔
listToString(list, separator) {
- let strs = "";
- separator = separator || ",";
+ let strs = ""
+ separator = separator || ","
for (let i in list) {
- strs += list[i].url + separator;
+ if (list[i].url) {
+ strs += list[i].url.replace(this.baseUrl, "") + separator
+ }
}
- return strs != '' ? strs.substr(0, strs.length - 1) : '';
+ return strs != '' ? strs.substr(0, strs.length - 1) : ''
}
}
-};
+}
</script>
<style scoped lang="scss">
// .el-upload--picture-card 控制加号部分
@@ -198,8 +228,8 @@
}
::v-deep .el-list-enter, .el-list-leave-active {
- opacity: 0;
- transform: translateY(0);
+ opacity: 0;
+ transform: translateY(0);
}
</style>
--
Gitblit v1.9.3