diff --git a/src/components/upload/upload-list.vue b/src/components/upload/upload-list.vue
index 3b6f074c1..d10a8951f 100644
--- a/src/components/upload/upload-list.vue
+++ b/src/components/upload/upload-list.vue
@@ -10,8 +10,8 @@
             </span>
             <Icon
                 type="ios-close"
-                :class="[prefixCls + '-list-remove']"
-                v-show="file.status === 'finished'"
+                :class="fileRemoveCls(file)"
+                v-show="file.status === 'finished' || file.status === 'error'"
                 @click="handleRemove(file)"></Icon>
             <transition name="fade">
                 <i-progress
@@ -50,7 +50,16 @@
                 return [
                     `${prefixCls}-list-file`,
                     {
-                        [`${prefixCls}-list-file-finish`]: file.status === 'finished'
+                        [`${prefixCls}-list-file-finish`]: file.status === 'finished',
+                        [`${prefixCls}-list-file-error`]: file.status === 'error'
+                    }
+                ];
+            },
+            fileRemoveCls (file) {
+                return [
+                    `${prefixCls}-list-remove`,
+                    {
+                        [`${prefixCls}-list-remove-error`]: file.status === 'error'
                     }
                 ];
             },
@@ -89,7 +98,13 @@
                 return type;
             },
             parsePercentage (val) {
-                return parseInt(val, 10);
+                val = parseInt(val, 10);
+                if (val < 0) {
+                    val = 0;
+                } else if (val > 100) {
+                    val = 100;
+                }
+                return val;
             }
         }
     };
diff --git a/src/components/upload/upload.vue b/src/components/upload/upload.vue
index 81a48ad4e..9fb96714c 100644
--- a/src/components/upload/upload.vue
+++ b/src/components/upload/upload.vue
@@ -338,8 +338,8 @@
                 immediate: true,
                 handler(fileList) {
                     this.fileList = fileList.map(item => {
-                        item.status = 'finished';
-                        item.percentage = 100;
+                        item.status = item.status ? item.status : 'finished';
+                        item.percentage = item.percentage >= 0 ? item.percentage : 100;
                         item.uid = Date.now() + this.tempIndex++;
                         return item;
                     });
diff --git a/src/styles/components/upload.less b/src/styles/components/upload.less
index d8e5faaf2..52f8f4a59 100644
--- a/src/styles/components/upload.less
+++ b/src/styles/components/upload.less
@@ -40,6 +40,19 @@
                     opacity: 1;
                 }
             }
+
+            &-error > span{
+                color: @error-color !important;
+                i{
+                    color: @error-color !important;
+                }
+                &:hover{
+                    color: @error-hover-color !important;
+                    i{
+                        color: @error-hover-color !important;
+                    }
+                }
+            }
         }
         &-remove{
             opacity: 0;
@@ -52,6 +65,12 @@
             &:hover{
                 color: #444;
             }
+            &-error{
+                color: @error-color !important;
+                &:hover{
+                    color: @error-hover-color !important;
+                }
+            }
         }
     }