@c10t/nice-component-library 0.0.34 → 0.0.36

package/components/tree/cva-flat-tree.component.d.ts

@@ -83,7 +83,7 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     toggleTreeControl(treeControl: FlatTreeControl<FlatTreeNodeModel>, node: FlatTreeNodeModel): void;
     toggleSelectedTree(node?: FlatTreeNodeModel): void;
     onChangeSearchText(): void;
-    getDisplayTreeDataSource(dataOrigin: FlatTreeNodeModel[], copiedData: FlatTreeNodeModel[]): any[];
+    getDisplayTreeDataSource(dataOrigin: FlatTreeNodeModel[], copiedData: FlatTreeNodeModel[]): void;
     getCheckedSelectedTreeDataSource(dataOrigin: FlatTreeNodeModel[], copiedData: FlatTreeNodeModel[]): any[];
     expandTreeDataSource(treeControl: FlatTreeControl<FlatTreeNodeModel>, expandProperty: 'isExpanded' | 'isFilterExpanded'): void;
     onLeafNodeClick(node: FlatTreeNodeModel): void;

package/fesm2022/c10t-nice-component-library.mjs

@@ -8357,7 +8357,7 @@ class CvaFlatTreeComponent {
         }
     }
     getAllChildNode(treeControl, node) {
-        const index = this.mapIndexes.get(node.value);
+        const index = treeControl.dataNodes.findIndex(n => n.value === node.value);
         let sameLevelNextIndex = -1;
         for (let i = index + 1; i < treeControl.dataNodes.length; i++) {
             if (node.level >= treeControl.dataNodes[i].level) {
@@ -8533,38 +8533,32 @@ class CvaFlatTreeComponent {
     }
     getDisplayTreeDataSource(dataOrigin, copiedData) {
         if (!Array.isArray(dataOrigin)) {
-            return [];
+            return;
         }
-        let copiedNode;
         for (const node of dataOrigin) {
-            copiedNode = {
-                ...node,
-                children: [],
-            };
-            if (!node.children || !FlatTreeService.hasChild(node)) {
-                node.display = node.displayValue.toLowerCase().includes(this.searchText.toLowerCase().trim())
-                    && this.getDisplayInputFunc(node);
-                if (node.display) {
-                    copiedData.push(node);
-                }
-            }
-            else {
+            const copiedNode = { ...node, children: [] };
+            if (FlatTreeService.hasChild(node)) {
                 this.getDisplayTreeDataSource(node.children, copiedNode.children ? copiedNode.children : []);
                 // parent display
-                node.display = (node.displayValue.toLowerCase().includes(this.searchText.toLowerCase().trim())
-                    || node.children?.some(childNode => childNode.display)) && this.getDisplayInputFunc(node);
-                node.checked = node.children.filter(child => child.display).length > 0 &&
-                    node.children.filter(child => child.display).every(childNode => childNode.checked);
+                node.display = this.getDisplayInputFunc(node) &&
+                    (node.displayValue.toLowerCase().includes(this.searchText.toLowerCase().trim())
+                        || node.children.some(childNode => childNode.display));
+                const childDisplay = node.children.filter(child => child.display);
+                node.checked = (childDisplay.length > 0 && childDisplay.every(childNode => childNode.checked))
+                    || (childDisplay.length === 0 && this.value.includes(node.value));
                 copiedNode.display = node.display;
                 copiedNode.checked = node.checked;
                 if (node.display) {
-                    if (!this.getAllChildNode(this.fullDataTreeControl, node).some(childNode => childNode.display)) {
-                        this.getAllChildNode(this.fullDataTreeControl, node).forEach(childNode => childNode.display = true);
-                        copiedData.push(node);
-                    }
-                    else {
-                        copiedData.push(copiedNode);
-                    }
+                    copiedData.push(copiedNode);
+                }
+                console.log(this.value.includes(node.value), 'node', node, 'copiedNode', copiedNode);
+            }
+            else {
+                node.display = node.displayValue.toLowerCase().includes(this.searchText.toLowerCase().trim())
+                    && this.getDisplayInputFunc(node);
+                node.checked = this.value.includes(node.value);
+                if (node.display) {
+                    copiedData.push(node);
                 }
             }
         }