From 01b8d340c56dd857887a3d01e403fdd867463bf6 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 27 Apr 2017 14:33:25 +0800
Subject: [PATCH] fixed #778

---
 examples/routers/checkbox.vue        | 103 +++++++++++++++++--------------------------------------------------------------------------------------
 src/components/checkbox/checkbox.vue |   2 ++
 2 files changed, 19 insertions(+), 86 deletions(-)

diff --git a/examples/routers/checkbox.vue b/examples/routers/checkbox.vue
index 3d9635c..399407c 100644
--- a/examples/routers/checkbox.vue
+++ b/examples/routers/checkbox.vue
@@ -1,56 +1,9 @@
 <template>
     <div>
-        <Checkbox v-model="single" @on-change="s">Checkbox</Checkbox>
-        {{ single }}
-        <div @click="single = !single">single-change</div>
-        <br>
-        {{ social }}
-        <Checkbox-group v-model="social" @on-change="s">
-            <Checkbox label="twitter">
-                <Icon type="social-twitter"></Icon>
-                <span>Twitter</span>
-            </Checkbox>
-            <Checkbox label="facebook">
-                <Icon type="social-facebook"></Icon>
-                <span>Facebook</span>
-            </Checkbox>
-            <Checkbox label="github">
-                <Icon type="social-github"></Icon>
-                <span>Github</span>
-            </Checkbox>
-            <Checkbox label="snapchat">
-                <Icon type="social-snapchat"></Icon>
-                <span>Snapchat</span>
-            </Checkbox>
-        </Checkbox-group>
-        <br>
-        <div @click="c">修改1</div>
-        {{ fruit }}
         <Checkbox-group v-model="fruit">
-            <Row>
-                <i-col span="8">
-                    <Checkbox label="香蕉"></Checkbox>
-                </i-col>
-                <i-col span="8">
-                    <Checkbox label="苹果"></Checkbox>
-                </i-col>
-                <i-col span="8">
-                    <Checkbox label="西瓜"></Checkbox>
-                </i-col>
-            </Row>
-        </Checkbox-group>
-        <br><br>
-        <div style="border-bottom: 1px solid #e9e9e9;padding-bottom:6px;margin-bottom:6px;">
-            <Checkbox
-                    :indeterminate="indeterminate"
-                    v-model="checkAll"
-                    @click.prevent.native="handleCheckAll">全选</Checkbox>
-        </div>
-        <Checkbox-group v-model="checkAllGroup" @on-change="checkAllGroupChange">
-            <Checkbox label="香蕉"></Checkbox>
-            <Checkbox label="苹果"></Checkbox>
-            <Checkbox label="西瓜"></Checkbox>
+            <Checkbox v-for="item in tags" :label="item.label"></Checkbox>
         </Checkbox-group>
+        <div>{{ fruit }}</div>
     </div>
 </template>
 <script>
@@ -59,45 +12,23 @@
             return {
                 social: ['facebook', 'github'],
                 fruit: ['苹果'],
-                single: false,
-                indeterminate: true,
-                checkAll: false,
-                checkAllGroup: ['香蕉', '西瓜']
+                tags: []
             }
         },
-        methods: {
-            c () {
-                this.social.splice(0, 1)
-            },
-            s (d) {
-                console.log(d)
-            },
-            handleCheckAll () {
-                if (this.indeterminate) {
-                    this.checkAll = false;
-                } else {
-                    this.checkAll = !this.checkAll;
-                }
-                this.indeterminate = false;
-
-                if (this.checkAll) {
-                    this.checkAllGroup = ['香蕉', '苹果', '西瓜'];
-                } else {
-                    this.checkAllGroup = [];
-                }
-            },
-            checkAllGroupChange (data) {
-                if (data.length === 3) {
-                    this.indeterminate = false;
-                    this.checkAll = true;
-                } else if (data.length > 0) {
-                    this.indeterminate = true;
-                    this.checkAll = false;
-                } else {
-                    this.indeterminate = false;
-                    this.checkAll = false;
-                }
-            }
+        mounted () {
+            setTimeout(() => {
+                this.tags = [
+                    {
+                        label: '香蕉'
+                    },
+                    {
+                        label: '苹果'
+                    },
+                    {
+                        label: '西瓜'
+                    }
+                ]
+            }, 1000);
         }
     }
 </script>
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 0d76d86..5bc52c2 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -90,6 +90,8 @@
             if (!this.group) {
                 this.updateModel();
                 this.showSlot = this.$slots.default !== undefined;
+            } else {
+                this.parent.updateModel(true);
             }
         },
         methods: {
--
libgit2 0.21.4