@c10t/nice-component-library 0.0.35 → 0.0.37

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

@@ -28,6 +28,7 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     /** height of node view */
     itemSize: number;
     paddingLeft: number;
+    ignoreCountValue: any[];
     percentOfLabelOutside: number;
     treeConfig?: FlatTreeConfigModel;
     isSearchOutSide: boolean;
@@ -83,7 +84,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;
@@ -94,5 +95,5 @@ export declare class CvaFlatTreeComponent implements ControlValueAccessor, OnIni
     private _isExpandable;
     private _getChildren;
     static ɵfac: i0.ɵɵFactoryDeclaration<CvaFlatTreeComponent, [null, null, null, { optional: true; self: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<CvaFlatTreeComponent, "cva-flat-tree", never, { "label": { "alias": "label"; "required": false; }; "required": { "alias": "required"; "required": false; }; "value": { "alias": "value"; "required": false; }; "multiple": { "alias": "multiple"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "isView": { "alias": "isView"; "required": false; }; "isDisplayChooseTreeOnly": { "alias": "isDisplayChooseTreeOnly"; "required": false; }; "isHideCheckbox": { "alias": "isHideCheckbox"; "required": false; }; "isCollapseSelected": { "alias": "isCollapseSelected"; "required": false; }; "selectedLabelTitle": { "alias": "selectedLabelTitle"; "required": false; }; "viewHeight": { "alias": "viewHeight"; "required": false; }; "itemSize": { "alias": "itemSize"; "required": false; }; "percentOfLabelOutside": { "alias": "percentOfLabelOutside"; "required": false; }; "treeConfig": { "alias": "treeConfig"; "required": false; }; "isSearchOutSide": { "alias": "isSearchOutSide"; "required": false; }; "searchTextOutSide": { "alias": "searchTextOutSide"; "required": false; }; "errorMessages": { "alias": "errorMessages"; "required": false; }; "fullDatasource": { "alias": "fullDatasource"; "required": false; }; "nodeClicked": { "alias": "nodeClicked"; "required": false; }; "isFormControl": { "alias": "isFormControl"; "required": false; }; }, { "selectionChange": "selectionChange"; "onNodeClick": "onNodeClick"; }, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<CvaFlatTreeComponent, "cva-flat-tree", never, { "label": { "alias": "label"; "required": false; }; "required": { "alias": "required"; "required": false; }; "value": { "alias": "value"; "required": false; }; "multiple": { "alias": "multiple"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; "isView": { "alias": "isView"; "required": false; }; "isDisplayChooseTreeOnly": { "alias": "isDisplayChooseTreeOnly"; "required": false; }; "isHideCheckbox": { "alias": "isHideCheckbox"; "required": false; }; "isCollapseSelected": { "alias": "isCollapseSelected"; "required": false; }; "selectedLabelTitle": { "alias": "selectedLabelTitle"; "required": false; }; "viewHeight": { "alias": "viewHeight"; "required": false; }; "itemSize": { "alias": "itemSize"; "required": false; }; "ignoreCountValue": { "alias": "ignoreCountValue"; "required": false; }; "percentOfLabelOutside": { "alias": "percentOfLabelOutside"; "required": false; }; "treeConfig": { "alias": "treeConfig"; "required": false; }; "isSearchOutSide": { "alias": "isSearchOutSide"; "required": false; }; "searchTextOutSide": { "alias": "searchTextOutSide"; "required": false; }; "errorMessages": { "alias": "errorMessages"; "required": false; }; "fullDatasource": { "alias": "fullDatasource"; "required": false; }; "nodeClicked": { "alias": "nodeClicked"; "required": false; }; "isFormControl": { "alias": "isFormControl"; "required": false; }; }, { "selectionChange": "selectionChange"; "onNodeClick": "onNodeClick"; }, never, never, false, never>;
 }

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

@@ -8127,6 +8127,7 @@ class CvaFlatTreeComponent {
     /** height of node view */
     itemSize = 48; // px
     paddingLeft = 20; //px
+    ignoreCountValue = [];
     /* percent label outside css */
     percentOfLabelOutside = 25;
     treeConfig;
@@ -8533,38 +8534,31 @@ 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);
+                }
+            }
+            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);
                 }
             }
         }
@@ -8670,15 +8664,16 @@ class CvaFlatTreeComponent {
         let count = 0;
         for (const node of nodes) {
             const isLeaf = !FlatTreeService.hasChild(node);
+            const isCountValue = !this.ignoreCountValue.includes(node.value);
             if (isLeaf) {
-                if (this.value.includes(node.value)) {
+                if (this.value.includes(node.value) && isCountValue) {
                     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) {
+                if (childChecked === node.children.length && isCountValue) {
                     count += 1;
                 }
                 count += childChecked;
@@ -8690,7 +8685,7 @@ class CvaFlatTreeComponent {
     _isExpandable = (node) => FlatTreeService.hasChild(node);
     _getChildren = (node) => of(node.children ? node.children : []);
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.5", ngImport: i0, type: CvaFlatTreeComponent, deps: [{ token: i1.TranslateService }, { token: i0.Injector }, { token: i0.ChangeDetectorRef }, { token: i1$2.NgControl, optional: true, self: true }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.1.5", type: CvaFlatTreeComponent, isStandalone: false, selector: "cva-flat-tree", inputs: { label: "label", required: "required", value: "value", multiple: "multiple", disabled: "disabled", isView: "isView", isDisplayChooseTreeOnly: "isDisplayChooseTreeOnly", isHideCheckbox: "isHideCheckbox", isCollapseSelected: "isCollapseSelected", selectedLabelTitle: "selectedLabelTitle", viewHeight: "viewHeight", itemSize: "itemSize", percentOfLabelOutside: "percentOfLabelOutside", treeConfig: "treeConfig", isSearchOutSide: "isSearchOutSide", searchTextOutSide: "searchTextOutSide", errorMessages: "errorMessages", fullDatasource: "fullDatasource", nodeClicked: "nodeClicked", isFormControl: "isFormControl" }, outputs: { selectionChange: "selectionChange", onNodeClick: "onNodeClick" }, viewQueries: [{ propertyName: "chooseVirtualScroll", first: true, predicate: ["chooseAreaScrollViewport"], descendants: true }, { propertyName: "selectedVirtualScroll", first: true, predicate: ["selectedScrollViewport"], descendants: true }], usesOnChanges: true, ngImport: i0, template: `
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.1.5", type: CvaFlatTreeComponent, isStandalone: false, selector: "cva-flat-tree", inputs: { label: "label", required: "required", value: "value", multiple: "multiple", disabled: "disabled", isView: "isView", isDisplayChooseTreeOnly: "isDisplayChooseTreeOnly", isHideCheckbox: "isHideCheckbox", isCollapseSelected: "isCollapseSelected", selectedLabelTitle: "selectedLabelTitle", viewHeight: "viewHeight", itemSize: "itemSize", ignoreCountValue: "ignoreCountValue", percentOfLabelOutside: "percentOfLabelOutside", treeConfig: "treeConfig", isSearchOutSide: "isSearchOutSide", searchTextOutSide: "searchTextOutSide", errorMessages: "errorMessages", fullDatasource: "fullDatasource", nodeClicked: "nodeClicked", isFormControl: "isFormControl" }, outputs: { selectionChange: "selectionChange", onNodeClick: "onNodeClick" }, viewQueries: [{ propertyName: "chooseVirtualScroll", first: true, predicate: ["chooseAreaScrollViewport"], descendants: true }, { propertyName: "selectedVirtualScroll", first: true, predicate: ["selectedScrollViewport"], descendants: true }], usesOnChanges: true, ngImport: i0, template: `
         <div class="cva-flat-tree labelOutside"
              fxLayout="row" fxLayout.lt-sm="row wrap">
             <mat-label *ngIf="label && !isSearchOutSide" class="label_width"
@@ -8907,6 +8902,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.5", ngImpor
                 type: Input
             }], itemSize: [{
                 type: Input
+            }], ignoreCountValue: [{
+                type: Input
             }], percentOfLabelOutside: [{
                 type: Input
             }], treeConfig: [{