[Improvement] Area: default option (#1272)

This commit is contained in:
neverland
2018-06-12 20:30:19 +08:00
committed by GitHub
parent 108c7c1eb1
commit c4c93ebbf7
9 changed files with 391 additions and 136 deletions

View File

@@ -108,8 +108,7 @@ exports[`renders demo correctly 1`] = `
<div class="van-picker__columns" style="height:220px;">
<div class="van-picker-column" style="height:220px;">
<ul style="transition:0ms;transform:translate3d(0, 88px, 0);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">北京市</li>
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li>
<li class="van-ellipsis van-picker-column__item">天津市</li>
<li class="van-ellipsis van-picker-column__item">河北省</li>
<li class="van-ellipsis van-picker-column__item">山西省</li>
@@ -147,12 +146,26 @@ exports[`renders demo correctly 1`] = `
</div>
<div class="van-picker-column" style="height:220px;">
<ul style="transition:0ms;transform:translate3d(0, 88px, 0);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">北京市</li>
<li class="van-ellipsis van-picker-column__item">县</li>
</ul>
</div>
<div class="van-picker-column" style="height:220px;">
<ul style="transition:0ms;transform:translate3d(0, 88px, 0);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">东城区</li>
<li class="van-ellipsis van-picker-column__item">西城区</li>
<li class="van-ellipsis van-picker-column__item">朝阳区</li>
<li class="van-ellipsis van-picker-column__item">丰台区</li>
<li class="van-ellipsis van-picker-column__item">石景山区</li>
<li class="van-ellipsis van-picker-column__item">海淀区</li>
<li class="van-ellipsis van-picker-column__item">门头沟区</li>
<li class="van-ellipsis van-picker-column__item">房山区</li>
<li class="van-ellipsis van-picker-column__item">通州区</li>
<li class="van-ellipsis van-picker-column__item">顺义区</li>
<li class="van-ellipsis van-picker-column__item">昌平区</li>
<li class="van-ellipsis van-picker-column__item">大兴区</li>
<li class="van-ellipsis van-picker-column__item">怀柔区</li>
<li class="van-ellipsis van-picker-column__item">平谷区</li>
</ul>
</div>
<div class="van-hairline--top-bottom van-picker__frame" style="height:44px;"></div>

View File

@@ -188,33 +188,20 @@ exports[`create a AddressEdit with props 1`] = `
<div class="van-picker__columns" style="height:220px;">
<div class="van-picker-column" style="height:220px;">
<ul style="transition:0ms;transform:translate3d(0, 88px, 0);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">北京市</li>
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li>
<li class="van-ellipsis van-picker-column__item">天津市</li>
</ul>
</div>
<div class="van-picker-column" style="height:220px;">
<ul style="transition:0ms;transform:translate3d(0, 88px, 0);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">北京市</li>
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">北京市</li>
<li class="van-ellipsis van-picker-column__item"></li>
</ul>
</div>
<div class="van-picker-column" style="height:220px;">
<ul style="transition:0ms;transform:translate3d(0, 88px, 0);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">东城区</li>
<li class="van-ellipsis van-picker-column__item van-picker-column__item--selected">东城区</li>
<li class="van-ellipsis van-picker-column__item">西城区</li>
<li class="van-ellipsis van-picker-column__item">朝阳区</li>
<li class="van-ellipsis van-picker-column__item">丰台区</li>
<li class="van-ellipsis van-picker-column__item">石景山区</li>
<li class="van-ellipsis van-picker-column__item">海淀区</li>
<li class="van-ellipsis van-picker-column__item">门头沟区</li>
<li class="van-ellipsis van-picker-column__item">房山区</li>
<li class="van-ellipsis van-picker-column__item">通州区</li>
<li class="van-ellipsis van-picker-column__item">顺义区</li>
<li class="van-ellipsis van-picker-column__item">昌平区</li>
<li class="van-ellipsis van-picker-column__item">大兴区</li>
<li class="van-ellipsis van-picker-column__item">怀柔区</li>
<li class="van-ellipsis van-picker-column__item">平谷区</li>
</ul>
</div>
<div class="van-hairline--top-bottom van-picker__frame" style="height:44px;"></div>

View File

@@ -212,22 +212,22 @@ test('set/get area code', async() => {
propsData: { areaList }
});
expect(wrapper.vm.getArea()).toEqual([
{ code: '-1', name: '选择省份' },
{ code: '-1', name: '选择城市' },
{ code: '-1', name: '选择地区' }
]);
wrapper.vm.setAreaCode('110101');
await later(50);
expect(wrapper.vm.data.area_code).toEqual('110101');
expect(wrapper.vm.getArea()).toEqual([
{ code: '110000', name: '北京市' },
{ code: '110100', name: '北京市' },
{ code: '110101', name: '东城区' }
]);
wrapper.vm.setAreaCode('110102');
await later(50);
expect(wrapper.vm.data.area_code).toEqual('110102');
expect(wrapper.vm.getArea()).toEqual([
{ code: '110000', name: '北京市' },
{ code: '110100', name: '北京市' },
{ code: '110102', name: '西城区' }
]);
wrapper.vm.$refs = [];
wrapper.vm.setAreaCode('110102');
expect(wrapper.vm.getArea()).toEqual([]);