update the master branch to the latest

src/components/checkbox/checkbox-group.vue

@@ -0,0 +1,78 @@
+<template>
+    <div :class="classes">
+        <slot></slot>
+    </div>
+</template>
+<script>
+    import { findComponentsDownward, oneOf } from '../../utils/assist';
+    import Emitter from '../../mixins/emitter';
+
+    const prefixCls = 'ivu-checkbox-group';
+
+    export default {
+        name: 'CheckboxGroup',
+        mixins: [ Emitter ],
+        props: {
+            value: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            size: {
+                validator (value) {
+                    return oneOf(value, ['small', 'large', 'default']);
+                },
+                default () {
+                    return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
+                }
+            }
+        },
+        data () {
+            return {
+                currentValue: this.value,
+                childrens: []
+            };
+        },
+        computed: {
+            classes () {
+                return [
+                    `${prefixCls}`,
+                    {
+                        [`ivu-checkbox-${this.size}`]: !!this.size
+                    }
+                ];
+            }
+        },
+        mounted () {
+            this.updateModel(true);
+        },
+        methods: {
+            updateModel (update) {
+                this.childrens = findComponentsDownward(this, 'Checkbox');
+                if (this.childrens) {
+                    const { value } = this;
+                    this.childrens.forEach(child => {
+                        child.model = value;
+
+                        if (update) {
+                            child.currentValue = value.indexOf(child.label) >= 0;
+                            child.group = true;
+                        }
+                    });
+                }
+            },
+            change (data) {
+                this.currentValue = data;
+                this.$emit('input', data);
+                this.$emit('on-change', data);
+                this.dispatch('FormItem', 'on-form-change', data);
+            }
+        },
+        watch: {
+            value () {
+                this.updateModel(true);
+            }
+        }
+    };
+</script>

src/components/checkbox/checkbox.vue

@@ -0,0 +1,171 @@
+<template>
+    <label :class="wrapClasses">
+        <span :class="checkboxClasses">
+            <span :class="innerClasses"></span>
+            <input
+                v-if="group"
+                type="checkbox"
+                :class="inputClasses"
+                :disabled="disabled"
+                :value="label"
+                v-model="model"
+                :name="name"
+                @change="change"
+                @focus="onFocus"
+                @blur="onBlur">
+            <input
+                v-else
+                type="checkbox"
+                :class="inputClasses"
+                :disabled="disabled"
+                :checked="currentValue"
+                :name="name"
+                @change="change"
+                @focus="onFocus"
+                @blur="onBlur">
+        </span>
+        <slot><span v-if="showSlot">{{ label }}</span></slot>
+    </label>
+</template>
+<script>
+    import { findComponentUpward, oneOf } from '../../utils/assist';
+    import Emitter from '../../mixins/emitter';
+
+    const prefixCls = 'ivu-checkbox';
+
+    export default {
+        name: 'Checkbox',
+        mixins: [ Emitter ],
+        props: {
+            disabled: {
+                type: Boolean,
+                default: false
+            },
+            value: {
+                type: [String, Number, Boolean],
+                default: false
+            },
+            trueValue: {
+                type: [String, Number, Boolean],
+                default: true
+            },
+            falseValue: {
+                type: [String, Number, Boolean],
+                default: false
+            },
+            label: {
+                type: [String, Number, Boolean]
+            },
+            indeterminate: {
+                type: Boolean,
+                default: false
+            },
+            size: {
+                validator (value) {
+                    return oneOf(value, ['small', 'large', 'default']);
+                },
+                default () {
+                    return !this.$IVIEW || this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size;
+                }
+            },
+            name: {
+                type: String
+            }
+        },
+        data () {
+            return {
+                model: [],
+                currentValue: this.value,
+                group: false,
+                showSlot: true,
+                parent: findComponentUpward(this, 'CheckboxGroup'),
+                focusInner: false
+            };
+        },
+        computed: {
+            wrapClasses () {
+                return [
+                    `${prefixCls}-wrapper`,
+                    {
+                        [`${prefixCls}-group-item`]: this.group,
+                        [`${prefixCls}-wrapper-checked`]: this.currentValue,
+                        [`${prefixCls}-wrapper-disabled`]: this.disabled,
+                        [`${prefixCls}-${this.size}`]: !!this.size
+                    }
+                ];
+            },
+            checkboxClasses () {
+                return [
+                    `${prefixCls}`,
+                    {
+                        [`${prefixCls}-checked`]: this.currentValue,
+                        [`${prefixCls}-disabled`]: this.disabled,
+                        [`${prefixCls}-indeterminate`]: this.indeterminate
+                    }
+                ];
+            },
+            innerClasses () {
+                return [
+                    `${prefixCls}-inner`,
+                    {
+                        [`${prefixCls}-focus`]: this.focusInner
+                    }
+                ];
+            },
+            inputClasses () {
+                return `${prefixCls}-input`;
+            }
+        },
+        mounted () {
+            this.parent = findComponentUpward(this, 'CheckboxGroup');
+            if (this.parent) {
+                this.group = true;
+            }
+
+            if (this.group) {
+                this.parent.updateModel(true);
+            } else {
+                this.updateModel();
+                this.showSlot = this.$slots.default !== undefined;
+            }
+        },
+        methods: {
+            change (event) {
+                if (this.disabled) {
+                    return false;
+                }
+
+                const checked = event.target.checked;
+                this.currentValue = checked;
+
+                const value = checked ? this.trueValue : this.falseValue;
+                this.$emit('input', value);
+
+                if (this.group) {
+                    this.parent.change(this.model);
+                } else {
+                    this.$emit('on-change', value);
+                    this.dispatch('FormItem', 'on-form-change', value);
+                }
+            },
+            updateModel () {
+                this.currentValue = this.value === this.trueValue;
+            },
+            onBlur () {
+                this.focusInner = false;
+            },
+            onFocus () {
+                this.focusInner = true;
+            }
+        },
+        watch: {
+            value (val) {
+                if (val === this.trueValue || val === this.falseValue) {
+                    this.updateModel();
+                } else {
+                    throw 'Value should be trueValue or falseValue.';
+                }
+            }
+        }
+    };
+</script>

src/components/checkbox/index.js

@@ -0,0 +1,5 @@
+import Checkbox from './checkbox.vue';
+import CheckboxGroup from './checkbox-group.vue';
+
+Checkbox.Group = CheckboxGroup;
+export default Checkbox;