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

fix uploading style bug

pull/4666/head
baiyaaaaa 2017-05-04 11:35:37 +08:00 committed by 杨奕
parent bf7eabb64d
commit 17e2d458ae
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,13 +113,13 @@
& .el-progress { & .el-progress {
position: absolute; position: absolute;
bottom: -3px; top: 20px;
width: 100%; width: 100%;
} }
& .el-progress__text { & .el-progress__text {
position: absolute; position: absolute;
right: 0; right: 0;
top: -10px; top: -13px;
right: 0; right: 0;
} }
.el-progress-bar { .el-progress-bar {
@ -152,6 +152,9 @@
.el-icon-close { .el-icon-close {
display: inline-block; display: inline-block;
} }
.el-progress__text {
display: none;
}
} }
@when success { @when success {
.el-upload-list__item-status-label { .el-upload-list__item-status-label {
@ -379,7 +382,8 @@
} }
} }
.el-progress { .el-progress {
position: static; position: relative;
top: -7px;
} }
} }
} }

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

@ -25,6 +25,12 @@
}"></i> }"></i>
</label> </label>
<i class="el-icon-close" @click="$emit('remove', file)"></i> <i class="el-icon-close" @click="$emit('remove', file)"></i>
<el-progress
v-if="file.status === 'uploading'"
:type="listType === 'picture-card' ? 'circle' : 'line'"
:stroke-width="listType === 'picture-card' ? 6 : 2"
:percentage="parsePercentage(file.percentage)">
</el-progress>
<span class="el-upload-list__item-actions" v-if="listType === 'picture-card'"> <span class="el-upload-list__item-actions" v-if="listType === 'picture-card'">
<span <span
class="el-upload-list__item-preview" class="el-upload-list__item-preview"
@ -40,12 +46,6 @@
<i class="el-icon-delete2"></i> <i class="el-icon-delete2"></i>
</span> </span>
</span> </span>
<el-progress
v-if="file.status === 'uploading'"
:type="listType === 'picture-card' ? 'circle' : 'line'"
:stroke-width="listType === 'picture-card' ? 6 : 2"
:percentage="parsePercentage(file.percentage)">
</el-progress>
</li> </li>
</transition-group> </transition-group>
</template> </template>