github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Upload: remove delete icon when disabled

pull/6127/head
Leopoldthecoder 2017-07-27 10:51:21 +08:00 committed by 杨奕
parent 265356453e
commit ee03e3b851
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/theme-default/src/upload.css
View File

@ -171,6 +171,11 @@
} }
} }
} }
@when disabled {
.el-upload-list__item:hover .el-upload-list__item-status-label {
display: block;
}
}
@e item-name { @e item-name {
color: var(--color-extra-light-black); color: var(--color-extra-light-black);
display: block; display: block;

8
packages/upload/src/upload-list.vue
View File

@ -1,7 +1,11 @@
<template> <template>
<transition-group <transition-group
tag="ul" tag="ul"
:class="['el-upload-list', 'el-upload-list--' + listType]" :class="[
'el-upload-list',
'el-upload-list--' + listType,
{ 'is-disabled': disabled }
]"
name="el-list" name="el-list"
> >
<li <li
@ -24,7 +28,7 @@
'el-icon-check': ['picture-card', 'picture'].indexOf(listType) > -1 'el-icon-check': ['picture-card', 'picture'].indexOf(listType) > -1
}"></i> }"></i>
</label> </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 <el-progress
v-if="file.status === 'uploading'" v-if="file.status === 'uploading'"
:type="listType === 'picture-card' ? 'circle' : 'line'" :type="listType === 'picture-card' ? 'circle' : 'line'"