From f3c59a17062fb0a89b5f89b7845341386952a6b1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 24 九月 2025 16:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/UploadFile.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/admin/src/components/common/UploadFile.vue b/admin/src/components/common/UploadFile.vue
index cf30d02..180ca08 100644
--- a/admin/src/components/common/UploadFile.vue
+++ b/admin/src/components/common/UploadFile.vue
@@ -2,7 +2,7 @@
<div>
<el-upload
class="upload-demo"
- :accept="uploadData.fileTyp"
+ :accept="uploadData.fileType"
:action="uploadImgUrl"
:limit="this.fileLength"
:on-exceed="handleExceed"
@@ -11,7 +11,12 @@
:before-upload="beforeFileUpload"
:file-list="fileList">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
- <div slot="tip" class="el-upload__tip" >鍙兘涓婁紶{{ this.fileLength }}涓枃浠讹紝鏁伴噺瓒呰繃璇峰垹闄ゅ凡浼犻檮浠堕噸鏂颁笂浼�</div>
+ <div slot="tip" class="el-upload__tip" >
+ 鍙兘涓婁紶{{ this.fileLength }}涓枃浠�,
+ {{uploadData.fileType?('鍙敮鎸佷笂浼犮��'+uploadData.fileType+'銆戠被鍨嬫枃浠�'):''}}
+ 鏂囦欢澶у皬涓嶈兘瓒呰繃30MB,
+ 鏁伴噺瓒呰繃璇峰垹闄ゅ凡浼犻檮浠堕噸鏂颁笂浼�
+ </div>
</el-upload>
</div>
@@ -67,9 +72,14 @@
//
beforeFileUpload(file) {
if(this.fileList && this.fileList.length >= this.fileLength){
- this.$message.error('鍙厑璁镐笂浼犮��'+this.fileLength+'w鏂囦欢銆�')
+ this.$message.error('鍙厑璁镐笂浼犮��'+this.fileLength+'涓枃浠躲��')
return false;
}
+ const isLt2M = file.size / 1024 / 1024 <= 30; // 妫�鏌ユ枃浠跺ぇ灏忔槸鍚﹀皬浜�30MB
+ if (!isLt2M) {
+ this.$message.error('涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 30MB!');
+ return false; // 涓嶅厑璁镐笂浼犺秴杩囨寚瀹氬ぇ灏忕殑鏂囦欢
+ }
this.$emit('uploadBegin')
return true
}
--
Gitblit v1.9.3