This commit is contained in:
mo.duan 2020-01-02 15:54:26 +08:00
parent 254a37a0f8
commit 50ebddc7c9
3 changed files with 59 additions and 3 deletions

View file

@ -1,5 +1,15 @@
<style> <style>
.demo-status{
display: block;
color: #fff;
}
.demo-step-tip .ivu-steps-status-finish .ivu-icon{
color: #2d8cf0
}
.demo-step-tip .ivu-steps-status-error .ivu-icon{
color: #ed4014
}
</style> </style>
<template> <template>
<div> <div>
@ -9,6 +19,42 @@
<!--<Step title="结束"></Step>--> <!--<Step title="结束"></Step>-->
</Steps> </Steps>
<Button @click="change">change</Button> <Button @click="change">change</Button>
<div style="margin:30px">
<h2>
<a href="https://github.com/iview/iview/issues/6078">#6078</a>
</h2>
<br><br>
<Steps class="demo-step-tip" :current="2" status="error" size="small">
<Step>
<div slot="status">
<Tooltip content="已完成" size="14" placement="top" transfer>
<Icon size="18" type="ios-checkmark" />
</Tooltip>
</div>
</Step>
<Step>
<div slot="status">
<Tooltip content="进行中" size="14" placement="top" transfer>
<Icon size="18" type="ios-checkmark" />
</Tooltip>
</div>
</Step>
<Step>
<div slot="status">
<Tooltip content="待处理" placement="top" transfer>
<Icon size="18" type="ios-checkmark" />
</Tooltip>
</div>
</Step>
<Step>
<div slot="status">
<Tooltip content="待进行" placement="top" transfer>
<Icon size="18" type="ios-checkmark" />
</Tooltip>
</div>
</Step>
</Steps>
</div>
<br><br><br><br> <br><br><br><br>
<hr> <hr>
<!--<Steps :current="1" size="small">--> <!--<Steps :current="1" size="small">-->
@ -100,12 +146,21 @@
activitiList:[ activitiList:[
{ {
approveUserName:'123', approveUserName:'123',
tooltip:'测试标题',
startTime:'1' startTime:'1'
},{ },{
approveUserName:'123', approveUserName:'123',
tooltip:'测试标题2',
startTime:'2' startTime:'2'
} }
], ],
statusList:[
{
tooltip:'测试标题',
},{
tooltip:'测试标题2',
}
],
changeList:[ changeList:[
{ {
approveUserName:'456', approveUserName:'456',

View file

@ -3,8 +3,10 @@
<div :class="[prefixCls + '-tail']"><i></i></div> <div :class="[prefixCls + '-tail']"><i></i></div>
<div :class="[prefixCls + '-head']"> <div :class="[prefixCls + '-head']">
<div :class="[prefixCls + '-head-inner']"> <div :class="[prefixCls + '-head-inner']">
<slot name="status">
<span v-if="!icon && currentStatus != 'finish' && currentStatus != 'error'">{{ stepNumber }}</span> <span v-if="!icon && currentStatus != 'finish' && currentStatus != 'error'">{{ stepNumber }}</span>
<span v-else :class="iconClasses"></span> <span v-else :class="iconClasses"></span>
</slot>
</div> </div>
</div> </div>
<div :class="[prefixCls + '-main']"> <div :class="[prefixCls + '-main']">

View file

@ -126,7 +126,6 @@
.@{steps-prefix-cls}-main { .@{steps-prefix-cls}-main {
position: relative; position: relative;
display: inline-block; display: inline-block;
vertical-align: top;
} }
.@{steps-prefix-cls}-head-inner { .@{steps-prefix-cls}-head-inner {