From b9790db463ebec74ddb89ac60e7ce7068494b7f2 Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 3 Apr 2020 15:09:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20H5=E7=AB=AF=20uni.uploadFile=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5=20File=20=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/helpers/protocol/network/upload-file.js    | 3 +++
 src/platforms/h5/service/api/network/upload-file.js | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/helpers/protocol/network/upload-file.js b/src/core/helpers/protocol/network/upload-file.js
index 47cdd3765..bcf582eb7 100644
--- a/src/core/helpers/protocol/network/upload-file.js
+++ b/src/core/helpers/protocol/network/upload-file.js
@@ -9,6 +9,9 @@ export const uploadFile = {
   files: {
     type: Array
   },
+  file: {
+    type: File
+  },
   filePath: {
     type: String,
     validator (value, params) {
diff --git a/src/platforms/h5/service/api/network/upload-file.js b/src/platforms/h5/service/api/network/upload-file.js
index 9e3b29e26..15b97051a 100644
--- a/src/platforms/h5/service/api/network/upload-file.js
+++ b/src/platforms/h5/service/api/network/upload-file.js
@@ -45,6 +45,7 @@ class UploadTask {
  */
 export function uploadFile ({
   url,
+  file,
   filePath,
   name,
   files,
@@ -59,6 +60,7 @@ export function uploadFile ({
   if (!Array.isArray(files) || !files.length) {
     files = [{
       name,
+      file,
       uri: filePath
     }]
   }
@@ -128,7 +130,7 @@ export function uploadFile ({
   }
 
   Promise
-    .all(files.map(({ name, uri }) => urlToFile(uri)))
+    .all(files.map(({ file, uri }) => file instanceof File ? Promise.resolve(file) : urlToFile(uri)))
     .then(upload)
     .catch(() => {
       setTimeout(() => {
-- 
GitLab