Skip to content

Commit c1fd635

Browse files
张寸起7insummer
authored andcommitted
feat:steps组件新增reverse属性
1 parent ec1b35a commit c1fd635

File tree

13 files changed

+61
-18
lines changed

13 files changed

+61
-18
lines changed

dist/step/index.wxml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<slot name="describe"/>
2525
</view>
2626
</view>
27-
<view class="step-line l-line-class {{'step-line-'+ direction}} {{activeIndex>index?'step-line-finish':'step-line-wait'}}"
27+
<view class="step-line l-line-class {{'step-line-'+ direction}} {{currentStatus.isReverse(reverse,activeIndex,index)?'step-line-finish':'step-line-wait'}}"
2828
style="{{activeIndex>index?('background-color:'+color):''}}"
29-
wx:if="{{length !== index+1}}">
29+
wx:if="{{reverse?(index!==0):(length!==index+1)}}">
3030
</view>
3131
</view>
3232

@@ -59,9 +59,17 @@ var dotStyle = function(activeIndex,index,color){
5959
}
6060
}
6161

62+
var isReverse = function(reverse,activeIndex,index) {
63+
if(reverse){
64+
return (activeIndex>=index)
65+
}
66+
return (activeIndex>index)
67+
}
68+
6269
module.exports = {
6370
setStatus:setStatus,
6471
statusStyle:statusStyle,
65-
dotStyle:dotStyle
72+
dotStyle:dotStyle,
73+
isReverse:isReverse
6674
}
6775
</wxs>

dist/steps/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Component({
3535
type: String,
3636
value: 'process'
3737
},
38-
dot: Boolean
38+
dot: Boolean,
39+
reverse: Boolean
3940
},
4041

4142
observers: {

dist/steps/index.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<view class="l-class steps-container {{'steps-container-'+direction}}">
1+
<view class="l-class steps-container {{reverse?'steps-container-'+direction+'-reverse':'steps-container-'+direction}}">
22
<slot />
33
</view>

dist/steps/index.wxss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.steps-container{display:flex;width:100%}.steps-container-row{flex-direction:row}.steps-container-column{flex-direction:column}
1+
.steps-container{display:flex;width:100%}.steps-container-row{flex-direction:row}.steps-container-row-reverse{flex-direction:row-reverse}.steps-container-column{flex-direction:column}.steps-container-column-reverse{flex-direction:column-reverse}

examples/dist/step/index.wxml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<slot name="describe"/>
2525
</view>
2626
</view>
27-
<view class="step-line l-line-class {{'step-line-'+ direction}} {{activeIndex>index?'step-line-finish':'step-line-wait'}}"
27+
<view class="step-line l-line-class {{'step-line-'+ direction}} {{currentStatus.isReverse(reverse,activeIndex,index)?'step-line-finish':'step-line-wait'}}"
2828
style="{{activeIndex>index?('background-color:'+color):''}}"
29-
wx:if="{{length !== index+1}}">
29+
wx:if="{{reverse?(index!==0):(length!==index+1)}}">
3030
</view>
3131
</view>
3232

@@ -59,9 +59,17 @@ var dotStyle = function(activeIndex,index,color){
5959
}
6060
}
6161

62+
var isReverse = function(reverse,activeIndex,index) {
63+
if(reverse){
64+
return (activeIndex>=index)
65+
}
66+
return (activeIndex>index)
67+
}
68+
6269
module.exports = {
6370
setStatus:setStatus,
6471
statusStyle:statusStyle,
65-
dotStyle:dotStyle
72+
dotStyle:dotStyle,
73+
isReverse:isReverse
6674
}
6775
</wxs>

examples/dist/steps/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Component({
3535
type: String,
3636
value: 'process'
3737
},
38-
dot: Boolean
38+
dot: Boolean,
39+
reverse: Boolean
3940
},
4041

4142
observers: {

examples/dist/steps/index.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<view class="l-class steps-container {{'steps-container-'+direction}}">
1+
<view class="l-class steps-container {{reverse?'steps-container-'+direction+'-reverse':'steps-container-'+direction}}">
22
<slot />
33
</view>

examples/dist/steps/index.wxss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.steps-container{display:flex;width:100%}.steps-container-row{flex-direction:row}.steps-container-column{flex-direction:column}
1+
.steps-container{display:flex;width:100%}.steps-container-row{flex-direction:row}.steps-container-row-reverse{flex-direction:row-reverse}.steps-container-column{flex-direction:column}.steps-container-column-reverse{flex-direction:column-reverse}

examples/pages/components/view/pages/steps/index.wxml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@
2727
</l-steps>
2828
</content-card>
2929

30+
<content-card name="步骤条顺序" cardPadding="{{false}}">
31+
<l-steps direction="column" reverse active-index="1">
32+
<l-step title="已支付" describe="11:30" />
33+
<l-step title="备餐中" describe="12:30" />
34+
<l-step title="配送中" describe="13:30" />
35+
</l-steps>
36+
</content-card>
37+
3038
<content-card name="设置步骤条元素图标" cardPadding="{{false}}">
3139
<l-steps dot direction="column" active-index="1">
3240
<l-step icon="cart" title="已支付" describe="11:30" />

src/step/index.wxml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<slot name="describe"/>
2525
</view>
2626
</view>
27-
<view class="step-line l-line-class {{'step-line-'+ direction}} {{activeIndex>index?'step-line-finish':'step-line-wait'}}"
27+
<view class="step-line l-line-class {{'step-line-'+ direction}} {{currentStatus.isReverse(reverse,activeIndex,index)?'step-line-finish':'step-line-wait'}}"
2828
style="{{activeIndex>index?('background-color:'+color):''}}"
29-
wx:if="{{length !== index+1}}">
29+
wx:if="{{reverse?(index!==0):(length!==index+1)}}">
3030
</view>
3131
</view>
3232

@@ -59,9 +59,17 @@ var dotStyle = function(activeIndex,index,color){
5959
}
6060
}
6161

62+
var isReverse = function(reverse,activeIndex,index) {
63+
if(reverse){
64+
return (activeIndex>=index)
65+
}
66+
return (activeIndex>index)
67+
}
68+
6269
module.exports = {
6370
setStatus:setStatus,
6471
statusStyle:statusStyle,
65-
dotStyle:dotStyle
72+
dotStyle:dotStyle,
73+
isReverse:isReverse
6674
}
6775
</wxs>

0 commit comments

Comments
 (0)