@c10t/nice-component-library 0.0.27-a → 0.0.27-b

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

@@ -1,5 +1,5 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { AfterViewInit, ChangeDetectorRef, EventEmitter, Injector, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, Injector, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
 import { AbstractControl, ControlValueAccessor, NgControl } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
@@ -8,7 +8,7 @@ import { FlatTreeNodeModel } from '../../models/components/flat-tree-node.model'
 import { ValidatorService } from '../../services/validator.service';
 import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 import * as i0 from "@angular/core";
-export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnInit, AfterViewInit, OnChanges {
+export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnInit, OnChanges {
     private translateService;
     private injector;
     private cdr;
@@ -32,9 +32,9 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     treeConfig?: FlatTreeConfigModel;
     isSearchOutSide: boolean;
     searchTextOutSide: string;
-    searchText: string;
     errorMessages: Map<string, (e?: any) => string>;
     fullDatasource: FlatTreeNodeModel[];
+    searchText: string;
     filterDatasource: FlatTreeNodeModel[];
     treeControl: FlatTreeControl<FlatTreeNodeModel>;
     treeFlattener: MatTreeFlattener<FlatTreeNodeModel, FlatTreeNodeModel>;
@@ -60,7 +60,6 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     setSelectedNode(): void;
     setDataSourceOrigin(): void;
     ngOnInit(): void;
-    ngAfterViewInit(): void;
     getDisplayInputFunc(node: FlatTreeNodeModel): boolean;
     getDisabledInputFunc(node: FlatTreeNodeModel): boolean;
     checkDisabledNode(node: FlatTreeNodeModel): boolean;
@@ -81,8 +80,6 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     selectedTreeChange(node: FlatTreeNodeModel): void;
     checkLeafNode(checked: boolean, node: FlatTreeNodeModel, isSelectedChange?: boolean): void;
     getRootNode(node: FlatTreeNodeModel): FlatTreeNodeModel | null;
-    deSelect(node: FlatTreeNodeModel): void;
-    deSelectParent(node: FlatTreeNodeModel): void;
     toggleTreeControl(treeControl: FlatTreeControl<FlatTreeNodeModel>, node: FlatTreeNodeModel): void;
     toggleSelectedTree(node?: FlatTreeNodeModel): void;
     onChangeSearchText(): void;
@@ -92,6 +89,7 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     onLeafNodeClick(node: FlatTreeNodeModel): void;
     onParentNodeClick(node: FlatTreeNodeModel): void;
     toggleNodeCheck(node: FlatTreeNodeModel, checked: boolean): void;
+    getTotalSelected(nodes: FlatTreeNodeModel[]): number;
     private _getLevel;
     private _isExpandable;
     private _getChildren;

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

@@ -8092,9 +8092,9 @@ class CvaFlatTreeComponent {
     treeConfig;
     isSearchOutSide = false;
     searchTextOutSide = '';
-    searchText = '';
     errorMessages = new Map();
     fullDatasource = [];
+    searchText = '';
     filterDatasource = [];
     treeControl;
     treeFlattener;
@@ -8156,9 +8156,6 @@ class CvaFlatTreeComponent {
     ngOnInit() {
         this.callValidator();
     }
-    ngAfterViewInit() {
-        // this.onChangeSearchText();
-    }
     getDisplayInputFunc(node) {
         return typeof (node._displayFuncInput) === 'function' ? node._displayFuncInput(node) : !!node._displayFuncInput;
     }
@@ -8281,13 +8278,8 @@ class CvaFlatTreeComponent {
         this.propagateChange(fn);
     }
     writeValue(obj) {
-        // if (this.multiple && !obj) {
-        //   obj = [];
-        // }
         if (obj) {
-            // if (this.multiple) {
             this.value = obj;
-            // }
             this.mapIndexes = new Map();
             for (let i = 0; i < this.fullDataTreeControl.dataNodes.length; i++) {
                 this.mapIndexes.set(this.fullDataTreeControl.dataNodes[i].value, i);
@@ -8466,12 +8458,6 @@ class CvaFlatTreeComponent {
         }
         return node;
     }
-    deSelect(node) {
-        this.checkLeafNode(false, node, true);
-    }
-    deSelectParent(node) {
-        this.checkParentNode(false, node, true);
-    }
     toggleTreeControl(treeControl, node) {
         treeControl.toggle(node);
         const orgNode = this.fullDataTreeControl.dataNodes.find(n => n.value === node.value);
@@ -8621,10 +8607,44 @@ class CvaFlatTreeComponent {
                 this.value.splice(index, 1);
             }
         }
+        if (isLeaf) {
+            const parentNode = this.getRootNode(node);
+            if (parentNode && FlatTreeService.hasChild(parentNode)) {
+                const allChild = this.getAllChildNode(this.fullDataTreeControl, parentNode);
+                // Kiểm tra còn node con nào trong value không
+                const hasChildInValue = allChild.some(child => this.value.includes(child.value));
+                if (!hasChildInValue) {
+                    const parentIndex = this.value.indexOf(parentNode.value);
+                    if (parentIndex >= 0) {
+                        this.value.splice(parentIndex, 1);
+                    }
+                }
+            }
+        }
         // Gọi writeValue để cập nhật cho FormControl
         this.writeValue(this.value);
         this.cdr.detectChanges();
     }
+    getTotalSelected(nodes) {
+        let count = 0;
+        for (const node of nodes) {
+            const isLeaf = !FlatTreeService.hasChild(node);
+            if (isLeaf) {
+                if (this.value.includes(node.value)) {
+                    count += 1;
+                }
+            }
+            else if (node.children && node.children.length > 0) {
+                const childChecked = this.getTotalSelected(node.children);
+                // Nếu tất cả các con được checked đồng nghĩa cha được checked thì mới cộng
+                if (childChecked === node.children.length) {
+                    count += 1;
+                }
+                count += childChecked;
+            }
+        }
+        return count;
+    }
     _getLevel = (node) => node.level;
     _isExpandable = (node) => FlatTreeService.hasChild(node);
     _getChildren = (node) => of(node.children ? node.children : []);
@@ -8690,7 +8710,7 @@ class CvaFlatTreeComponent {
                          *ngIf="!isDisplayChooseTreeOnly"
                          fxLayout="column" fxFlex="1 1 {{checkIsView(isView) ? '100%' : '50%'}}" fxFlex.lt-sm="100%">
                         <div class="header-area" *ngIf="!isView">
-                            <label>{{ selectedLabelTitle | translate }}{{ '(' + (value ? value.length : 0) + ')' }}</label>
+                            <label>{{ selectedLabelTitle | translate }}{{ '(' + getTotalSelected(fullDataDataSource.data) + ')' }}</label>
                             <div class="collapse-expand-all" (click)="toggleSelectedTree()">
                                 {{ (isCollapseSelected ? 'common.selected.tree.expandAll' : 'common.selected.tree.collapse') | translate }}
                                 <i class="fa {{isCollapseSelected ? 'fa-chevron-down' : 'fa-chevron-up'}}"></i>
@@ -8707,8 +8727,8 @@ class CvaFlatTreeComponent {
                                         [node]="node"
                                         [isView]="isView"
                                         (toggle)="toggleSelectedTree(node)"
-                                        (deSelectLeafNode)="deSelect(node)"
-                                        (deSelectParentNode)="deSelectParent(node)">
+                                        (deSelectLeafNode)="toggleNodeCheck(node, false)"
+                                        (deSelectParentNode)="toggleNodeCheck(node, false)">
                                 </cva-flat-tree-node-right>
                             </ng-container>
                         </cdk-virtual-scroll-viewport>
@@ -8787,7 +8807,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                          *ngIf="!isDisplayChooseTreeOnly"
                          fxLayout="column" fxFlex="1 1 {{checkIsView(isView) ? '100%' : '50%'}}" fxFlex.lt-sm="100%">
                         <div class="header-area" *ngIf="!isView">
-                            <label>{{ selectedLabelTitle | translate }}{{ '(' + (value ? value.length : 0) + ')' }}</label>
+                            <label>{{ selectedLabelTitle | translate }}{{ '(' + getTotalSelected(fullDataDataSource.data) + ')' }}</label>
                             <div class="collapse-expand-all" (click)="toggleSelectedTree()">
                                 {{ (isCollapseSelected ? 'common.selected.tree.expandAll' : 'common.selected.tree.collapse') | translate }}
                                 <i class="fa {{isCollapseSelected ? 'fa-chevron-down' : 'fa-chevron-up'}}"></i>
@@ -8804,8 +8824,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                                         [node]="node"
                                         [isView]="isView"
                                         (toggle)="toggleSelectedTree(node)"
-                                        (deSelectLeafNode)="deSelect(node)"
-                                        (deSelectParentNode)="deSelectParent(node)">
+                                        (deSelectLeafNode)="toggleNodeCheck(node, false)"
+                                        (deSelectParentNode)="toggleNodeCheck(node, false)">
                                 </cva-flat-tree-node-right>
                             </ng-container>
                         </cdk-virtual-scroll-viewport>