blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

[bugfix] Area: fix test cases (#1451)

Browse Source
This commit is contained in:
neverland 2018-07-10 10:07:26 +08:00 committed by GitHub
parent 75d0aecd1e
commit ac092e877e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/area/test/__snapshots__/index.spec.js.snap
View File

@ -98,19 +98,19 @@ exports[`reset method 1`] = `
<div class="van-picker__columns" style="height: 220px;"> <div class="van-picker__columns" style="height: 220px;">
<div class="van-picker-column" style="height: 220px;"> <div class="van-picker-column" style="height: 220px;">
<ul style="line-height: 44px;"> <ul style="line-height: 44px;">
<li class="van-ellipsis van-picker-column__item">北京市</li> <li class="van-ellipsis van-picker-column__item" style="height: 44px;">北京市</li>
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">天津市</li> <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">天津市</li>
</ul> </ul>
</div> </div>
<div class="van-picker-column" style="height: 220px;"> <div class="van-picker-column" style="height: 220px;">
<ul style="line-height: 44px;"> <ul style="line-height: 44px;">
<li class="van-ellipsis van-picker-column__item">天津市</li> <li class="van-ellipsis van-picker-column__item" style="height: 44px;">天津市</li>
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">县</li> <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">县</li>
</ul> </ul>
</div> </div>
<div class="van-picker-column" style="height: 220px;"> <div class="van-picker-column" style="height: 220px;">
<ul style="line-height: 44px;"> <ul style="line-height: 44px;">
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">蓟县</li> <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">蓟县</li>
</ul> </ul>
</div> </div>
<div class="van-hairline--top-bottom van-picker__frame" style="height: 44px;"></div> <div class="van-hairline--top-bottom van-picker__frame" style="height: 44px;"></div>
@ -129,20 +129,20 @@ exports[`reset method 2`] = `
<div class="van-picker__columns" style="height: 220px;"> <div class="van-picker__columns" style="height: 220px;">
<div class="van-picker-column" style="height: 220px;"> <div class="van-picker-column" style="height: 220px;">
<ul style="line-height: 44px;"> <ul style="line-height: 44px;">
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li> <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">北京市</li>
<li class="van-ellipsis van-picker-column__item">天津市</li> <li class="van-ellipsis van-picker-column__item" style="height: 44px;">天津市</li>
</ul> </ul>
</div> </div>
<div class="van-picker-column" style="height: 220px;"> <div class="van-picker-column" style="height: 220px;">
<ul style="line-height: 44px;"> <ul style="line-height: 44px;">
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li> <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">北京市</li>
<li class="van-ellipsis van-picker-column__item">县</li> <li class="van-ellipsis van-picker-column__item" style="height: 44px;">县</li>
</ul> </ul>
</div> </div>
<div class="van-picker-column" style="height: 220px;"> <div class="van-picker-column" style="height: 220px;">
<ul style="line-height: 44px;"> <ul style="line-height: 44px;">
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">东城区</li> <li class="van-ellipsis van-picker-column__item van-picker-column__item--selected" style="height: 44px;">东城区</li>
<li class="van-ellipsis van-picker-column__item">西城区</li> <li class="van-ellipsis van-picker-column__item" style="height: 44px;">西城区</li>
</ul> </ul>
</div> </div>
<div class="van-hairline--top-bottom van-picker__frame" style="height: 44px;"></div> <div class="van-hairline--top-bottom van-picker__frame" style="height: 44px;"></div>

6
packages/picker/PickerColumn.vue
View File

@ -11,15 +11,14 @@
<ul :style="wrapperStyle"> <ul :style="wrapperStyle">
<li <li
v-for="(option, index) in options" v-for="(option, index) in options"
:key="index"
v-html="getOptionText(option)" v-html="getOptionText(option)"
:style="optionStyle"
class="van-ellipsis" class="van-ellipsis"
:class="b('item', { :class="b('item', {
disabled: isDisabled(option), disabled: isDisabled(option),
selected: index === currentIndex selected: index === currentIndex
})" })"
@click="setIndex(index, true)" @click="setIndex(index, true)"
:style="itemStyle"
/> />
</ul> </ul>
</div> </div>
@ -99,7 +98,8 @@ export default create({
lineHeight: this.itemHeight + 'px' lineHeight: this.itemHeight + 'px'
}; };
}, },
itemStyle() {
optionStyle() {
return { return {
height: this.itemHeight + 'px' height: this.itemHeight + 'px'
}; };