From ee03e3b8511b3e593f58fa3640d74f6aa3f9cab5 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Thu, 27 Jul 2017 10:51:21 +0800
Subject: [PATCH] Upload: remove delete icon when disabled

---
 packages/theme-default/src/upload.css | 5 +++++
 packages/upload/src/upload-list.vue   | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/theme-default/src/upload.css b/packages/theme-default/src/upload.css
index 60185aba1..2d1e14726 100644
--- a/packages/theme-default/src/upload.css
+++ b/packages/theme-default/src/upload.css
@@ -171,6 +171,11 @@
         }
       }
     }
+    @when disabled {
+      .el-upload-list__item:hover .el-upload-list__item-status-label {
+        display: block;
+      }
+    }
     @e item-name {
       color: var(--color-extra-light-black);
       display: block;
diff --git a/packages/upload/src/upload-list.vue b/packages/upload/src/upload-list.vue
index 493c2e7f7..f29ea3b00 100644
--- a/packages/upload/src/upload-list.vue
+++ b/packages/upload/src/upload-list.vue
@@ -1,7 +1,11 @@
 <template>
   <transition-group
     tag="ul"
-    :class="['el-upload-list', 'el-upload-list--' + listType]"
+    :class="[
+      'el-upload-list',
+      'el-upload-list--' + listType,
+      { 'is-disabled': disabled }
+    ]"
     name="el-list"
   >
     <li
@@ -24,7 +28,7 @@
           'el-icon-check': ['picture-card', 'picture'].indexOf(listType) > -1
         }"></i>
       </label>
-      <i class="el-icon-close" @click="$emit('remove', file)"></i>
+      <i class="el-icon-close" v-if="!disabled" @click="$emit('remove', file)"></i>
       <el-progress
         v-if="file.status === 'uploading'"
         :type="listType === 'picture-card' ? 'circle' : 'line'"