Skip to content

Upload: fix a TypeError when upload a processed file from the beforeUpload hook #11210

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 3 commits into from
May 18, 2018
Merged

Upload: fix a TypeError when upload a processed file from the beforeUpload hook #11210

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4857e50
Upload: add filename
May 17, 2018
8ba2a4c
Upload: add name and uid properties to processedFile to fix an error
May 17, 2018
6b811a9
Update upload.vue
Leopoldthecoder May 18, 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
2 changes: 1 addition & 1 deletion packages/upload/src/ajax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function upload(option) {
});
}

formData.append(option.filename, option.file);
formData.append(option.filename, option.file, option.file.name);

xhr.onerror = function error(e) {
option.onError(e);
Expand Down
6 changes: 5 additions & 1 deletion packages/upload/src/upload.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default {
if (this.autoUpload) this.upload(rawFile);
});
},
upload(rawFile, file) {
upload(rawFile) {
this.$refs.input.value = null;

if (!this.beforeUpload) {
Expand All @@ -92,6 +92,10 @@ export default {
if (before && before.then) {
before.then(processedFile => {
const fileType = Object.prototype.toString.call(processedFile);

processedFile.name = rawFile.name;
Copy link
Contributor

@Leopoldthecoder Leopoldthecoder May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this line necessary? Because here processedFile already has a name prop.

Copy link
Contributor Author

@fengyuanchen fengyuanchen May 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A blob object only has two properties: size and type. In the given demo, the name property is assigned by the image compressor.

Improved version:

// Allow user to customize the processed file name
processedFile.name = processedFile.name || rawFile.name;

Copy link
Contributor

@Leopoldthecoder Leopoldthecoder May 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

Copy link
Contributor

@abisuq abisuq May 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change will cause an error if here the processedFile is still a File object.

processedFile.uid = rawFile.uid;

if (fileType === '[object File]' || fileType === '[object Blob]') {
this.post(processedFile);
} else {
Expand Down