Fix safrazik#12 Add support for custom FormData

safrazik · safrazik · commit 0511e2a3b03d · 2019-09-12T19:03:01.000+05:30
diff --git a/src/components/vue-file-agent-mixin.js b/src/components/vue-file-agent-mixin.js
@@ -84,22 +84,22 @@ export default {
       })
       video.load();
     },
-    upload(url, headers, filesData){
+    upload(url, headers, filesData, createFormData){
       var validFilesData = [];
       for(var i = 0; i < filesData.length; i++){
         if(!filesData[i].error){
           validFilesData.push(filesData[i]);
         }
       }
-      return uploader.upload(url, headers, validFilesData, (overallProgress)=> {
+      return uploader.upload(url, headers, validFilesData, createFormData, (overallProgress)=> {
         this.overallProgress = overallProgress;
       });
     },
-    deleteUpload(url, headers, fileData){
+    deleteUpload(url, headers, fileData, uploadData){
       if(this.filesData.length < 1){
         this.overallProgress = 0;
       }
-      return uploader.deleteUpload(url, headers, fileData);
+      return uploader.deleteUpload(url, headers, fileData, uploadData);
     },
     autoUpload(filesData){
       if(!this.uploadUrl){
diff --git a/src/lib/upload-helper.js b/src/lib/upload-helper.js
@@ -63,7 +63,7 @@ class UploadHelper {
     fileData.error.upload = errorText;
   }
 
-  upload(url, headers, filesData, progressFn){
+  upload(url, headers, filesData, createFormData, progressFn, configureFn){
     var self = this;
     progressFn = progressFn || function(){};
     var promises = [];
@@ -76,15 +76,24 @@ class UploadHelper {
     }
     for(let i = 0; i < filesData.length; i++){
       let fileData = filesData[i];
-      var formData = new FormData();
-      formData.append('file', fileData.file);
+      var formData;
+      if(typeof createFormData == 'function'){
+        formData = createFormData(fileData);
+      }
+      else {
+        formData = new FormData();
+        formData.append('file', fileData.file);
+      }
       (function(fileData){
         var promise = self.doUpload(url, headers, formData, function(progressEvent) {
             var percentCompleted = (progressEvent.loaded * 100) / progressEvent.total;
             fileData.progress(percentCompleted >= 100 ? 99.99 : percentCompleted); // do not complete until promise resolved
             updateOverallProgress();
         }, function(xhr){
           fileData.xhr = xhr;
+          if(typeof configureFn == 'function'){
+            configureFn(xhr);
+          }
         });
         promise.then(function(response){
           delete fileData.xhr;
@@ -99,13 +108,16 @@ class UploadHelper {
     return Promise.all(promises);
   }
 
-  deleteUpload(url, headers, fileData){
+  deleteUpload(url, headers, fileData, uploadData){
     return new Promise((resolve, reject)=> {
       if (fileData.xhr) {
         fileData.xhr.abort();
       }
-      if (fileData.upload) {
-        this.doDeleteUpload(url, headers, fileData.upload, (xhr)=> {
+      if(uploadData === undefined){
+        uploadData = fileData.upload;
+      }
+      if (uploadData) {
+        this.doDeleteUpload(url, headers, uploadData, (xhr)=> {
         }).then((result)=> {
           resolve(result);
         }, (err)=> {
