From 7afb5795bffdb68fe2da6038ceb2d77737ea220f Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Mon, 18 Nov 2019 20:42:01 +0800
Subject: [PATCH] fix(Uploader): fix multiple not work (#2329)

fix #2327
---
 example/pages/uploader/index.wxml |  2 ++
 packages/uploader/index.ts        | 36 ++++++++++---------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/example/pages/uploader/index.wxml b/example/pages/uploader/index.wxml
index 81651c3c..0997f38f 100644
--- a/example/pages/uploader/index.wxml
+++ b/example/pages/uploader/index.wxml
@@ -12,6 +12,7 @@
   <van-uploader
     name="2"
     file-list="{{ fileList2 }}"
+    multiple
     bind:after-read="afterRead"
     bind:delete="delete"
     bind:click-preview="clickPreview"
@@ -22,6 +23,7 @@
   <van-uploader
     name="3"
     file-list="{{ fileList3 }}"
+    multiple
     max-count="{{ 2 }}"
     bind:after-read="afterRead"
     bind:delete="delete"
diff --git a/packages/uploader/index.ts b/packages/uploader/index.ts
index e8018507..0ed6e48a 100644
--- a/packages/uploader/index.ts
+++ b/packages/uploader/index.ts
@@ -2,19 +2,10 @@ import { VantComponent } from '../common/component';
 import { isImageFile } from './utils';
 import { addUnit } from '../common/utils';
 
-interface File {
-  path: string; // 上传临时地址
-  url: string; // 上传临时地址
-  size: number; // 上传大小
-  name: string; // 上传文件名称，accept="image" 不存在
-  type: string; // 上传类型，accept="image" 不存在
-  time: number; // 上传时间，accept="image" 不存在
-  image: boolean; // 是否为图片
-}
-
 VantComponent({
   props: {
     disabled: Boolean,
+    multiple: Boolean,
     uploadText: String,
     previewSize: {
       type: null,
@@ -104,12 +95,8 @@ VantComponent({
           wx.chooseImage({
             count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1, // 最多可以选择的数量，如果不支持多选则数量为1
             sourceType: capture, // 选择图片的来源，相册还是相机
-            success: res => {
-              resolve(res);
-            },
-            fail: err => {
-              reject(err);
-            }
+            success: resolve,
+            fail: reject
           });
         });
       } else {
@@ -117,18 +104,17 @@ VantComponent({
           wx.chooseMessageFile({
             count: multiple ? newMaxCount : 1, // 最多可以选择的数量，如果不支持多选则数量为1
             type: 'file',
-            success(res) {
-              resolve(res);
-            },
-            fail: err => {
-              reject(err);
-            }
+            success: resolve,
+            fail: reject
           });
         });
       }
 
-      chooseFile.then(res => {
-        const file: File | File[] = multiple ? res.tempFiles : res.tempFiles[0];
+      chooseFile.then((res:
+        WechatMiniprogram.ChooseImageSuccessCallbackResult |
+        WechatMiniprogram.ChooseMessageFileSuccessCallbackResult
+      ) => {
+        const file = multiple ? res.tempFiles : res.tempFiles[0];
 
         // 检查文件大小
         if (file instanceof Array) {
@@ -147,7 +133,7 @@ VantComponent({
           this.$emit('before-read', {
             file,
             name,
-            callback: result => {
+            callback: (result: boolean) => {
               if (result) {
                 // 开始上传
                 this.$emit('after-read', { file, name });