From 2d3a3a05689c1dc8627856bd92a75f88bd6fc599 Mon Sep 17 00:00:00 2001
From: ZakaryCode <zakarycode@gmail.com>
Date: Sun, 5 Jan 2020 23:10:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dh5=E7=8B=AC=E6=9C=89?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro/types/api/media/image.d.ts    |  8 ++++++--
 packages/taro/types/api/network/upload.d.ts | 16 ++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/taro/types/api/media/image.d.ts b/packages/taro/types/api/media/image.d.ts
index c75f494eb48d..eb5311142c84 100644
--- a/packages/taro/types/api/media/image.d.ts
+++ b/packages/taro/types/api/media/image.d.ts
@@ -167,9 +167,13 @@ declare namespace Taro {
       path: string
       /** 本地临时文件大小，单位 B */
       size: number
-      /** (仅 H5) 文件的 MIME 类型 */
+      /** 文件的 MIME 类型
+       * @supported h5
+       */
       type?: string
-      /** (仅 H5) 原始的浏览器 File 对象 */
+      /** 原始的浏览器 File 对象
+       * @supported h5
+       */
       originalFileObj?: File
     }
   }
diff --git a/packages/taro/types/api/network/upload.d.ts b/packages/taro/types/api/network/upload.d.ts
index fd9b7adb4429..49ceec1cb678 100644
--- a/packages/taro/types/api/network/upload.d.ts
+++ b/packages/taro/types/api/network/upload.d.ts
@@ -7,8 +7,10 @@ declare namespace Taro {
       name: string
       /** 开发者服务器地址 */
       url: string
-      /** (仅 H5) 上传的文件名 */
-      fileName: string
+      /** 上传的文件名
+       * @supported h5
+       */
+      fileName?: string
       /** 接口调用结束的回调函数（调用成功、失败都会执行） */
       complete?: (res: General.CallbackResult) => void
       /** 接口调用失败的回调函数 */
@@ -18,12 +20,10 @@ declare namespace Taro {
       /** HTTP 请求 Header，Header 中不能设置 Referer */
       header?: General.IAnyObject
       /** 接口调用成功的回调函数 */
-      success?: SuccessCallback
+      success?: (
+        result: SuccessCallbackResult,
+      ) => void
     }
-    /** 接口调用成功的回调函数 */
-    type SuccessCallback = (
-      result: SuccessCallbackResult,
-    ) => void
     interface SuccessCallbackResult extends General.CallbackResult {
       /** 开发者服务器返回的数据 */
       data: string
@@ -110,7 +110,7 @@ declare namespace Taro {
    * ```
    * @see https://developers.weixin.qq.com/miniprogram/dev/api/network/upload/wx.uploadFile.html
    */
-  function uploadFile(option: uploadFile.Option): UploadTask
+  function uploadFile(option: uploadFile.Option): Promise<uploadFile.SuccessCallbackResult & UploadTask> & UploadTask
 
   /** 一个可以监听上传进度变化事件，以及取消上传任务的对象
    * @see https://developers.weixin.qq.com/miniprogram/dev/api/network/upload/UploadTask.html