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/FileUpload/index.vue | 128 ++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 56 deletions(-)
diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue
index 6825555..200b75c 100644
--- a/ruoyi-ui/src/components/FileUpload/index.vue
+++ b/ruoyi-ui/src/components/FileUpload/index.vue
@@ -5,6 +5,7 @@
:action="uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
+ :data="data"
:limit="limit"
:on-error="handleUploadError"
:on-exceed="handleExceed"
@@ -13,6 +14,7 @@
:headers="headers"
class="upload-file-uploader"
ref="fileUpload"
+ v-if="!disabled"
>
<!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button>
@@ -32,7 +34,7 @@
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
</el-link>
<div class="ele-upload-list__item-content-action">
- <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+ <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled">删除</el-link>
</div>
</li>
</transition-group>
@@ -40,63 +42,77 @@
</template>
<script>
-import { getToken } from "@/utils/auth";
+import { getToken } from "@/utils/auth"
export default {
name: "FileUpload",
props: {
// 值
value: [String, Object, Array],
+ // 上传接口地址
+ action: {
+ type: String,
+ default: "/file/upload"
+ },
+ // 上传携带的参数
+ data: {
+ type: Object
+ },
// 数量限制
limit: {
type: Number,
- default: 5,
+ default: 5
},
// 大小限制(MB)
fileSize: {
type: Number,
- default: 5,
+ default: 5
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
- default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+ default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"]
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
+ },
+ // 禁用组件（仅查看文件）
+ disabled: {
+ type: Boolean,
+ default: false
}
},
data() {
return {
number: 0,
uploadList: [],
- uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+ uploadFileUrl: process.env.VUE_APP_BASE_API + this.action, // 上传文件服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: [],
- };
+ }
},
watch: {
value: {
handler(val) {
if (val) {
- let temp = 1;
+ let temp = 1
// 首先将值转为数组
- 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 }
}
- item.uid = item.uid || new Date().getTime() + temp++;
- return item;
- });
+ item.uid = item.uid || new Date().getTime() + temp++
+ return item
+ })
} else {
- this.fileList = [];
- return [];
+ this.fileList = []
+ return []
}
},
deep: true,
@@ -106,7 +122,7 @@
computed: {
// 是否显示提示
showTip() {
- return this.isShowTip && (this.fileType || this.fileSize);
+ return this.isShowTip && (this.fileType || this.fileSize)
},
},
methods: {
@@ -114,88 +130,88 @@
handleBeforeUpload(file) {
// 校检文件类型
if (this.fileType) {
- let fileExtension = "";
- if (file.name.lastIndexOf(".") > -1) {
- fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
- }
- const isTypeOk = this.fileType.some((type) => {
- if (file.type.indexOf(type) > -1) return true;
- if (fileExtension && fileExtension.indexOf(type) > -1) return true;
- return false;
- });
+ const fileName = file.name.split('.')
+ const fileExt = fileName[fileName.length - 1]
+ const isTypeOk = this.fileType.indexOf(fileExt) >= 0
if (!isTypeOk) {
- this.$modal.msgError(`文件格式不正确, 请上传${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.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
- return false;
+ this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`)
+ return false
}
}
- this.$modal.loading("正在上传文件，请稍候...");
- this.number++;
- return true;
+ this.$modal.loading("正在上传文件，请稍候...")
+ this.number++
+ return true
},
// 文件个数超出
handleExceed() {
- this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
+ this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`)
},
// 上传失败
handleUploadError(err) {
- this.$modal.msgError("上传图片失败，请重试");
+ this.$modal.msgError("上传文件失败，请重试")
this.$modal.closeLoading()
},
// 上传成功回调
handleUploadSuccess(res, file) {
if (res.code === 200) {
- this.uploadList.push({ name: res.data.url, url: res.data.url });
- this.uploadedSuccessfully();
+ 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.fileUpload.handleRemove(file);
- this.uploadedSuccessfully();
+ this.number--
+ this.$modal.closeLoading()
+ this.$modal.msgError(res.msg)
+ this.$refs.fileUpload.handleRemove(file)
+ this.uploadedSuccessfully()
}
},
// 删除文件
handleDelete(index) {
- this.fileList.splice(index, 1);
- this.$emit("input", this.listToString(this.fileList));
+ this.fileList.splice(index, 1)
+ this.$emit("input", this.listToString(this.fileList))
},
// 上传结束处理
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();
+ this.fileList = this.fileList.concat(this.uploadList)
+ this.uploadList = []
+ this.number = 0
+ this.$emit("input", this.listToString(this.fileList))
+ this.$modal.closeLoading()
}
},
// 获取文件名称
getFileName(name) {
+ // 如果是url那么取最后的名字 如果不是直接返回
if (name.lastIndexOf("/") > -1) {
- return name.slice(name.lastIndexOf("/") + 1);
+ return name.slice(name.lastIndexOf("/") + 1)
} else {
- return "";
+ return name
}
},
// 对象转成指定字符串分隔
listToString(list, separator) {
- let strs = "";
- separator = separator || ",";
+ let strs = ""
+ separator = separator || ","
for (let i in list) {
- strs += list[i].url + separator;
+ strs += list[i].url + separator
}
- return strs != '' ? strs.substr(0, strs.length - 1) : '';
+ return strs != '' ? strs.substr(0, strs.length - 1) : ''
}
}
-};
+}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3