From f67241a72e48a90cbcca28acbc2ce9aaffdfa43d Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/FileUpload/index.vue | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index c7f6b0a..6ae8059 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -2,6 +2,7 @@
<div class="upload-file">
<el-upload
multiple
+ :accept="acceptList"
:action="uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
@@ -15,7 +16,7 @@
ref="fileUpload"
>
<!-- 涓婁紶鎸夐挳 -->
- <el-button size="mini" type="primary">閫夊彇鏂囦欢</el-button>
+ <el-button icon="el-icon-upload2" size="small" type="primary">涓婁紶</el-button>
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
璇蜂笂浼�
@@ -109,6 +110,11 @@
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
+ acceptList () {
+ let temp = '.*'
+ temp = this.fileType.map(item => '.' + item).join(',')
+ return temp
+ }
},
methods: {
// 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
@@ -147,7 +153,7 @@
// 涓婁紶鎴愬姛鍥炶皟
handleUploadSuccess(res, file) {
if (res.code === 200) {
- this.uploadList.push({ name: res.fileName, url: res.fileName });
+ this.uploadList.push({ name: res.newFileName, originalName: res.originalFilename , url: res.fileName });
this.uploadedSuccessfully();
} else {
this.number--;
@@ -160,7 +166,9 @@
// 鍒犻櫎鏂囦欢
handleDelete(index) {
this.fileList.splice(index, 1);
- this.$emit("input", this.listToString(this.fileList));
+ // this.$emit("input", this.listToString(this.fileList));
+ //淇敼涓鸿繑鍥炴暟缁�
+ this.$emit("input", this.fileList);
},
// 涓婁紶缁撴潫澶勭悊
uploadedSuccessfully() {
@@ -168,7 +176,9 @@
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
- this.$emit("input", this.listToString(this.fileList));
+ // this.$emit("input", this.listToString(this.fileList));
+ //淇敼涓鸿繑鍥炴暟缁�
+ this.$emit("input", this.fileList);
this.$modal.closeLoading();
}
},
--
Gitblit v1.8.0