alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan
2020-09-17 14:20:23 +08:00
parent dd9e00e9c9 adccdbcb21
commit 34f1124999
9 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slider/README.md
+8 -2
View File
@@ -111,8 +111,14 @@ export default {
```html
<div :style="{ height: '150px' }">
<van-slider v-model="value" vertical />
<van-slider v-model="value2" range vertical @change="onChange" />
<van-slider v-model="value" vertical @change="onChange" />
<van-slider
v-model="value2"
range
vertical
style="margin-left: 100px;"
@change="onChange"
/>
</div>
```
src/slider/README.zh-CN.md
+7 -1
View File
@@ -114,7 +114,13 @@ export default {
```html
<div :style="{ height: '150px' }">
<van-slider v-model="value" vertical @change="onChange" />
<van-slider v-model="value2" range vertical @change="onChange" />
<van-slider
v-model="value2"
range
vertical
style="margin-left: 100px;"
@change="onChange"
/>
</div>
```
src/slider/test/__snapshots__/demo.spec.js.snap
+2 -6
View File
@@ -69,7 +69,7 @@ exports[`renders demo correctly 1`] = `
</div>
</div>
<div>
<div style="height: 120px; padding-left: 30px;">
<div style="height: 150px; padding-left: 30px;">
<div class="van-slider van-slider--vertical">
<div class="van-slider__bar" style="height: 50%;">
<div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="50" aria-valuemax="100" aria-orientation="vertical" class="van-slider__button-wrapper">
@@ -77,11 +77,7 @@ exports[`renders demo correctly 1`] = `
</div>
</div>
</div>
</div>
</div>
<div>
<div style="height: 120px; padding-left: 30px;">
<div class="van-slider van-slider--vertical">
<div class="van-slider van-slider--vertical" style="margin-left: 100px;">
<div class="van-slider__bar" style="height: 40%; top: 20%;">
<div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="20,60" aria-valuemax="100" aria-orientation="vertical" class="van-slider__button-wrapper-left">
<div class="van-slider__button"></div>