From 3c145e6ffeb2628b24a9c8fd75f2a89bdf4cd793 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Fri, 24 Mar 2017 21:06:49 +0800
Subject: [PATCH] update Tree

---
 src/components/tree/node.vue | 12 +++++++++---
 src/components/tree/tree.vue | 23 ++++++++++-------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/components/tree/node.vue b/src/components/tree/node.vue
index f79b5a9..49b8b46 100644
--- a/src/components/tree/node.vue
+++ b/src/components/tree/node.vue
@@ -66,7 +66,7 @@
             classes () {
                 return [
                     `${prefixCls}-children`
-                ]
+                ];
             },
             selectedCls () {
                 return [
@@ -112,7 +112,13 @@
             },
             handleCheck () {
                 if (this.disabled) return;
-                this.data.checked = !this.data.checked;
+                const checked = !this.data.checked;
+                if (!checked || this.indeterminate) {
+                    findComponentsDownward(this, 'TreeNode').forEach(node => node.data.checked = false);
+                } else {
+                    findComponentsDownward(this, 'TreeNode').forEach(node => node.data.checked = true);
+                }
+                this.data.checked = checked;
                 this.dispatch('Tree', 'checked');
             },
             setIndeterminate () {
@@ -126,7 +132,7 @@
         mounted () {
             this.$on('indeterminate', () => {
                 this.setIndeterminate();
-            })
+            });
         }
     };
 </script>
\ No newline at end of file
diff --git a/src/components/tree/tree.vue b/src/components/tree/tree.vue
index e59f22c..a9a6de3 100644
--- a/src/components/tree/tree.vue
+++ b/src/components/tree/tree.vue
@@ -1,7 +1,7 @@
 <template>
     <div :class="prefixCls">
         <Tree-node
-            v-for="item in currentData"
+            v-for="item in data"
             :key="item"
             :data="item"
             visible
@@ -46,21 +46,15 @@
         },
         data () {
             return {
-                prefixCls: prefixCls,
-                currentData: this.data
+                prefixCls: prefixCls
             };
         },
-        watch: {
-            data (val) {
-                
-            }
-        },
         methods: {
             getSelectedNodes () {
                 const nodes = findComponentsDownward(this, 'TreeNode');
                 return nodes.filter(node => node.data.selected).map(node => node.data);
             },
-            updateData () {
+            updateData (isInit = true) {
                 // init checked status
                 function reverseChecked(data) {
                     if (data.children) {
@@ -69,8 +63,11 @@
                             if (node.children) node = reverseChecked(node);
                             if (node.checked) checkedLength++;
                         });
-//                        data.checked = checkedLength >= data.children.length;
-                        if (checkedLength >= data.children.length) data.checked = true;
+                        if (isInit) {
+                            if (checkedLength >= data.children.length) data.checked = true;
+                        } else {
+                            data.checked = checkedLength >= data.children.length;
+                        }
                         return data;
                     } else {
                         return data;
@@ -88,7 +85,7 @@
                         return data;
                     }
                 }
-                this.currentData = this.data.map(node => reverseChecked(node)).map(node => forwardChecked(node));
+                this.data.map(node => reverseChecked(node)).map(node => forwardChecked(node));
                 this.broadcast('TreeNode', 'indeterminate');
             }
         },
@@ -106,7 +103,7 @@
                 this.$emit('on-select-change', this.getSelectedNodes());
             });
             this.$on('checked', () => {
-                this.updateData();
+                this.updateData(false);
             });
         }
     };
--
libgit2 0.21.4