Skip to content

Upload: fix Error when beforeUpload hook return promise of file object #11297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Leopoldthecoder merged 2 commits into from
May 23, 2018
Merged

Upload: fix Error when beforeUpload hook return promise of file object #11297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a04791
Upload: fix beforeUpload hook bug
abisuq May 22, 2018
a1b63c5
Upload: add ElUploadInternalRawFile interface
abisuq May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/upload/src/upload.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,16 @@ export default {
const fileType = Object.prototype.toString.call(processedFile);

if (fileType === '[object File]' || fileType === '[object Blob]') {
processedFile.name = rawFile.name;
processedFile.uid = rawFile.uid;
if (fileType === '[object Blob]') {
processedFile = new File([processedFile], rawFile.name, {
type: rawFile.type
});
}
for (const p in rawFile) {
if (rawFile.hasOwnProperty(p)) {
processedFile[p] = rawFile[p];
}
}
this.post(processedFile);
} else {
this.post(rawFile);
Expand Down
8 changes: 6 additions & 2 deletions types/upload.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ export interface FileListItem {
status?: FileUploadStatus
}

export interface ElUploadInternalRawFile extends File {
uid: number
}

export interface ElUploadInternalFileDetail {
status: FileUploadStatus,
name: string,
size: number,
percentage: number,
uid: number,
raw: File,
raw: ElUploadInternalRawFile,
url?: string
}

Expand Down Expand Up @@ -83,7 +87,7 @@ export declare class ElUpload extends ElementUIComponent {
onChange: (file: ElUploadInternalFileDetail, fileList: ElUploadInternalFileDetail[]) => void

/** Hook function before uploading with the file to be uploaded as its parameter. If false or a Promise is returned, uploading will be aborted */
beforeUpload: (file: ElUploadInternalFileDetail) => boolean | Promise<File | boolean>
beforeUpload: (file: ElUploadInternalRawFile) => boolean | Promise<File | Blob | boolean>

/** Whether thumbnail is displayed */
thumbnailMode: boolean
Expand Down