test tree 不选择父选择框

es/tree/index.js

@@ -73,14 +73,8 @@ const _sfc_main$1 = defineComponent({
     }
     const isChildAllSelected = computed(() => {
       function _isChildAllSelected(node) {
-        if (!props.showCheckbox) {
-          return false;
-        }
         let childSelectNum = 0;
         let res = false;
-        if (!props.selectParent) {
-          return false;
-        }
         for (const item of node.children) {
           if (item.isChecked)
             childSelectNum++;
@@ -239,6 +233,7 @@ class Tree {
     const nodeTitle = Reflect.get(origin, title);
     const nodeChildren = Reflect.get(origin, children);
     const nodeDisabled = !!Reflect.get(origin, "disabled");
+    const selectParent = !!Reflect.get(origin, "selectParent");
     const nodeIsLeaf = !!Reflect.get(origin, "spread");
     const parentNode = nodeMap.get(parentKey);
     const node = Object.assign({}, origin, {
@@ -251,7 +246,8 @@ class Tree {
       isChecked: false,
       isLeaf: false,
       hasNextSibling,
-      parentNode: parentNode || null
+      parentNode: parentNode || null,
+      selectParent
     });
     node.isDisabled = nodeDisabled;
     node.isChecked = checkedKeys.includes(nodeKey);
@@ -307,6 +303,9 @@ class Tree {
   }
   setCheckedKeys(checked, checkStrictly, node) {
     node.isChecked = checked;
+    if (!node.selectParent) {
+      return false;
+    }
     if (!checkStrictly) {
       if (node.parentNode) {
         this.setParentChecked(checked, node.parentNode);

lib/index.js

@@ -17670,14 +17670,8 @@ const _sfc_main$K = defineComponent({
     }
     const isChildAllSelected = computed$1(() => {
       function _isChildAllSelected(node) {
-        if (!props.showCheckbox) {
-          return false;
-        }
         let childSelectNum = 0;
         let res = false;
-        if (!props.selectParent) {
-          return false;
-        }
         for (const item of node.children) {
           if (item.isChecked)
             childSelectNum++;
@@ -17836,6 +17830,7 @@ class Tree {
     const nodeTitle = Reflect.get(origin, title);
     const nodeChildren = Reflect.get(origin, children);
     const nodeDisabled = !!Reflect.get(origin, "disabled");
+    const selectParent = !!Reflect.get(origin, "selectParent");
     const nodeIsLeaf = !!Reflect.get(origin, "spread");
     const parentNode = nodeMap.get(parentKey);
     const node = Object.assign({}, origin, {
@@ -17848,7 +17843,8 @@ class Tree {
       isChecked: false,
       isLeaf: false,
       hasNextSibling,
-      parentNode: parentNode || null
+      parentNode: parentNode || null,
+      selectParent
     });
     node.isDisabled = nodeDisabled;
     node.isChecked = checkedKeys.includes(nodeKey);
@@ -17904,6 +17900,9 @@ class Tree {
   }
   setCheckedKeys(checked, checkStrictly, node) {
     node.isChecked = checked;
+    if (!node.selectParent) {
+      return false;
+    }
     if (!checkStrictly) {
       if (node.parentNode) {
         this.setParentChecked(checked, node.parentNode);

src/component/tree/TreeNode.vue

@@ -24,6 +24,7 @@ export interface TreeData {
   isLeaf: boolean;
   hasNextSibling: boolean;
   parentNode: Nullable<TreeData>;
+  selectParent:boolean;
 }
 
 export interface TreeNodeProps {
@@ -107,16 +108,8 @@ function handleRowClick(node: TreeData) {
 //判断是否半选
 const isChildAllSelected = computed(() => {
   function _isChildAllSelected(node: TreeData): boolean {
-    if (!props.showCheckbox) {
-      return false;
-    }
     let childSelectNum = 0;
     let res = false; // true为半选 false为全选
-    
-    if(!props.selectParent){
-      return false
-    }
-    
     for (const item of node.children) {
       if (item.isChecked) childSelectNum++;
     }

src/component/tree/tree.ts

@@ -17,6 +17,7 @@ export interface TreeData {
   isLeaf: boolean;
   hasNextSibling: boolean;
   parentNode: Nullable<TreeData>;
+  selectParent:boolean;
 }
 
 interface ReplaceFields {
@@ -99,6 +100,7 @@ class Tree {
     const nodeTitle = Reflect.get(origin, title);
     const nodeChildren = Reflect.get(origin, children);
     const nodeDisabled = !!Reflect.get(origin, "disabled");
+    const selectParent = !!Reflect.get(origin, "selectParent");
     const nodeIsLeaf = !!Reflect.get(origin, "spread");
     const parentNode = nodeMap.get(parentKey);
 
@@ -113,6 +115,7 @@ class Tree {
       isLeaf: false,
       hasNextSibling: hasNextSibling,
       parentNode: parentNode || null,
+      selectParent: selectParent
     });
 
     node.isDisabled = nodeDisabled;
@@ -183,6 +186,9 @@ class Tree {
     node: TreeData
   ) {
     node.isChecked = checked;
+    if (!node.selectParent) {
+      return false;
+    }
     if (!checkStrictly) {
       if (node.parentNode) {
         this.setParentChecked(checked, node.parentNode);

types/component/tree/tree.d.ts

@@ -13,6 +13,7 @@ export interface TreeData {
     isLeaf: boolean;
     hasNextSibling: boolean;
     parentNode: Nullable<TreeData>;
+    selectParent: boolean;
 }
 interface ReplaceFields {
     id: string;
@@ -38,7 +39,7 @@ declare class Tree {
     treeForeach(tree: any, func: Function): void;
     setChildrenChecked(checked: boolean, nodes: TreeData[]): void;
     setParentChecked(checked: boolean, parent: TreeData): void;
-    setCheckedKeys(checked: boolean, checkStrictly: boolean | string, node: TreeData): void;
+    setCheckedKeys(checked: boolean, checkStrictly: boolean | string, node: TreeData): false | undefined;
     getData(): TreeData[];
     getKeys(): {
         checkedKeys: any[];