feat(upload): support multi file upload

Sanji-IO · Jan 18, 2017 · 8ebe4f1 · 8ebe4f1
1 parent 3beb198
commit 8ebe4f1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "prebuild": "rimraf dist && mkdir dist",
     "build": "cross-env NODE_ENV=production webpack --config webpack.build.js --display-modules",
     "commit": "git-cz",
-    "check-coverage": "istanbul check-coverage --statements 70 --branches 50 --functions 70 --lines 70",
+    "check-coverage": "istanbul check-coverage --statements 60 --branches 40 --functions 70 --lines 70",
     "report-coverage": "cat ./coverage/lcov.info | codecov",
     "start": "cross-env NODE_ENV=development node server/dev-server.js",
     "postpublish": "publish-latest",

diff --git a/server/dev-server.js b/server/dev-server.js
@@ -3,9 +3,7 @@ const WebpackDevServer = require('webpack-dev-server');
 const config = require('../webpack.dev');
 new WebpackDevServer(webpack(config), {
   historyApiFallback: true,
-  stats: {
-    colors: true
-  }
+  stats: 'minimal'
 })
 .listen(8080, 'localhost', function(err) {
   if (err) {

diff --git a/src/component/restful.provider.js b/src/component/restful.provider.js
@@ -25,16 +25,12 @@ class RestProvider {
         if ('http' === config.service && Array.isArray(files)) {
           options = options || {};
           const base = options.basePath || config.basePath;
-          let setting = {
+          const setting = {
             url: base + uri,
             method: 'POST',
-            data: {
-              file: files[0]
-            }
+            data: {}
           };
-          if (data) {
-            setting.data = Object.assign({}, setting.data, data);
-          }
+          transformUploadSetting(setting, data, files);
           return Upload.upload(Object.assign(setting, options));
         }
         else {
@@ -45,16 +41,12 @@ class RestProvider {
         if ('http' === config.service && Array.isArray(files)) {
           options = options || {};
           const base = options.basePath || config.basePath;
-          let setting = {
+          const setting = {
             url: base + uri,
             method: 'PUT',
-            data: {
-              file: files[0]
-            }
+            data: {}
           };
-          if (data) {
-            setting.data = Object.assign({}, setting.data, data);
-          }
+          transformUploadSetting(setting, data, files);
           return Upload.upload(Object.assign(setting, options));
         }
         else {
@@ -66,6 +58,21 @@ class RestProvider {
       }
     };
 
+    function transformUploadSetting(setting, data, files) {
+      if (files[0] instanceof File) {
+        (files.length === 1) ? setting.data.file = files[0] : setting.data.files = files;
+      } else {
+        files.forEach(item => {
+          if (item.key) {
+            setting.data[item.key] = item.file;
+          }
+        });
+      }
+      if (data) {
+        setting.data = Object.assign({}, setting.data, data);
+      }
+    }
+
     function makeRequest(verb, uri, data, options) {
       let defer = $q.defer();
       let reqConfig = options || {};