[improvement] update eslint rules (#2089)

This commit is contained in:
neverland
2018-11-15 15:30:17 +08:00
committed by GitHub
parent 0860901ec1
commit e14b43e66a
129 changed files with 1874 additions and 456 deletions

View File

@@ -1,7 +1,10 @@
<template>
<demo-section>
<demo-block :title="$t('basicUsage')">
<van-picker :columns="$t('column1')" @change="onChange1" />
<van-picker
:columns="$t('column1')"
@change="onChange1"
/>
</demo-block>
<demo-block :title="$t('title2')">
@@ -19,11 +22,17 @@
</demo-block>
<demo-block :title="$t('title4')">
<van-picker :columns="columns" @change="onChange2" />
<van-picker
:columns="columns"
@change="onChange2"
/>
</demo-block>
<demo-block :title="$t('loading')">
<van-picker :columns="columns" loading />
<van-picker
loading
:columns="columns"
/>
</demo-block>
</demo-section>
</template>

View File

@@ -1,16 +1,42 @@
<template>
<div :class="b()">
<div :class="b('toolbar')" class="van-hairline--top-bottom" v-if="showToolbar">
<div
v-if="showToolbar"
:class="b('toolbar')"
class="van-hairline--top-bottom"
>
<slot>
<div :class="b('cancel')" @click="emit('cancel')">{{ cancelButtonText || $t('cancel') }}</div>
<div :class="b('title')" class="van-ellipsis" v-if="title" v-text="title" />
<div :class="b('confirm')" @click="emit('confirm')">{{ confirmButtonText || $t('confirm') }}</div>
<div
:class="b('cancel')"
@click="emit('cancel')"
>
{{ cancelButtonText || $t('cancel') }}
</div>
<div
v-if="title"
v-text="title"
:class="b('title')"
class="van-ellipsis"
/>
<div
:class="b('confirm')"
@click="emit('confirm')"
>
{{ confirmButtonText || $t('confirm') }}
</div>
</slot>
</div>
<div v-if="loading" :class="b('loading')">
<div
v-if="loading"
:class="b('loading')"
>
<loading />
</div>
<div :class="b('columns')" :style="columnsStyle" @touchmove.prevent>
<div
:class="b('columns')"
:style="columnsStyle"
@touchmove.prevent
>
<picker-column
v-for="(item, index) in (simple ? [columns] : columns)"
:key="index"
@@ -22,7 +48,11 @@
:visible-item-count="visibleItemCount"
@change="onChange(index)"
/>
<div :class="b('frame')" class="van-hairline--top-bottom" :style="frameStyle" />
<div
:class="b('frame')"
class="van-hairline--top-bottom"
:style="frameStyle"
/>
</div>
</div>
</template>

View File

@@ -39,9 +39,13 @@ exports[`renders demo correctly 1`] = `
<div>
<div class="van-picker">
<div class="van-hairline--top-bottom van-picker__toolbar">
<div class="van-picker__cancel">取消</div>
<div class="van-picker__cancel">
取消
</div>
<div class="van-ellipsis van-picker__title">标题</div>
<div class="van-picker__confirm">确认</div>
<div class="van-picker__confirm">
确认
</div>
</div>
<!---->
<div class="van-picker__columns" style="height:220px;">