From 03af04e81e940f0ec177755fa9d245208cc0c7e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 4 Jun 2019 15:16:11 +0800
Subject: [PATCH] [new feature] Uploader: add preview prop

---
 docs/markdown/changelog.zh-CN.md              |  4 +
 packages/uploader/demo/index.vue              |  2 +-
 packages/uploader/en-US.md                    |  3 +-
 packages/uploader/index.js                    | 77 ++++++++++++++-----
 packages/uploader/index.less                  | 17 ++++
 .../test/__snapshots__/demo.spec.js.snap      | 14 +++-
 .../test/__snapshots__/index.spec.js.snap     | 23 ++++++
 packages/uploader/test/index.spec.js          | 23 ++++++
 packages/uploader/zh-CN.md                    |  3 +-
 9 files changed, 140 insertions(+), 26 deletions(-)
 create mode 100644 packages/uploader/test/__snapshots__/index.spec.js.snap

diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index 168d1dc7a..f08f646dc 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -19,6 +19,10 @@
 
 - 支持`Number`类型的`input-width`属性
 
+##### Uploader
+
+- 新增`preview`属性
+
 
 ### [v2.0.0-beta.3](https://github.com/youzan/vant/tree/v2.0.0-beta.3)
 `2019-05-31`
diff --git a/packages/uploader/demo/index.vue b/packages/uploader/demo/index.vue
index 8ed13088f..4fc826b52 100644
--- a/packages/uploader/demo/index.vue
+++ b/packages/uploader/demo/index.vue
@@ -1,7 +1,7 @@
 <template>
   <demo-section>
     <demo-block :title="$t('basicUsage')">
-      <van-uploader />
+      <van-uploader preview />
     </demo-block>
 
     <demo-block :title="$t('uploadStyle')">
diff --git a/packages/uploader/en-US.md b/packages/uploader/en-US.md
index 1c1fc7e1d..ecbd328dc 100644
--- a/packages/uploader/en-US.md
+++ b/packages/uploader/en-US.md
@@ -13,7 +13,7 @@ Vue.use(Uploader);
 ### Basic Usage
 
 ```html
-<van-uploader :after-read="onRead" />
+<van-uploader preview :after-read="onRead" />
 ```
 
 ```javascript
@@ -42,6 +42,7 @@ export default {
 |------|------|------|------|
 | name | Input name | `String` | - |
 | accept | Accepted file type | `String` | `image/*` |
+| preview | Whether to show image preview | `Boolean` | `false` |
 | multiple | Whether to enable multiple selection pictures | `Boolean` | `false` |
 | disabled | Whether to disabled the upload | `Boolean` | `false` |
 | capture | Capture，can be set to `camera` | `String` | - |
diff --git a/packages/uploader/index.js b/packages/uploader/index.js
index 5ab646c26..3432c2936 100644
--- a/packages/uploader/index.js
+++ b/packages/uploader/index.js
@@ -1,5 +1,6 @@
 import { use } from '../utils';
 import Icon from '../icon';
+import Image from '../image';
 
 const [sfc, bem] = use('uploader');
 
@@ -7,6 +8,7 @@ export default sfc({
   inheritAttrs: false,
 
   props: {
+    preview: Boolean,
     disabled: Boolean,
     uploadText: String,
     beforeRead: Function,
@@ -25,6 +27,12 @@ export default sfc({
     }
   },
 
+  data() {
+    return {
+      previewImages: []
+    };
+  },
+
   computed: {
     detail() {
       return {
@@ -89,48 +97,79 @@ export default sfc({
       if (oversize) {
         this.$emit('oversize', files, this.detail);
       } else {
-        this.afterRead && this.afterRead(files, this.detail);
+        if (Array.isArray(files)) {
+          files.forEach(this.addPreviewImage);
+        } else {
+          this.addPreviewImage(files);
+        }
+
+        if (this.afterRead) {
+          this.afterRead(files, this.detail);
+        }
       }
       this.resetInput();
     },
 
+    addPreviewImage(file) {
+      this.previewImages.push(file.content);
+    },
+
     resetInput() {
+      /* istanbul ignore else */
       if (this.$refs.input) {
         this.$refs.input.value = '';
       }
-    }
-  },
+    },
 
-  render(h) {
-    const { slots, accept, disabled, uploadText } = this;
+    renderPreview() {
+      if (this.preview) {
+        return this.previewImages.map(image => (
+          <Image fit="cover" class={bem('preview')} src={image} />
+        ));
+      }
+    },
 
-    function Upload() {
-      const slot = slots();
+    renderUpload() {
+      const slot = this.slots();
+
+      const Input = (
+        <input
+          {...{ attrs: this.$attrs }}
+          ref="input"
+          type="file"
+          accept={this.accept}
+          class={bem('input')}
+          disabled={this.disabled}
+          onChange={this.onChange}
+        />
+      );
 
       if (slot) {
-        return slot;
+        return (
+          <div class={bem('input-wrapper')}>
+            {slot}
+            {Input}
+          </div>
+        );
       }
 
       return (
         <div class={bem('upload')}>
           <Icon name="plus" class={bem('upload-icon')} />
-          {uploadText && <span class={bem('upload-text')}>{uploadText}</span>}
+          {this.uploadText && <span class={bem('upload-text')}>{this.uploadText}</span>}
+          {Input}
         </div>
       );
     }
+  },
 
+  render(h) {
     return (
       <div class={bem()}>
-        {Upload()}
-        <input
-          {...{ attrs: this.$attrs }}
-          ref="input"
-          type="file"
-          accept={accept}
-          class={bem('input')}
-          disabled={disabled}
-          onChange={this.onChange}
-        />
+        <div class={bem('wrapper')}>
+          {this.renderPreview()}
+          {this.renderUpload()}
+        </div>
       </div>
     );
   }
diff --git a/packages/uploader/index.less b/packages/uploader/index.less
index c834276ee..d6d7cd3ab 100644
--- a/packages/uploader/index.less
+++ b/packages/uploader/index.less
@@ -4,6 +4,11 @@
   position: relative;
   display: inline-block;
 
+  &__wrapper {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
   &__input {
     position: absolute;
     top: 0;
@@ -13,9 +18,14 @@
     overflow: hidden; // to clip file-upload-button
     cursor: pointer;
     opacity: 0;
+
+    &-wrapper {
+      position: relative;
+    }
   }
 
   &__upload {
+    position: relative;
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -23,6 +33,7 @@
     box-sizing: border-box;
     width: 80px;
     height: 80px;
+    margin: 0 10px 10px 0;
     background-color: @white;
     border: 1px dashed @gray-light;
 
@@ -37,4 +48,10 @@
       font-size: 12px;
     }
   }
+
+  &__preview {
+    width: 80px;
+    height: 80px;
+    margin: 0 10px 10px 0;
+  }
 }
diff --git a/packages/uploader/test/__snapshots__/demo.spec.js.snap b/packages/uploader/test/__snapshots__/demo.spec.js.snap
index 337953128..563555e0d 100644
--- a/packages/uploader/test/__snapshots__/demo.spec.js.snap
+++ b/packages/uploader/test/__snapshots__/demo.spec.js.snap
@@ -4,15 +4,21 @@ exports[`renders demo correctly 1`] = `
 <div>
   <div>
     <div class="van-uploader">
-      <div class="van-uploader__upload"><i class="van-icon van-icon-plus van-uploader__upload-icon">
-          <!----></i></div><input type="file" accept="image/*" class="van-uploader__input">
+      <div class="van-uploader__wrapper">
+        <div class="van-uploader__upload"><i class="van-icon van-icon-plus van-uploader__upload-icon">
+            <!----></i><input type="file" accept="image/*" class="van-uploader__input"></div>
+      </div>
     </div>
   </div>
   <div>
-    <div class="van-uploader"><button class="van-button van-button--primary van-button--normal"><i class="van-icon van-icon-photo van-button__icon">
-          <!----></i><span class="van-button__text">
+    <div class="van-uploader">
+      <div class="van-uploader__wrapper">
+        <div class="van-uploader__input-wrapper"><button class="van-button van-button--primary van-button--normal"><i class="van-icon van-icon-photo van-button__icon">
+              <!----></i><span class="van-button__text">
         上传图片
       </span></button><input type="file" accept="image/*" class="van-uploader__input"></div>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/packages/uploader/test/__snapshots__/index.spec.js.snap b/packages/uploader/test/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..9f2f79feb
--- /dev/null
+++ b/packages/uploader/test/__snapshots__/index.spec.js.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`render preview image 1`] = `
+<div class="van-uploader">
+  <div class="van-uploader__wrapper">
+    <div class="van-image van-uploader__preview"><img src="test" class="van-image__img" style="object-fit: cover;">
+      <div class="van-image__loading"><i class="van-icon van-icon-photo-o" style="font-size: 22px;">
+          <!----></i></div>
+    </div>
+    <div class="van-uploader__upload"><i class="van-icon van-icon-plus van-uploader__upload-icon">
+        <!----></i><input type="file" accept="image/*" class="van-uploader__input"></div>
+  </div>
+</div>
+`;
+
+exports[`render upload-text 1`] = `
+<div class="van-uploader">
+  <div class="van-uploader__wrapper">
+    <div class="van-uploader__upload"><i class="van-icon van-icon-plus van-uploader__upload-icon">
+        <!----></i><span class="van-uploader__upload-text">Text</span><input type="file" accept="image/*" class="van-uploader__input"></div>
+  </div>
+</div>
+`;
diff --git a/packages/uploader/test/index.spec.js b/packages/uploader/test/index.spec.js
index 289fcb501..45cbeae40 100644
--- a/packages/uploader/test/index.spec.js
+++ b/packages/uploader/test/index.spec.js
@@ -113,3 +113,26 @@ test('file size overlimit', async () => {
   await later();
   expect(wrapper.emitted('oversize')[2]).toBeFalsy();
 });
+
+it('render upload-text', () => {
+  const wrapper = mount(Uploader, {
+    propsData: {
+      uploadText: 'Text'
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
+it('render preview image', async () => {
+  const wrapper = mount(Uploader, {
+    propsData: {
+      preview: true
+    }
+  });
+
+  wrapper.vm.onChange(file);
+  await later();
+
+  expect(wrapper).toMatchSnapshot();
+});
diff --git a/packages/uploader/zh-CN.md b/packages/uploader/zh-CN.md
index 372ec50d7..54b7b051d 100644
--- a/packages/uploader/zh-CN.md
+++ b/packages/uploader/zh-CN.md
@@ -13,7 +13,7 @@ Vue.use(Uploader);
 ### 基础用法
 
 ```html
-<van-uploader :after-read="onRead" />
+<van-uploader preview :after-read="onRead" />
 ```
 
 ```javascript
@@ -42,6 +42,7 @@ export default {
 |------|------|------|------|------|
 | name | 标识符，可以在回调函数的第二项参数中获取 | `String` | - | 1.6.13 |
 | accept | 接受的文件类型 | `String` | `image/*` | - |
+| preview | 是否在上传完成后展示预览图 | `Boolean` | `false` | 2.0.0 |
 | multiple | 是否开启图片多选，部分安卓机型不支持 | `Boolean` | `false` | 2.0.0 |
 | disabled | 是否禁用图片上传 | `Boolean` | `false` | - |
 | capture | 图片选取模式，可选值为`camera`(直接调起摄像头) | `String` | - | 2.0.0 |