feat(Checkbox): add bind-group prop (#4600)

This commit is contained in:
neverland 2019-09-27 12:49:09 +08:00 committed by GitHub
parent 0face945c9
commit f97b2bc7a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 0 deletions

View File

@ -155,6 +155,7 @@ export default {
| label-position | Can be set to `left` | *string* | `right` | - |
| icon-size | Icon size | *string \| number* | `20px` | - |
| checked-color | Checked color | *string* | `#1989fa` | - | - |
| bind-group | Whether to bind with CheckboxGroup | *boolean* | `true` | 2.2.4 |
### CheckboxGroup Props

View File

@ -157,6 +157,7 @@ export default {
| label-position | 文本位置,可选值为 `left` | *string* | `right` | - |
| icon-size | 图标大小,默认单位为`px` | *string \| number* | `20px` | - |
| checked-color | 选中状态颜色 | *string* | `#1989fa` | - |
| bind-group | 是否与复选框组绑定 | *boolean* | `true` | 2.2.4 |
### CheckboxGroup Props

View File

@ -131,3 +131,27 @@ test('checked-color prop', () => {
expect(wrapper).toMatchSnapshot();
});
test('bind-group prop', async () => {
const wrapper = mount({
template: `
<van-checkbox-group v-model="result">
<van-checkbox v-model="value" :bind-group="false" />
<van-checkbox v-for="item in list" :key="item" :name="item"></van-checkbox>
</van-checkbox-group>
`,
data() {
return {
value: false,
result: [],
list: ['a', 'b', 'c']
};
}
});
const icons = wrapper.findAll('.van-checkbox__icon');
icons.at(0).trigger('click');
await later();
expect(wrapper.vm.result).toEqual([]);
expect(wrapper.vm.value).toBeTruthy();
});

View File

@ -19,10 +19,18 @@ export const CheckboxMixin = ({ parent, bem, role }) => ({
shape: {
type: String,
default: 'round'
},
bindGroup: {
type: Boolean,
default: true
}
},
computed: {
disableBindRelation() {
return !this.bindGroup;
},
isDisabled() {
return (this.parent && this.parent.disabled) || this.disabled;
},

View File

@ -21,6 +21,10 @@ function flattenVNodes(vnodes: VNode[]) {
return result;
}
type ChildrenMixinThis = {
disableBindRelation?: boolean;
};
export function ChildrenMixin(parent: string, options: ChildrenMixinOptions = {}) {
const indexKey = options.indexKey || 'index';
@ -33,6 +37,10 @@ export function ChildrenMixin(parent: string, options: ChildrenMixinOptions = {}
computed: {
parent() {
if ((this as ChildrenMixinThis).disableBindRelation) {
return null;
}
return (this as any)[parent];
},