[dev] separate halfcheck from checked

Author: oudanzhou

src/components/tree.vue

@@ -106,15 +106,15 @@ export default {
       }
     },
     parentCheckedHandle(parentNode, checked, halfcheck = false) {
-      if (!parentNode || parentNode.chkDisabled || !!parentNode.checked === checked ) return false;
-      let [someBortherNodeChecked, allBortherNodeChecked] = [checked, checked];
+      if (!parentNode || parentNode.chkDisabled ) return false;
+      let someBortherNodeChecked = checked, allBortherNodeChecked = checked;
       const childNodes = parentNode.children
       if (checked) {
-        allBortherNodeChecked = childNodes.every(
-          child => child.checked && !child.halfcheck
-        );
+        allBortherNodeChecked = childNodes.every(child => child.checked);
       } else {
-        someBortherNodeChecked = childNodes.some(child => child.checked);
+        someBortherNodeChecked = childNodes.some(({ checked, halfcheck: itemHalfCheck }) => {
+          return checked || ( halfcheck && itemHalfCheck)
+        });
       }
       if (halfcheck) {
         // all / some / none
@@ -127,8 +127,7 @@ export default {
         } else if (nodeHalfcheck) {
           return false;
         }
-        const parentChecked = checked || nodeHalfcheck;
-        this.$set(parentNode, "checked", parentChecked);
+        this.$set(parentNode, "checked", allBortherNodeChecked);
       } else {
         this.$set(parentNode, "checked", allBortherNodeChecked);
       }

src/components/treeLi.vue

@@ -9,15 +9,16 @@
       ></span>
       <span
         v-if="multiple && !item.nocheck"
-        :class="[item.checked ? (item.halfcheck ? 'box-halfchecked' : 'box-checked') : 'box-unchecked', 'inputCheck']"
+        class='inputCheck'
+        :class="spanInputClass"
       >
         <input
           :disabled="item.chkDisabled"
           :class="['check', item.chkDisabled ? 'chkDisabled' : '']"
           v-if="multiple"
           type="checkbox"
           @change="changeNodeCheckStatus(item, $event)"
-          :checked="item.checked"
+          :checked="checkboxChecked"
         >
       </span>
       <loading v-if="item.loading && item.expanded"/>
@@ -166,6 +167,14 @@ export default {
     },
     position() {
       return { level: this.level, index: this.index };
+    },
+    checkboxChecked() {
+      const { checked, halfcheck } = this.item
+      return checked || halfcheck
+    },
+    spanInputClass () {
+      const { checked, halfcheck } = this.item
+      return checked ? 'box-checked' : halfcheck ? 'box-halfchecked' : 'box-unchecked'
     }
   },
   watch: {