|
|
@@ -28,14 +28,15 @@
|
|
|
}">
|
|
|
{{taskItem.statusText}}
|
|
|
</span>
|
|
|
- <span class="progress-text">{{taskItem.progress}}%</span>
|
|
|
+ <span v-show="taskItem.ifKnowProgress && taskItem.status === 'LOADING'" class="progress-text">{{taskItem.progress}}</span>
|
|
|
<img
|
|
|
+ v-show="taskItem.status !== 'SUCCESS'"
|
|
|
class="cancel-btn"
|
|
|
:src="require('@/assets/images/icons/material_preview_upload_cancel@2x.png')"
|
|
|
/>
|
|
|
</div>
|
|
|
- <div class="progress-bar" v-if="taskItem.ifKnowProgress" :style="{width: taskItem.progress + '%'}"></div>
|
|
|
- <div class="progress-bar-unknown" v-else></div>
|
|
|
+ <div class="progress-bar" v-if="taskItem.ifKnowProgress && taskItem.status === 'LOADING'" :style="{width: taskItem.progress}"></div>
|
|
|
+ <div class="progress-bar-unknown" v-if="!taskItem.ifKnowProgress && taskItem.status ==='LOADING'"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
@@ -54,7 +55,7 @@ export default {
|
|
|
* 每个元素的内部结构:{
|
|
|
* title: String
|
|
|
* ifKnowProgress: Boolean // false则进度条效果是loading而不是具体进度
|
|
|
- * progress:Number // 进度条,为负数的话会显示一个loading效果但不显示真实进度。
|
|
|
+ * progress:String // 进度,以百分号结尾。
|
|
|
* status: 'SUCCESS' | 'FAIL' | 'LOADING' // 只影响statusText的样式,以及是否显示进度条。
|
|
|
* statusText
|
|
|
* }
|
|
|
@@ -65,28 +66,28 @@ export default {
|
|
|
// {
|
|
|
// title: '标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题',
|
|
|
// ifKnowProgress: true,
|
|
|
- // progress: 100,
|
|
|
+ // progress: '100%',
|
|
|
// status: 'SUCCESS',
|
|
|
// statusText: '成功',
|
|
|
// },
|
|
|
// {
|
|
|
// title: '标题',
|
|
|
// ifKnowProgress: true,
|
|
|
- // progress: 30,
|
|
|
+ // progress: '30%',
|
|
|
// status: 'LOADING',
|
|
|
// statusText: '上传中',
|
|
|
// },
|
|
|
// {
|
|
|
// title: '标题',
|
|
|
// ifKnowProgress: false,
|
|
|
- // progress: 30,
|
|
|
+ // progress: '30%',
|
|
|
// status: 'LOADING',
|
|
|
- // statusText: '上传中',
|
|
|
+ // statusText: '后台处理中',
|
|
|
// },
|
|
|
// {
|
|
|
// title: '标题',
|
|
|
// ifKnowProgress: true,
|
|
|
- // progress: 55,
|
|
|
+ // progress: '55%',
|
|
|
// status: 'FAIL',
|
|
|
// statusText: '失败',
|
|
|
// }
|