diff --git a/src/components/upload/upload.vue b/src/components/upload/upload.vue
index 93cee85c..8f948bcf 100644
--- a/src/components/upload/upload.vue
+++ b/src/components/upload/upload.vue
@@ -202,6 +202,24 @@
                 }
             },
             post (file) {
+                // check format
+                if (this.format.length) {
+                    const _file_format = file.name.split('.').pop().toLocaleLowerCase();
+                    const checked = this.format.some(item => item.toLocaleLowerCase() === _file_format);
+                    if (!checked) {
+                        this.onFormatError(file);
+                        return false;
+                    }
+                }
+
+                // check maxSize
+                if (this.maxSize) {
+                    if (file.size > this.maxSize * 1024) {
+                        this.onExceededSize(file);
+                        return false;
+                    }
+                }
+
                 this.handleStart(file);
                 let formData = new FormData();
                 formData.append(this.name, file);
@@ -235,24 +253,6 @@
                     showProgress: true
                 };
 
-                // check format
-                if (this.format.length) {
-                    const _file_format = _file.name.split('.').pop().toLocaleLowerCase();
-                    const checked = this.format.some(item => item.toLocaleLowerCase() === _file_format);
-                    if (checked) {
-                        this.onFormatError(file);
-                        return;
-                    }
-                }
-
-                // check maxSize
-                if (this.maxSize) {
-                    if (_file.size > this.maxSize * 1024) {
-                        this.onExceededSize(file);
-                        return;
-                    }
-                }
-
                 this.fileList.push(_file);
             },
             getFile (file) {
diff --git a/src/styles/components/upload.less b/src/styles/components/upload.less
index ba93d58f..4f2aabdc 100644
--- a/src/styles/components/upload.less
+++ b/src/styles/components/upload.less
@@ -16,7 +16,7 @@
             overflow: hidden;
             position: relative;
 
-            & + span{
+            & > span{
                 cursor: pointer;
                 transition: color @transition-time @ease-in-out;
                 i{
@@ -30,7 +30,7 @@
 
             &:hover{
                 background: @input-disabled-bg;
-                & + span{
+                & > span{
                     color: @primary-color;
                     i{
                         color: @text-color;
diff --git a/test/routers/upload.vue b/test/routers/upload.vue
index e9076bc5..b07ae166 100644
--- a/test/routers/upload.vue
+++ b/test/routers/upload.vue
@@ -1,56 +1,125 @@
 <template>
-    <div style="margin: 50px;width: 300px;">
-        <Upload
-            action="//jsonplaceholder.typicode.com/posts/"
+    <div class="demo-upload-list" v-for="item in uploadList">
+        <template v-if="item.status === 'finished'">
+            <img :src="item.url">
+            <div class="demo-upload-list-cover">
+                <Icon type="ios-eye-outline" @click="handleView(item.name)"></Icon>
+                <Icon type="ios-trash-outline" @click="handleRemove(item)"></Icon>
+            </div>
+        </template>
+        <template v-else>
+            <Progress v-if="item.showProgress" :percent="item.percentage" hide-info></Progress>
+        </template>
+    </div>
+    <Upload
+            v-ref:upload
+            :show-upload-list="false"
+            :default-file-list="defaultList"
+            :on-success="handleSuccess"
+            :format="['jpg','jpeg','png']"
+            :max-size="2048"
+            :on-format-error="handleFormatError"
+            :on-exceeded-size="handleMaxSize"
             multiple
             type="drag"
-            :max-size="10000"
-            :default-file-list="defaultFileList">
-            <div style="padding: 40px 100px">
-                <i-button>上传</i-button>
-            </div>
-            <!--<div slot="tip">只能上传 jpg/png 格式的文件</div>-->
-        </Upload>
-    </div>
+            action="//jsonplaceholder.typicode.com/posts/"
+            style="display: inline-block;width:58px;">
+        <div style="width: 58px;height:58px;line-height: 58px;">
+            <Icon type="camera" size="20"></Icon>
+        </div>
+    </Upload>
+    <Modal title="查看图片" :visible.sync="visible">
+        <img :src="'https://o5wwk8baw.qnssl.com/' + imgName + '/large'" v-if="visible" style="width: 100%">
+    </Modal>
 </template>
 <script>
     export default {
-        props: {},
         data () {
             return {
-                defaultFileList: [
+                defaultList: [
                     {
-                        'name': 'Vue.js权威指南.zip',
-                        'url': 'http://www.baidu.com'
+                        'name': 'a42bdcc1178e62b4694c830f028db5c0',
+                        'url': 'https://o5wwk8baw.qnssl.com/a42bdcc1178e62b4694c830f028db5c0/avatar'
                     },
                     {
-                        'name': 'Vue.js权威指南.doc',
-                        'url': 'http://www.baidu.com'
-                    },
-                    {
-                        'name': '套马的汉子.mp3',
-                        'url': 'http://www.baidu.com'
-                    },
-                    {
-                        'name': '风景.jpg',
-                        'url': 'http://www.baidu.com'
-                    },
-                    {
-                        'name': 'Vue.js权威指南.mp4',
-                        'url': 'http://www.baidu.com'
-                    },
-                    {
-                        'name': '套马的汉子.csv',
-                        'url': 'http://www.baidu.com'
-                    },
-                    {
-                        'name': '风景.ppt',
-                        'url': 'http://www.baidu.com'
-                    },
-                ]
-            };
+                        'name': 'bc7521e033abdd1e92222d733590f104',
+                        'url': 'https://o5wwk8baw.qnssl.com/bc7521e033abdd1e92222d733590f104/avatar'
+                    }
+                ],
+                imgName: '',
+                visible: false
+            }
         },
-        computed: {},
-        methods: {}
-    };
-</script>
\ No newline at end of file
+        computed: {
+            uploadList () {
+                return this.$refs.upload ? this.$refs.upload.fileList : [];
+            }
+        },
+        methods: {
+            handleView (name) {
+                this.imgName = name;
+                this.visible = true;
+            },
+            handleRemove (file) {
+                // 从 upload 实例删除数据
+                const fileList = this.$refs.upload.fileList;
+                this.$refs.upload.fileList.splice(fileList.indexOf(file), 1);
+            },
+            handleSuccess (res, file) {
+                // 因为上传过程为实例，这里模拟添加 url
+                file.url = 'https://o5wwk8baw.qnssl.com/7eb99afb9d5f317c912f08b5212fd69a/avatar';
+                file.name = '7eb99afb9d5f317c912f08b5212fd69a';
+            },
+            handleFormatError (file) {
+                this.$Notice.warning({
+                    title: '文件格式不正确',
+                    desc: '文件 ' + file.name + ' 格式不正确，请上传 jpg 或 png 格式的图片。'
+                });
+            },
+            handleMaxSize (file) {
+                this.$Notice.warning({
+                    title: '超出文件大小限制',
+                    desc: '文件 ' + file.name + ' 太大，不能超过 2M。'
+                });
+            }
+        }
+    }
+</script>
+<style>
+    .demo-upload-list{
+        display: inline-block;
+        width: 60px;
+        height: 60px;
+        text-align: center;
+        line-height: 60px;
+        border: 1px solid transparent;
+        border-radius: 4px;
+        overflow: hidden;
+        background: #fff;
+        position: relative;
+        box-shadow: 0 1px 1px rgba(0,0,0,.2);
+        margin-right: 4px;
+    }
+    .demo-upload-list img{
+        width: 100%;
+        height: 100%;
+    }
+    .demo-upload-list-cover{
+        display: none;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: rgba(0,0,0,.6);
+    }
+    .demo-upload-list:hover .demo-upload-list-cover{
+        display: block;
+    }
+    .demo-upload-list-cover i{
+        color: #fff;
+        font-size: 20px;
+        cursor: pointer;
+        margin: 0 2px;
+    }
+</style>