浏览代码

fix upload file remove can't remove when auto-upload is false

baiyaaaaa 8 年之前
父节点
当前提交
bcbd94f460
共有 2 个文件被更改,包括 33 次插入20 次删除
  1. 28 17
      packages/theme-default/src/upload.css
  2. 5 3
      packages/upload/src/upload-list.vue

+ 28 - 17
packages/theme-default/src/upload.css

@@ -129,28 +129,33 @@
       &:first-child {
         margin-top: 10px;
       }
+      & .el-icon-check,
+      & .el-icon-circle-check {
+        color: var(--color-success);
+      }
+      & .el-icon-close {
+        display: none;
+        cursor: pointer;
+        opacity: .75;
+        transform: scale(.7);
+        color: var(--color-extra-light-black);
+        &:hover {
+          opacity: 1;
+        }
+      }
       &:hover {
         background-color: var(--color-extra-light-gray);
+
+        .el-icon-close {
+          display: inline-block;
+        }
       }
       @when success {
         .el-upload-list__item-name:hover {
           color: var(--link-hover-color);
           cursor: pointer;
         }
-        .el-icon-close {
-          display: none;
-        }
         &:hover {
-          .el-icon-close {
-            display: inline-block;
-            cursor: pointer;
-            opacity: .75;
-            transform: scale(.7);
-            color: var(--color-extra-light-black);
-            &:hover {
-              opacity: 1;
-            }
-          }
           .el-icon-circle-check,
           .el-icon-check {
             display: none;
@@ -180,7 +185,6 @@
       right: 10px;
       top: 0;
       line-height: inherit;
-      color: var(--color-success);
     }
     @e item-delete {
       position: absolute;
@@ -210,6 +214,11 @@
         margin: 0 8px 8px 0;
         display: inline-block;
 
+        & .el-icon-check,
+        & .el-icon-circle-check {
+          color: var(--color-white);
+        }
+
         &:hover .el-upload-list__item-status-label {
           display: none;
         }
@@ -236,7 +245,6 @@
           font-size: 12px;
           margin-top: 11px;
           transform: rotate(-45deg) scale(0.8);
-          color: #fff;
         }
       }
       .el-upload-list__item-actions {
@@ -297,7 +305,11 @@
         margin-top: 10px;
         padding: 10px 10px 10px 90px;
         height: 92px;
-
+        
+        & .el-icon-check,
+        & .el-icon-circle-check {
+          color: var(--color-white);
+        }
         &:hover {
           .el-upload-list__item-status-label {
             background: transparent;
@@ -356,7 +368,6 @@
           font-size: 12px;
           margin-top: 12px;
           transform: rotate(-45deg) scale(0.8);
-          color: #fff;
         }
       }
       .el-progress {

+ 5 - 3
packages/upload/src/upload-list.vue

@@ -17,11 +17,13 @@
       <a class="el-upload-list__item-name" @click="handleClick(file)">
         <i class="el-icon-document"></i>{{file.name}}
       </a>
-      <label v-show="file.status === 'success'" class="el-upload-list__item-status-label">
-        <i :class="{
+      <label class="el-upload-list__item-status-label">
+        <i v-if="file.status === 'success'"
+          :class="{
             'el-icon-circle-check': listType === 'text',
             'el-icon-check': ['picture-card', 'picture'].indexOf(listType) > -1
-        }"></i>
+          }">
+        </i>
         <i class="el-icon-close" @click="$emit('remove', file)"></i>
       </label>
       <span class="el-upload-list__item-actions"