Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-16 19:43:13 +08:00
5 changed files with 145 additions and 27 deletions
+1 -1
View File
@@ -463,7 +463,7 @@ export default {
| label-align |  表单项 label 对齐方式,可选值为 `center` `right` | _string_ | `left` |
| input-align | 输入框对齐方式,可选值为 `center` `right` | _string_ | `left` |
| error-message-align | 错误提示文案对齐方式,可选值为 `center` `right` | _string_ | `left` |
| validate-trigger `v2.5.2` | 表单校验触发时机,可选值为`onChange` | _string_ | `onBlur` |
| validate-trigger `v2.5.2` | 表单校验触发时机,可选值为 `onChange``onSubmit` | _string_ | `onBlur` |
| colon | 是否在 label 后面添加冒号 | _boolean_ | `false` |
| validate-first | 是否在某一项校验不通过时停止校验 | _boolean_ | `false` |
| scroll-to-error `v2.5.2` | 是否在提交表单且校验不通过时滚动至错误的表单项 | _boolean_ | `false` |
@@ -11,6 +11,18 @@ exports[`renders demo correctly 1`] = `
</div>
</div>
</div>
<div>
<div class="van-slider">
<div class="van-slider__bar" style="width: 40%; left: 20%;">
<div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="20,60" aria-valuemax="100" aria-orientation="horizontal" class="van-slider__button-wrapper-left">
<div class="van-slider__button"></div>
</div>
<div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="20,60" aria-valuemax="100" aria-orientation="horizontal" class="van-slider__button-wrapper-right">
<div class="van-slider__button"></div>
</div>
</div>
</div>
</div>
<div>
<div class="van-slider">
<div class="van-slider__bar" style="width: 50%;">
@@ -67,5 +79,19 @@ exports[`renders demo correctly 1`] = `
</div>
</div>
</div>
<div>
<div style="height: 120px; padding-left: 30px;">
<div class="van-slider van-slider--vertical">
<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>
</div>
<div role="slider" tabindex="0" aria-valuemin="0" aria-valuenow="20,60" aria-valuemax="100" aria-orientation="vertical" class="van-slider__button-wrapper-right">
<div class="van-slider__button"></div>
</div>
</div>
</div>
</div>
</div>
</div>
`;