ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-12-22 01:07:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[bugfix] Checkbox: should not render label when label is empty (#920)

Browse Source
This commit is contained in:
neverland
2018-04-24 09:51:52 +08:00
committed by GitHub
parent 9d623a6196
commit 86184e090e
10 changed files with 63 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
docs/demos/views/checkbox.vue
View File

@@ -1,17 +1,16 @@
<template>
<demo-section>
<demo-block :title="$t('basicUsage')">
<van-checkbox v-model="checkbox1">{{ $t('checkbox') }} 1</van-checkbox>
<van-checkbox v-model="checkbox1">{{ $t('checkbox') }}</van-checkbox>
</demo-block>
<demo-block :title="$t('disabled')">
<van-checkbox :value="false" disabled>{{ $t('checkbox') }} 2</van-checkbox>
<van-checkbox :value="true" disabled>{{ $t('checkbox') }} 2</van-checkbox>
<van-checkbox :value="false" disabled>{{ $t('checkbox') }}</van-checkbox>
<van-checkbox :value="true" disabled>{{ $t('checkbox') }}</van-checkbox>
</demo-block>
<demo-block :title="$t('labelDisabled')">
<van-checkbox v-model="checkbox3" label-disabled>{{ $t('checkbox') }} 2</van-checkbox>
<van-checkbox v-model="checkbox4" label-disabled>{{ $t('checkbox') }} 2</van-checkbox>
<van-checkbox v-model="checkbox2" label-disabled>{{ $t('checkbox') }}</van-checkbox>
</demo-block>
<demo-block :title="$t('title3')">
@@ -27,20 +26,22 @@
</demo-block>
<demo-block :title="$t('title4')">
<van-checkbox-group v-model="result">
<van-cell-group>
<van-cell v-for="(item, index) in list" :key="index">
<van-checkbox :name="item">{{ $t('checkbox') }} {{ item }}</van-checkbox>
</van-cell>
</van-cell-group>
<van-checkbox-group v-model="result2" :max="2">
<van-checkbox
v-for="(item, index) in list"
:key="index"
:name="item"
>
{{ $t('checkbox') }} {{ item }}
</van-checkbox>
</van-checkbox-group>
</demo-block>
<demo-block :title="$t('title5')">
<van-checkbox-group v-model="result2" :max="max">
<van-checkbox-group v-model="result3">
<van-cell-group>
<van-cell v-for="(item, index) in list" :key="index">
<van-checkbox :name="item">{{ $t('checkbox') }} {{ item }}</van-checkbox>
<van-cell v-for="(item, index) in list" :title="$t('checkbox') + item" :key="index">
<van-checkbox :name="item" />
</van-cell>
</van-cell-group>
</van-checkbox-group>
@@ -53,17 +54,17 @@ export default {
i18n: {
'zh-CN': {
checkbox: '复选框',
labelDisabled: '禁用 Checkbox 内容部分点击事件',
labelDisabled: '禁用内容部分点击事件',
title3: 'Checkbox 组',
title4: '与 Cell 组件一起使用',
title5: '设置最大可选数',
title4: '设置最大可选数',
title5: '与 Cell 组件一起使用'
},
'en-US': {
checkbox: 'Checkbox',
labelDisabled: 'Disable Checkbox Label click event',
labelDisabled: 'Disable Label click event',
title3: 'Checkbox Group',
title4: 'Inside a Cell',
title5: 'Maximum amount of checked options'
title4: 'Maximum amount of checked options',
title5: 'Inside a Cell'
}
},
@@ -71,8 +72,6 @@ export default {
return {
checkbox1: true,
checkbox2: true,
checkbox3: false,
checkbox4: true,
list: [
'a',
'b',
@@ -80,7 +79,7 @@ export default {
],
result: ['a', 'b'],
result2: [],
max: 2
result3: []
};
}
};
@@ -95,13 +94,6 @@ export default {
.van-cell {
.van-checkbox {
margin: 0;
display: flex;
flex-direction: row-reverse;
&__label {
margin: 0;
flex: 1;
}
}
}
}