xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-11-04 08:13:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ruoyi-vue/master' into dev

Browse Source 
# Conflicts:
#	ruoyi-ui/src/components/FileUpload/index.vue
This commit is contained in:
疯狂的狮子Li
2022-10-13 15:59:43 +08:00
parent 7d953c1a8b 6505432bf4
commit fde624998f
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-ui/src/components/FileUpload/index.vue
View File

@@ -74,7 +74,7 @@ export default {
number: 0, number: 0,
uploadList: [], uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传文件服务器地址
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
}, },
@@ -124,15 +124,9 @@ export default {
handleBeforeUpload(file) { handleBeforeUpload(file) {
// 校检文件类型 // 校检文件类型
if (this.fileType) { if (this.fileType) {
let fileExtension = ""; const fileName = file.name.split('.');
if (file.name.lastIndexOf(".") > -1) { const fileExt = fileName[fileName.length - 1];
fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1); const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
}
const isTypeOk = this.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
});
if (!isTypeOk) { if (!isTypeOk) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`); this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
return false; return false;
@@ -156,7 +150,7 @@ export default {
}, },
// 上传失败 // 上传失败
handleUploadError(err) { handleUploadError(err) {
this.$modal.msgError("上传图片失败，请重试"); this.$modal.msgError("上传文件失败，请重试");
this.$modal.closeLoading(); this.$modal.closeLoading();
}, },
// 上传成功回调 // 上传成功回调