From f88ad25f7b4fe72d9fd3807856967bd577c1aba8 Mon Sep 17 00:00:00 2001
From: baiyaaaaa <bigpet1991@gmail.com>
Date: Sun, 27 Nov 2016 14:07:13 +0800
Subject: [PATCH] support upload default fileList (#1393)

---
 examples/docs/en-US/upload.md         |  1 +
 examples/docs/zh-CN/upload.md         |  1 +
 packages/theme-default/src/upload.css |  2 +-
 packages/upload/src/index.vue         | 15 +++++++++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/examples/docs/en-US/upload.md b/examples/docs/en-US/upload.md
index c676cc1f8..3197babd5 100644
--- a/examples/docs/en-US/upload.md
+++ b/examples/docs/en-US/upload.md
@@ -102,6 +102,7 @@ This mode is specifically for image uploading, and the thumbnail will display in
   :thumbnail-mode="true"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
+  :default-file-list="[{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]"
 >
   <i class="el-icon-upload"></i>
   <div class="el-dragger__text">Drop file here or <em>click to upload</em></div>
diff --git a/examples/docs/zh-CN/upload.md b/examples/docs/zh-CN/upload.md
index 38c5b2394..bea5a9fe4 100644
--- a/examples/docs/zh-CN/upload.md
+++ b/examples/docs/zh-CN/upload.md
@@ -113,6 +113,7 @@
   :thumbnail-mode="true"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
+  :default-file-list="[{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]"
 >
   <i class="el-icon-upload"></i>
   <div class="el-dragger__text">将文件拖到此处，或<em>点击上传</em></div>
diff --git a/packages/theme-default/src/upload.css b/packages/theme-default/src/upload.css
index 026a35a80..574a827ef 100644
--- a/packages/theme-default/src/upload.css
+++ b/packages/theme-default/src/upload.css
@@ -145,7 +145,7 @@
       & img {
         display: block;
         width: 100%;
-        height: auto;
+        height: 100%;
       }
 
       @e progress {
diff --git a/packages/upload/src/index.vue b/packages/upload/src/index.vue
index db071671f..2b25f869f 100644
--- a/packages/upload/src/index.vue
+++ b/packages/upload/src/index.vue
@@ -65,6 +65,12 @@ export default {
     onError: {
       type: Function,
       default: noop
+    },
+    defaultFileList: {
+      type: Array,
+      default() {
+        return [];
+      }
     }
   },
 
@@ -152,6 +158,15 @@ export default {
     }
   },
 
+  created() {
+    this.fileList = this.defaultFileList.map(item => {
+      item.status = 'finished';
+      item.percentage = 100;
+      item.uid = Date.now() + this.tempIndex++;
+      return item;
+    });
+  },
+
   render(h) {
     var uploadList;