From c1f6da1f8e67e7f504afc4b2153211c13ffad96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Wed, 21 Dec 2016 20:48:11 +0800
Subject: [PATCH] fixed CheckboxGroup bug

fixed CheckboxGroup bug
---
 src/components/checkbox/checkbox-group.vue | 11 ++---
 test/routers/date.vue                      |  5 +--
 test/routers/more.vue                      | 50 ++++++++--------------
 3 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/components/checkbox/checkbox-group.vue b/src/components/checkbox/checkbox-group.vue
index 24b850b9..85a68510 100644
--- a/src/components/checkbox/checkbox-group.vue
+++ b/src/components/checkbox/checkbox-group.vue
@@ -43,11 +43,12 @@
         },
         watch: {
             model (val, oldVal) {
-                if (val == oldVal) {
-                    this.updateModel();
-                } else {
-                    this.updateModel(true);
-                }
+//                if (val == oldVal) {
+//                    this.updateModel();
+//                } else {
+//                    this.updateModel(true);
+//                }
+                this.updateModel(true);
             }
         }
     }
diff --git a/test/routers/date.vue b/test/routers/date.vue
index e40c26ca..bf4ba198 100644
--- a/test/routers/date.vue
+++ b/test/routers/date.vue
@@ -7,16 +7,15 @@
             <i-col span="8">
                 <!--<i-button @click="setDate">set date</i-button>-->
                 <date-picker
-                        :type="type"
+                        type="month"
                         style="width:200px"
                         placeholder="请选择日期"
                         :value.sync="value"
                         @on-change="change"
-                        :confirm="true"
+                        :confirm="false"
                         :options="options"
                         open
                         @on-open-change="change2">
-                    <p>123</p>
                 </date-picker>
             </i-col>
             <i-col span="8">
diff --git a/test/routers/more.vue b/test/routers/more.vue
index e04eed18..d6208ad6 100644
--- a/test/routers/more.vue
+++ b/test/routers/more.vue
@@ -1,42 +1,26 @@
-<style>
-    .ivu-col div.aaaaa{
-        height: 100px;
-        line-height: 100px;
-        text-align: center;
-        color: #fff;
-        background: rgba(0, 153, 229, .9);
-    }
-    .ivu-col:nth-child(odd) div.aaaaa{
-        background: rgba(0, 153, 229, .7);
-    }
-</style>
 <template>
-    <Row>
-        <i-col :xs="2" :sm="4" :md="6" :lg="8"><div class="aaaaa">Col 1</div></i-col>
-        <i-col :xs="20" :sm="16" :md="12" :lg="8"><div class="aaaaa">Col 2</div></i-col>
-        <i-col :xs="2" :sm="4" :md="6" :lg="8"><div class="aaaaa">Col 3</div></i-col>
-    </Row>
-    <br><br>
-    <Row>
-        <i-col :xs="{ span: 5, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 1</div></i-col>
-        <i-col :xs="{ span: 11, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 2</div></i-col>
-        <i-col :xs="{ span: 5, offset: 1 }" :lg="{ span: 6, offset: 2 }"><div class="aaaaa">Col 3</div></i-col>
-    </Row>
-    <i-button @click="start">Start</i-button>
-    <i-button @click="finish">Finish</i-button>
-    <i-button @click="error">Error</i-button>
+    {{ fruit |json}}
+    <Checkbox-group :model.sync="fruit" @on-change="changed">
+        <Checkbox value="a"></Checkbox>
+        <Checkbox value="b"></Checkbox>
+        <Checkbox value="c"></Checkbox>
+    </Checkbox-group>
+    <i-button @click="change">change</i-button>
 </template>
 <script>
     export default {
+        data () {
+            return {
+                fruit: ['b']
+            }
+        },
         methods: {
-            start () {
-                this.$Loading.start();
+            change () {
+                this.fruit.splice(0, 1);
+//                this.fruit = ['a']
             },
-            finish () {
-                this.$Loading.finish();
-            },
-            error () {
-                this.$Loading.error();
+            changed (s) {
+                console.log(s)
             }
         }
     }