Merge pull request #347 from baiyaaaaa/feat-upload

upload data prop
pull/360/head
SkyAo 2016-10-12 11:31:11 +08:00 committed by GitHub
commit 4238fa9126
3 changed files with 12 additions and 8 deletions

View File

@ -1,5 +1,11 @@
## 更新日志 ## 更新日志
### 1.0.0-rc.7
*2016-XX-XX*
- Upload 新增 Data 属性支持额外数据的传输
### 1.0.0-rc.6 ### 1.0.0-rc.6
*2016-10-11* *2016-10-11*

View File

@ -31,18 +31,13 @@ export default {
}; };
} }
}, },
multiple: { data: Object,
type: Boolean, multiple: Boolean,
default: false
},
name: { name: {
type: String, type: String,
default: 'file' default: 'file'
}, },
withCredentials: { withCredentials: Boolean,
type: Boolean,
default: false
},
thumbnailMode: Boolean, thumbnailMode: Boolean,
showUploadList: { showUploadList: {
type: Boolean, type: Boolean,
@ -179,6 +174,7 @@ export default {
'with-credentials': this.withCredentials, 'with-credentials': this.withCredentials,
headers: this.headers, headers: this.headers,
name: this.name, name: this.name,
data: this.data,
accept: this.thumbnailMode ? 'image/*' : this.accept, accept: this.thumbnailMode ? 'image/*' : this.accept,
'on-start': this.handleStart, 'on-start': this.handleStart,
'on-progress': this.handleProgress, 'on-progress': this.handleProgress,

View File

@ -34,6 +34,7 @@ export default {
type: String, type: String,
default: 'file' default: 'file'
}, },
data: Object,
headers: Object, headers: Object,
withCredentials: Boolean, withCredentials: Boolean,
multiple: Boolean, multiple: Boolean,
@ -133,6 +134,7 @@ export default {
headers: this.headers, headers: this.headers,
withCredentials: this.withCredentials, withCredentials: this.withCredentials,
file: file, file: file,
data: this.data,
filename: this.name, filename: this.name,
onProgress: e => { onProgress: e => {
this.onProgress(e, file); this.onProgress(e, file);