@acorex/components 3.0.31 → 3.0.35

package/fesm2015/acorex-components.js

@@ -1,4 +1,4 @@
-import { __decorate, __metadata, __param, __awaiter } from 'tslib';
+import { __decorate, __metadata, __param, __awaiter, __asyncValues } from 'tslib';
 import { Input, Component, EventEmitter, ContentChildren, QueryList, Output, ViewChild, ContentChild, ElementRef, ɵɵdefineInjectable, ɵɵinject, Injectable, ComponentFactoryResolver, Injector, NgZone, Inject, RendererFactory2, INJECTOR, TemplateRef, ApplicationRef, ChangeDetectorRef, HostListener, ViewEncapsulation, NgModule, ChangeDetectionStrategy, Attribute, Directive, ViewContainerRef, Renderer2, ViewChildren } from '@angular/core';
 import { AXTranslator, AXHtmlUtil, AXRenderService, AXConfig, AXDateTime, AXDateTimeRange, AXCoreModule, AXMenuItem, AXTranslatorModule, AXObjectUtil, AXScrollModule, getPropByPath, AXColorUtil } from '@acorex/core';
 import { OverlayContainer, Overlay, ScrollStrategyOptions, OverlayPositionBuilder, OverlayKeyboardDispatcher, OverlayModule } from '@angular/cdk/overlay';
@@ -7124,7 +7124,6 @@ let AXNumberBoxComponent = AXNumberBoxComponent_1 = class AXNumberBoxComponent e
         }
     }
     calcSeparator(num) {
-        debugger;
         if (this.showSeparator) {
             return num + (+(num / 3));
         }
@@ -8875,6 +8874,7 @@ AXSelectBoxComponent = AXSelectBoxComponent_1 = __decorate([
 let AXQueryBuilderRuleComponent = class AXQueryBuilderRuleComponent {
     constructor() {
         this.isEditing = true;
+        this.mode = 'new';
         this.fields = [];
         this.onRuleDelete = new EventEmitter();
         this.ruleChanged = new EventEmitter();
@@ -9057,7 +9057,6 @@ let AXQueryBuilderRuleComponent = class AXQueryBuilderRuleComponent {
         this.onRuleDelete.emit({ items: this.rule, component: this });
     }
     captionChange(e) {
-        debugger;
         if (e.selectedItems[0]) {
             this.rule.caption = e.selectedItems[0].caption;
             this.rule.dataField = e.selectedItems[0].dataField;
@@ -9206,6 +9205,10 @@ __decorate([
     Input(),
     __metadata("design:type", AXQueryBuilderGroup)
 ], AXQueryBuilderRuleComponent.prototype, "parent", void 0);
+__decorate([
+    Input(),
+    __metadata("design:type", String)
+], AXQueryBuilderRuleComponent.prototype, "mode", void 0);
 __decorate([
     Input(),
     __metadata("design:type", Array)
@@ -9221,7 +9224,7 @@ __decorate([
 AXQueryBuilderRuleComponent = __decorate([
     Component({
         selector: 'ax-query-rule',
-        template: "<div class=\"condition\" *ngIf=\"parent\">\r\n    <div class=\"text {{parent.condition}}\">\r\n        <span>{{parent.condition}}</span>\r\n    </div>\r\n</div>\r\n<div class=\"handler\">\r\n    <i class=\"far fa-grip-lines-vertical\"></i>\r\n</div>\r\n\r\n<div class=\"caption\" [ngClass]=\"{'editable': isEditing}\">\r\n    <ng-container *ngIf=\"isEditing;else fieldsTemplate\">\r\n        <ax-form-group>\r\n            <ax-select-box (selectionChanged)=\"captionChange($event)\" allowNull=\"false\"\r\n                [(selectedItems)]=\"rule.dataFieldItem\" textField=\"caption\" valueField=\"dataField\" [items]=\"fields\"\r\n                size=\"sm\" mode=\"single\">\r\n            </ax-select-box>\r\n        </ax-form-group>\r\n    </ng-container>\r\n    <ng-template #fieldsTemplate>\r\n        <div (click)=\"handleEditClick()\">\r\n            {{rule.caption}}\r\n        </div>\r\n    </ng-template>\r\n</div>\r\n\r\n<div class=\"operator\" [ngClass]=\"{'editable': isEditing,'radius':!showValue}\">\r\n    <ng-container *ngIf=\"isEditing;else operatorTemplate\">\r\n        <ax-form-group>\r\n            <ax-select-box *ngIf=\"showOperatorSelectBox\" [(selectedValues)]=\"rule.operator\" #selectBox\r\n                (selectedItemsChange)=\"operatorChange($event)\" allowNull=\"false\" size=\"sm\" mode=\"single\">\r\n                <ax-data-source [provideData]=\"provideDataOperator\">\r\n                </ax-data-source>\r\n            </ax-select-box>\r\n        </ax-form-group>\r\n    </ng-container>\r\n    <ng-template #operatorTemplate>\r\n        <div class=\"text\" (click)=\"handleEditClick()\">\r\n            {{('queryBuilder.'+rule.operator) | trans}}\r\n        </div>\r\n    </ng-template>\r\n</div>\r\n<div *ngIf=\"showValue\" class=\"value\" [ngClass]=\"{'editable': isEditing}\">\r\n    <ng-container *ngIf=\"isEditing;else valueTemplate\">\r\n\r\n        <div *ngIf=\" rule.control && !isOnDemandLabel\" [ngSwitch]=\"rule.control.type\">\r\n            <div *ngSwitchCase=\"'textBox'\">\r\n                <ax-form-group>\r\n                    <ax-text-box (onValueChanged)=\"valueChange($event)\" placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\"\r\n                        [(value)]=\"rule.value\" size=\"sm\">\r\n                    </ax-text-box>\r\n                </ax-form-group>\r\n            </div>\r\n            <div *ngSwitchCase=\"'selectBox'\">\r\n                <ax-form-group>\r\n                    <ax-select-box *ngIf=\"showSelectBox\" [mode]=\"getOption('mode')\"\r\n                        [remoteOperation]=\"getOption('remoteOperation')\" [valueField]=\"getOption('valueField')\"\r\n                        placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\" [textField]=\"getOption('textField')\"\r\n                        [(selectedItems)]=\"rule.valueItem\" (selectedItemsChange)=\"selectedItemsChange($event)\" size=\"sm\"\r\n                        #selectBoxValue>\r\n                        <ax-data-source [provideData]=\"getProvideData\"></ax-data-source>\r\n                    </ax-select-box>\r\n                </ax-form-group>\r\n            </div>\r\n\r\n            <div *ngSwitchCase=\"'numberBox'\">\r\n                <ax-form-group>\r\n                    <ax-number-box (onValueChanged)=\"valueChange($event)\" placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\"\r\n                        [(value)]=\"rule.value\" size=\"sm\">\r\n                    </ax-number-box>\r\n                </ax-form-group>\r\n            </div>\r\n            <div *ngSwitchCase=\"'datePicker'\">\r\n\r\n\r\n            </div>\r\n            <div *ngSwitchCase=\"'boolean'\">\r\n\r\n                <ax-form-group>\r\n                    <ax-select-box #selectBoxBoolean (selectedItemsChange)=\"valueBooleanChange($event)\"\r\n                        allowNull=\"false\" [selectedValues]=\"rule.value\" size=\"sm\" mode=\"single\">\r\n                        <ax-data-source [provideData]=\"provideDataBoolean\">\r\n                        </ax-data-source>\r\n                    </ax-select-box>\r\n                </ax-form-group>\r\n\r\n            </div>\r\n            <div *ngSwitchDefault>\r\n                <ax-form-group>\r\n                    <ax-text-box (onValueChanged)=\"valueChange($event)\" placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\"\r\n                        [(value)]=\"rule.value\" size=\"sm\">\r\n                    </ax-text-box>\r\n\r\n                </ax-form-group>\r\n\r\n            </div>\r\n        </div>\r\n\r\n        <div *ngIf=\"isOnDemandLabel\">\r\n\r\n            <ax-text-box #textBoxNameValue [value]=\"getOnDemandName(rule.onDemandLabel)\"\r\n                (onValueChanged)=\"onDemandLabelChange($event)\" placeholder=\"\u0646\u0627\u0645 \u0645\u062A\u063A\u06CC\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\" size=\"sm\">\r\n                <!-- <ax-validation>\r\n                    <ax-validation-rule type=\"required\"></ax-validation-rule>\r\n                </ax-validation> -->\r\n            </ax-text-box>\r\n\r\n\r\n        </div>\r\n\r\n    </ng-container>\r\n    <ng-template #valueTemplate>\r\n        <div (click)=\"handleEditClick()\">\r\n\r\n            {{rule.text}}\r\n\r\n        </div>\r\n    </ng-template>\r\n</div>\r\n\r\n<div class=\"buttons-list\">\r\n    <div *ngIf=\"showValue && isEditing\" class=\"button variable\" [ngClass]=\"{'active-button': isOnDemandLabel}\">\r\n        <i class=\"far fa-dollar-sign\"></i>\r\n        <ax-check-box [value]=\"isOnDemandLabel\" (onClick)=\"onDemandLabel($event)\">\r\n        </ax-check-box>\r\n    </div>\r\n\r\n    <div class=\"button commit\" (click)=\"handleCommitClick()\" *ngIf=\"isEditing\">\r\n        <i class=\"far fa-check\"></i>\r\n    </div>\r\n    <div class=\"button remove\" (click)=\"handleRemoveClick()\">\r\n        <i class=\"far fa-times\"></i>\r\n    </div>\r\n</div>",
+        template: "<div class=\"condition\" *ngIf=\"parent\">\r\n    <div class=\"text {{parent.condition}}\">\r\n        <span>{{parent.condition}}</span>\r\n    </div>\r\n</div>\r\n<div class=\"handler\">\r\n    <i class=\"far fa-grip-lines-vertical\"></i>\r\n</div>\r\n\r\n<div class=\"caption\" [ngClass]=\"{'editable': isEditing}\">\r\n    <ng-container *ngIf=\"isEditing;else fieldsTemplate\">\r\n        <ax-form-group>\r\n            <ax-select-box [readonly]=\"mode == 'edit'\" (selectionChanged)=\"captionChange($event)\" allowNull=\"false\"\r\n                [(selectedItems)]=\"rule.dataFieldItem\" textField=\"caption\" valueField=\"dataField\" [items]=\"fields\"\r\n                mode=\"single\">\r\n            </ax-select-box>\r\n        </ax-form-group>\r\n    </ng-container>\r\n    <ng-template #fieldsTemplate>\r\n        <div (click)=\"handleEditClick()\">\r\n            {{rule.caption}}\r\n        </div>\r\n    </ng-template>\r\n</div>\r\n\r\n<div class=\"operator\" [ngClass]=\"{'editable': isEditing,'radius':!showValue}\">\r\n    <ng-container *ngIf=\"isEditing;else operatorTemplate\">\r\n        <ax-form-group>\r\n            <ax-select-box [readonly]=\"mode == 'edit'\" *ngIf=\"showOperatorSelectBox\" [(selectedValues)]=\"rule.operator\"\r\n                #selectBox (selectedItemsChange)=\"operatorChange($event)\" allowNull=\"false\" mode=\"single\">\r\n                <ax-data-source [provideData]=\"provideDataOperator\">\r\n                </ax-data-source>\r\n            </ax-select-box>\r\n        </ax-form-group>\r\n    </ng-container>\r\n    <ng-template #operatorTemplate>\r\n        <div class=\"text\" (click)=\"handleEditClick()\">\r\n            {{('queryBuilder.'+rule.operator) | trans}}\r\n        </div>\r\n    </ng-template>\r\n</div>\r\n<div *ngIf=\"showValue\" class=\"value\" [ngClass]=\"{'editable': isEditing}\">\r\n    <ng-container *ngIf=\"isEditing;else valueTemplate\">\r\n\r\n        <div *ngIf=\" rule.control && !isOnDemandLabel\" [ngSwitch]=\"rule.control.type\">\r\n            <div *ngSwitchCase=\"'textBox'\">\r\n                <ax-form-group>\r\n                    <ax-text-box (onValueChanged)=\"valueChange($event)\" placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\"\r\n                        [(value)]=\"rule.value\">\r\n                    </ax-text-box>\r\n                </ax-form-group>\r\n            </div>\r\n            <div *ngSwitchCase=\"'selectBox'\">\r\n                <ax-form-group>\r\n                    <ax-select-box *ngIf=\"showSelectBox\" [mode]=\"getOption('mode')\"\r\n                        [remoteOperation]=\"getOption('remoteOperation')\" [valueField]=\"getOption('valueField')\"\r\n                        placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\" [textField]=\"getOption('textField')\"\r\n                        [(selectedItems)]=\"rule.valueItem\" (selectedItemsChange)=\"selectedItemsChange($event)\"\r\n                        #selectBoxValue>\r\n                        <ax-data-source [provideData]=\"getProvideData\"></ax-data-source>\r\n                    </ax-select-box>\r\n                </ax-form-group>\r\n            </div>\r\n\r\n            <div *ngSwitchCase=\"'numberBox'\">\r\n                <ax-form-group>\r\n                    <ax-number-box (onValueChanged)=\"valueChange($event)\" placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\"\r\n                        [(value)]=\"rule.value\">\r\n                    </ax-number-box>\r\n                </ax-form-group>\r\n            </div>\r\n            <div *ngSwitchCase=\"'datePicker'\">\r\n\r\n\r\n            </div>\r\n            <div *ngSwitchCase=\"'boolean'\">\r\n\r\n                <ax-form-group>\r\n                    <ax-select-box #selectBoxBoolean (selectedItemsChange)=\"valueBooleanChange($event)\"\r\n                        allowNull=\"false\" [selectedValues]=\"rule.value\" mode=\"single\">\r\n                        <ax-data-source [provideData]=\"provideDataBoolean\">\r\n                        </ax-data-source>\r\n                    </ax-select-box>\r\n                </ax-form-group>\r\n\r\n            </div>\r\n            <div *ngSwitchDefault>\r\n                <ax-form-group>\r\n                    <ax-text-box (onValueChanged)=\"valueChange($event)\" placeholder=\"\u0645\u0642\u062F\u0627\u0631 \u0645\u0648\u0631\u062F \u0646\u0638\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\"\r\n                        [(value)]=\"rule.value\">\r\n                    </ax-text-box>\r\n\r\n                </ax-form-group>\r\n\r\n            </div>\r\n        </div>\r\n\r\n        <div *ngIf=\"isOnDemandLabel\">\r\n\r\n            <ax-text-box #textBoxNameValue [value]=\"getOnDemandName(rule.onDemandLabel)\"\r\n                (onValueChanged)=\"onDemandLabelChange($event)\" placeholder=\"\u0646\u0627\u0645 \u0645\u062A\u063A\u06CC\u0631 \u062E\u0648\u062F \u0631\u0627 \u0648\u0627\u0631\u062F \u06A9\u0646\u06CC\u062F\">\r\n                <!-- <ax-validation>\r\n                    <ax-validation-rule type=\"required\"></ax-validation-rule>\r\n                </ax-validation> -->\r\n            </ax-text-box>\r\n\r\n\r\n        </div>\r\n\r\n    </ng-container>\r\n    <ng-template #valueTemplate>\r\n        <div (click)=\"handleEditClick()\">\r\n\r\n            {{rule.text}}\r\n\r\n        </div>\r\n    </ng-template>\r\n</div>\r\n\r\n<div class=\"buttons-list\">\r\n    <div *ngIf=\"showValue && isEditing && mode == 'new'\" class=\"button variable\"\r\n        [ngClass]=\"{'active-button': isOnDemandLabel}\">\r\n        <i class=\"far fa-dollar-sign\"></i>\r\n        <ax-check-box [value]=\"isOnDemandLabel\" (onClick)=\"onDemandLabel($event)\">\r\n        </ax-check-box>\r\n    </div>\r\n\r\n    <div class=\"button commit\" (click)=\"handleCommitClick()\" *ngIf=\"isEditing\">\r\n        <i class=\"far fa-check\"></i>\r\n    </div>\r\n    <div class=\"button remove\" (click)=\"handleRemoveClick()\" *ngIf=\"mode == 'new'\">\r\n        <i class=\"far fa-times\"></i>\r\n    </div>\r\n</div>",
         host: { class: 'ax ax-query-rule' },
         encapsulation: ViewEncapsulation.None
     }),
@@ -9408,7 +9411,7 @@ let AXQueryBuilderService = class AXQueryBuilderService {
                     }
                 }
                 if (this.canRun) {
-                    this.popup.open(AXQueryBuilderPopupComponent, { data: { group: group, provideData: provideData }, title: "دریافت مقادیر" }).then(c => {
+                    this.popup.open(AXQueryBuilderPopupComponent, { data: { group: group, provideData: provideData }, title: 'دریافت مقادیر' }).then((c) => {
                         resolve(c);
                     });
                 }
@@ -9448,10 +9451,90 @@ let AXQueryBuilderService = class AXQueryBuilderService {
         }
         //  }
     }
+    getQueryStringSimple(group) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                var e_1, _a;
+                debugger;
+                var query;
+                if (group.items.length > 0) {
+                    query = ' ( ';
+                }
+                var id = 0;
+                try {
+                    for (var _b = __asyncValues(group.items), _c; _c = yield _b.next(), !_c.done;) {
+                        const iterator = _c.value;
+                        const item = group.items[id];
+                        if (item.condition) {
+                            yield this.getQueryStringSimple(item).then((c) => {
+                                query = query + c;
+                            });
+                        }
+                        else {
+                            let codeOperator = null;
+                            switch (item.operator) {
+                                case 'equal':
+                                    codeOperator = '==';
+                                    break;
+                                case 'not-equal':
+                                    codeOperator = '!=';
+                                    break;
+                                case 'not-null':
+                                    codeOperator = '!= null';
+                                    break;
+                                case 'null':
+                                    codeOperator = '== null';
+                                    break;
+                                case 'gt':
+                                    codeOperator = '>';
+                                    break;
+                                case 'gte':
+                                    codeOperator = '>=';
+                                    break;
+                                case 'lt':
+                                    codeOperator = '<';
+                                    break;
+                                case 'lte':
+                                    codeOperator = '<=';
+                                    break;
+                                case 'contains':
+                                    codeOperator = item.operator;
+                                    break;
+                                case 'start-with':
+                                    codeOperator = item.operator;
+                                    break;
+                                case 'end-with':
+                                    codeOperator = item.operator;
+                                    break;
+                            }
+                            debugger;
+                            query = query + ' ' + item.caption + ' ' + codeOperator + ' ' + item.text;
+                        }
+                        if (id !== group.items.length - 1 && query != ' ( ') {
+                            query = query + ' ' + group.condition;
+                        }
+                        id += 1;
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                if (group.items.length > 0) {
+                    query = query + ' ) ';
+                }
+                resolve(query);
+            }));
+        });
+    }
     getQueryString(group, type) {
         let query = '';
         switch (type) {
             case 'simple':
+                debugger;
                 if (group.items.length > 0) {
                     query = ' ( ';
                 }
@@ -9512,6 +9595,7 @@ let AXQueryBuilderGroupComponent = class AXQueryBuilderGroupComponent {
         this.qs = qs;
         this.collapsed = false;
         this.fields = [];
+        this.mode = 'new';
         //ruleIsEditing: boolean = true;
         this.groupRuleChanged = new EventEmitter();
         this.showGroupCondition = false;
@@ -9589,9 +9673,13 @@ let AXQueryBuilderGroupComponent = class AXQueryBuilderGroupComponent {
         this.ruleChanged(null);
     }
     ruleChanged(e) {
-        this.group.queryString = this.qs.getQueryString(this.group, 'simple');
-        this.group.queryStringElastic = this.qs.getQueryString(this.group, 'elastic');
-        this.groupRuleChanged.emit({ groups: this.group, component: this });
+        debugger;
+        // this.group.queryString = this.qs.getQueryString(this.group, 'simple');
+        this.qs.getQueryStringSimple(this.group).then((c) => {
+            this.group.queryString = c;
+            this.group.queryStringElastic = this.qs.getQueryString(this.group, 'elastic');
+            this.groupRuleChanged.emit({ groups: this.group, component: this });
+        });
     }
 };
 AXQueryBuilderGroupComponent.ctorParameters = () => [
@@ -9617,6 +9705,10 @@ __decorate([
     Input(),
     __metadata("design:type", Array)
 ], AXQueryBuilderGroupComponent.prototype, "fields", void 0);
+__decorate([
+    Input(),
+    __metadata("design:type", String)
+], AXQueryBuilderGroupComponent.prototype, "mode", void 0);
 __decorate([
     Output(),
     __metadata("design:type", EventEmitter)
@@ -9624,7 +9716,7 @@ __decorate([
 AXQueryBuilderGroupComponent = __decorate([
     Component({
         selector: 'ax-query-group',
-        template: "<div class=\"header\">\r\n    <div class=\"condition\" *ngIf=\"parent\">\r\n        <div class=\"text {{parent.condition}}\">\r\n            <span>{{parent.condition }}</span>\r\n        </div>\r\n    </div>\r\n    <div class=\"handler\">\r\n        <i class=\"far fa-grip-lines-vertical\"></i>\r\n    </div>\r\n\r\n    <div class=\"detail {{group.condition}}\" (click)=\"changeDetailMode()\">\r\n        <div class=\"collapsed\" *ngIf=\"collapsed;else expandedTemplate\">\r\n            {{group.queryString}}\r\n        </div>\r\n        <ng-template #expandedTemplate>\r\n            <div class=\"expanded\">\r\n                <strong>{{group.condition == 'OR' ? '\u06CC\u06A9\u06CC \u0627\u0632' : '\u0647\u0645\u0647' }} <span>\u0634\u0631\u0627\u06CC\u0637 \u0632\u06CC\u0631 \u0628\u0631\u0642\u0631\u0627\u0631 \u0628\u0627\u0634\u062F</span> </strong>\r\n            </div>\r\n        </ng-template>\r\n    </div>\r\n    <div class=\"buttons-list\">\r\n        <div class=\"button remove\" *ngIf=\"parent\" (click)=\"handleRemoveClick()\">\r\n            <i class=\"far fa-times ax-danger-color\"></i>\r\n        </div>\r\n        <div class=\"button edit\" (click)=\"handleChangeClick()\">\r\n            <i class=\"far fa-retweet ax-danger-color\"></i>\r\n        </div>\r\n    </div>\r\n</div>\r\n<div class=\"rules\" *ngIf=\"!collapsed\">\r\n    <!-- <ax-validation-form #form> -->\r\n\r\n    <div *ngFor=\"let item of group.items\" class=\"group-item\">\r\n        <ng-container *ngIf=\"item.condition;else ruleTemplate\">\r\n            <ax-query-group (groupRuleChanged)=\"ruleChanged($event)\" [group]=\"item\" [fields]=\"fields\" [parent]=\"group\">\r\n            </ax-query-group>\r\n        </ng-container>\r\n        <ng-template #ruleTemplate>\r\n            <ax-query-rule #queryRule (ruleChanged)=\"ruleChanged($event)\" (onRuleDelete)=\"ruleDelete($event)\"\r\n                [rule]=\"item\" [fields]=\"fields\" [parent]=\"group\">\r\n            </ax-query-rule>\r\n        </ng-template>\r\n    </div>\r\n    <!-- </ax-validation-form> -->\r\n    <div class=\"group-item\">\r\n        <div class=\"ax-query-rule\">\r\n            <div class=\"condition\">\r\n            </div>\r\n            <div class=\"handler\">\r\n                <i class=\"far fa-grip-lines-vertical\"></i>\r\n            </div>\r\n            <div class=\"add-rule\" (click)=\"addRule()\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>\u0634\u0631\u0637</span>\r\n            </div>\r\n            <div class=\"add-group\" (click)=\"addGroup()\" *ngIf=\"!showGroupCondition\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>\u06AF\u0631\u0648\u0647</span>\r\n            </div>\r\n            <div *ngIf=\"showGroupCondition\" class=\"add-condition OR\" (click)=\"addGroupOR()\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>OR</span>\r\n            </div>\r\n            <div *ngIf=\"showGroupCondition\" class=\"add-condition AND\" (click)=\"addGroupAND()\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>AND</span>\r\n            </div>\r\n\r\n        </div>\r\n    </div>\r\n</div>",
+        template: "<div class=\"header\">\r\n    <div class=\"condition\" *ngIf=\"parent\">\r\n        <div class=\"text {{parent.condition}}\">\r\n            <span>{{parent.condition }}</span>\r\n        </div>\r\n    </div>\r\n    <div class=\"handler\">\r\n        <i class=\"far fa-grip-lines-vertical\"></i>\r\n    </div>\r\n\r\n    <div class=\"detail {{group.condition}}\" (click)=\"changeDetailMode()\">\r\n        <div class=\"collapsed\" *ngIf=\"collapsed;else expandedTemplate\">\r\n            {{group.queryString}}\r\n        </div>\r\n        <ng-template #expandedTemplate>\r\n            <div class=\"expanded\">\r\n                <strong>{{group.condition == 'OR' ? '\u06CC\u06A9\u06CC \u0627\u0632' : '\u0647\u0645\u0647' }} <span>\u0634\u0631\u0627\u06CC\u0637 \u0632\u06CC\u0631 \u0628\u0631\u0642\u0631\u0627\u0631 \u0628\u0627\u0634\u062F</span> </strong>\r\n            </div>\r\n        </ng-template>\r\n    </div>\r\n    <div class=\"buttons-list\">\r\n        <div class=\"button remove\" *ngIf=\"parent && mode=='new'\" (click)=\"handleRemoveClick()\">\r\n            <i class=\"far fa-times ax-danger-color\"></i>\r\n        </div>\r\n        <div class=\"button edit\" *ngIf=\"mode=='new'\" (click)=\"handleChangeClick()\">\r\n            <i class=\"far fa-retweet ax-danger-color\"></i>\r\n        </div>\r\n    </div>\r\n</div>\r\n<div class=\"rules\" *ngIf=\"!collapsed\">\r\n    <!-- <ax-validation-form #form> -->\r\n\r\n    <div *ngFor=\"let item of group.items\" class=\"group-item\">\r\n        <ng-container *ngIf=\"item.condition;else ruleTemplate\">\r\n            <ax-query-group (groupRuleChanged)=\"ruleChanged($event)\" [mode]=\"mode\" [group]=\"item\" [fields]=\"fields\"\r\n                [parent]=\"group\">\r\n            </ax-query-group>\r\n        </ng-container>\r\n        <ng-template #ruleTemplate>\r\n            <ax-query-rule #queryRule (ruleChanged)=\"ruleChanged($event)\" [mode]=\"mode\"\r\n                (onRuleDelete)=\"ruleDelete($event)\" [rule]=\"item\" [fields]=\"fields\" [parent]=\"group\">\r\n            </ax-query-rule>\r\n        </ng-template>\r\n    </div>\r\n    <!-- </ax-validation-form> -->\r\n    <div class=\"group-item\" *ngIf=\"mode=='new'\">\r\n        <div class=\"ax-query-rule\">\r\n            <div class=\"condition\">\r\n            </div>\r\n            <div class=\"handler\">\r\n                <i class=\"far fa-grip-lines-vertical\"></i>\r\n            </div>\r\n            <div class=\"add-rule\" (click)=\"addRule()\" *ngIf=\"mode=='new'\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>\u0634\u0631\u0637</span>\r\n            </div>\r\n            <div class=\"add-group\" (click)=\"addGroup()\" *ngIf=\"!showGroupCondition && mode=='new'\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>\u06AF\u0631\u0648\u0647</span>\r\n            </div>\r\n            <div *ngIf=\"showGroupCondition && mode=='new'\" class=\"add-condition OR\" (click)=\"addGroupOR()\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>OR</span>\r\n            </div>\r\n            <div *ngIf=\"showGroupCondition && mode=='new'\" class=\"add-condition AND\" (click)=\"addGroupAND()\">\r\n                <i class=\"far fa-plus\"></i>&nbsp;&nbsp;<span>AND</span>\r\n            </div>\r\n\r\n        </div>\r\n    </div>\r\n</div>",
         host: { class: 'ax ax-query-group' },
         encapsulation: ViewEncapsulation.None
     }),
@@ -9636,6 +9728,7 @@ let AXQueryBuilderComponent = class AXQueryBuilderComponent extends AXBaseCompon
         super();
         this.ref = ref;
         this.toast = toast;
+        this.mode = 'new';
         this.rootGroup = new AXQueryBuilderGroup();
         this.fields = [];
         // @Input()
@@ -9644,11 +9737,11 @@ let AXQueryBuilderComponent = class AXQueryBuilderComponent extends AXBaseCompon
         this.saved = false;
     }
     ngOnInit() {
-        this.rootGroup.condition = this.query.condition ? this.query.condition : "AND";
+        this.rootGroup.condition = this.query.condition ? this.query.condition : 'AND';
         this.rootGroup.items = this.query.items ? this.query.items : [];
     }
     getQueryBuilder() {
-        return ({ groups: this.rootGroup });
+        return { groups: this.rootGroup };
     }
     ruleChanged(e) {
         this.onRuleChanged.emit({ component: this, groups: this.rootGroup });
@@ -9698,6 +9791,10 @@ __decorate([
     Input(),
     __metadata("design:type", AXQueryBuilderGroup)
 ], AXQueryBuilderComponent.prototype, "query", void 0);
+__decorate([
+    Input(),
+    __metadata("design:type", String)
+], AXQueryBuilderComponent.prototype, "mode", void 0);
 __decorate([
     Input(),
     __metadata("design:type", Array)
@@ -9709,9 +9806,9 @@ __decorate([
 AXQueryBuilderComponent = __decorate([
     Component({
         selector: 'ax-query-builder',
-        template: "<ax-query-group #queryGroup [group]=\"rootGroup\" [fields]=\"fields\" (groupRuleChanged)=\"ruleChanged($event)\">\r\n</ax-query-group>",
+        template: "<ax-query-group #queryGroup [mode]=\"mode\" [group]=\"rootGroup\" [fields]=\"fields\"\r\n    (groupRuleChanged)=\"ruleChanged($event)\">\r\n</ax-query-group>",
         encapsulation: ViewEncapsulation.None,
-        styles: [".ax-query-group{display:flex;flex-direction:column;margin:5px;-webkit-padding-start:0;padding-inline-start:0}.ax-query-group .add-buttons{display:flex;margin:5px;flex-direction:row}.ax-query-group .add-buttons .handler{display:flex;align-items:center;background-color:var(--ax-primary-trans-light-color);color:var(--ax-primary-color);padding:5px;cursor:move;border:1px solid var(--ax-primary-trans-light-color);border-top-right-radius:4px;border-bottom-right-radius:4px}.ax-query-group .buttons-list{-webkit-margin-start:10px;margin-inline-start:10px;display:flex;align-items:center}.ax-query-group .buttons-list .button{cursor:pointer;-webkit-margin-end:.5em;margin-inline-end:.5em;width:2.3em;height:2.3em;display:flex;align-items:center;justify-content:center;border-radius:50px;position:relative}.ax-query-group .buttons-list .button ax-check-box{opacity:0;width:100%;height:100%;position:absolute;z-index:1;left:0;top:0}.ax-query-group .buttons-list .variable{color:var(--ax-warning-color);background:var(--ax-warning-trans-light-color)}.ax-query-group .buttons-list .variable.active-button{background:var(--ax-warning-light-color);color:var(--ax-white-color);opacity:.7}.ax-query-group .buttons-list .commit{color:var(--ax-success-color);background:var(--ax-success-trans-light-color)}.ax-query-group .buttons-list .remove{color:var(--ax-danger-color);background:var(--ax-danger-trans-light-color)}.ax-query-group .buttons-list .edit{color:var(--ax-primary-color);background:var(--ax-primary-trans-light-color)}.ax-query-group .group-item{transition:.5s}.ax-query-group .group-item .condition{width:40px;display:flex;align-items:center;background:linear-gradient(180deg,rgba(2,0,36,0) 49%,var(--ax-gray-light-color) 49%,var(--ax-gray-light-color) 55%,rgba(0,212,255,0) 50%)}.ax-query-group .group-item .condition .text{-webkit-margin-start:-50%;margin-inline-start:-50%;border-radius:50%;width:35px;height:35px;display:flex;align-items:center;justify-content:center}.ax-query-group .group-item .condition .text.OR{background:var(--ax-warning-color);color:var(--ax-warning-fore-color)}.ax-query-group .group-item .condition .text.AND{background:var(--ax-success-color);color:var(--ax-success-fore-color)}.ax-query-group .header{display:flex;flex-direction:row}.ax-query-group .header .handler{display:flex;align-items:center;background-color:var(--ax-light-light-color);color:var(--ax-light-fore-color);padding:5px;cursor:move;border:1px solid var(--ax-light-light-color);border-top-right-radius:4px;border-bottom-right-radius:4px}.ax-query-group .header .caption{padding:10px;background-color:var(--ax-gray-trans-light-color);color:var(--ax-gray-dark-color);font-weight:700;cursor:pointer}.ax-query-group .header .detail{padding:10px;background-color:var(--ax-gray-trans-light-color);border-right:none;border-top-left-radius:50px;border-bottom-left-radius:50px;cursor:pointer}.ax-query-group .header .detail.OR{background-color:var(--ax-warning-trans-light-color)}.ax-query-group .header .detail.AND{background-color:var(--ax-success-trans-light-color)}.ax-query-group .rules{-webkit-margin-start:10px;margin-inline-start:10px;-webkit-border-start:2px solid var(--ax-gray-light-color);border-inline-start:2px solid var(--ax-gray-light-color)}.ax-query-group .rules .rules{-webkit-margin-start:48px;margin-inline-start:48px}.ax-query-group .ax-query-rule{display:flex;margin:5px;flex-direction:row;transition:.5s}.ax-query-group .ax-query-rule .handler{display:flex;align-items:center;background-color:var(--ax-light-light-color);color:var(--ax-light-fore-color);padding:.5em;cursor:move;border:1px solid var(--ax-light-light-color);border-top-right-radius:4px;border-bottom-right-radius:4px}.ax-query-group .ax-query-rule .caption{padding:10px;background-color:var(--ax-gray-trans-light-color);border:1px solid var(--ax-gray-light-color);color:#333;font-weight:700;cursor:pointer}.ax-query-group .ax-query-rule .caption.editable{width:200px}.ax-query-group .ax-query-rule .operator{border-top:1px solid var(--ax-gray-light-color);border-bottom:1px solid var(--ax-gray-light-color);background-color:var(--ax-gray-trans-light-color);padding:10px}.ax-query-group .ax-query-rule .operator.editable{width:200px}.ax-query-group .ax-query-rule .operator .text{color:var(--ax-primary-color);font-weight:700;-webkit-text-decoration:underline dashed;text-decoration:underline dashed;cursor:pointer}.ax-query-group .ax-query-rule .operator.radius{border-top-left-radius:4px;border-bottom-left-radius:4px;border:1px solid var(--ax-gray-light-color);border-right:none}.ax-query-group .ax-query-rule .value{padding:10px;background-color:var(--ax-light-light-color);color:#000;border:1px solid var(--ax-gray-light-color);border-right:none;border-top-left-radius:4px;border-bottom-left-radius:4px;cursor:pointer}.ax-query-group .ax-query-rule .value.editable{width:200px}.ax-query-group .ax-query-rule .add-rule{border-top:1px dashed var(--ax-gray-light-color);border-bottom:1px dashed var(--ax-gray-light-color);color:var(--ax-gray-dark-color);padding:10px;font-weight:700;cursor:pointer}.ax-query-group .ax-query-rule .add-group:hover,.ax-query-group .ax-query-rule .add-rule:hover{background-color:var(--ax-gray-light-color)}.ax-query-group .ax-query-rule .add-condition,.ax-query-group .ax-query-rule .add-group{border-top:1px dashed var(--ax-gray-light-color);border-bottom:1px dashed var(--ax-gray-light-color);color:var(--ax-gray-dark-color);padding:10px;border:1px dashed var(--ax-gray-light-color);border-top-left-radius:4px;border-bottom-left-radius:4px;cursor:pointer}.ax-query-group .ax-query-rule .add-condition.OR{background-color:var(--ax-warning-trans-light-color);color:var(--ax-warning-dark-color)}.ax-query-group .ax-query-rule .add-condition.AND{background-color:var(--ax-success-trans-light-color);color:var(--ax-success-dark-color)}.ax-query-group .ax-query-rule .add-condition:hover.OR{background-color:var(--ax-warning-trans-light-color);color:var(--ax-warning-dark-color)}.ax-query-group .ax-query-rule .add-condition:hover.AND{background-color:var(--ax-success-trans-light-color);color:var(--ax-success-dark-color)}"]
+        styles: [".ax-query-group{display:flex;flex-direction:column;margin:5px;-webkit-padding-start:0;padding-inline-start:0}.ax-query-group .add-buttons{display:flex;margin:5px;flex-direction:row}.ax-query-group .add-buttons .handler{display:flex;align-items:center;background-color:var(--ax-primary-trans-light-color);color:var(--ax-primary-color);padding:5px;cursor:move;border:1px solid var(--ax-primary-trans-light-color);border-start-start-radius:4px;border-end-start-radius:4px}.ax-query-group .buttons-list{-webkit-margin-start:10px;margin-inline-start:10px;display:flex;align-items:center}.ax-query-group .buttons-list .button{cursor:pointer;-webkit-margin-end:.5em;margin-inline-end:.5em;width:2.3em;height:2.3em;display:flex;align-items:center;justify-content:center;border-radius:50px;position:relative}.ax-query-group .buttons-list .button ax-check-box{opacity:0;width:100%;height:100%;position:absolute;z-index:1;left:0;top:0}.ax-query-group .buttons-list .variable{color:var(--ax-warning-color);background:var(--ax-warning-trans-light-color)}.ax-query-group .buttons-list .variable.active-button{background:var(--ax-warning-light-color);color:var(--ax-white-color);opacity:.7}.ax-query-group .buttons-list .commit{color:var(--ax-success-color);background:var(--ax-success-trans-light-color)}.ax-query-group .buttons-list .remove{color:var(--ax-danger-color);background:var(--ax-danger-trans-light-color)}.ax-query-group .buttons-list .edit{color:var(--ax-primary-color);background:var(--ax-primary-trans-light-color)}.ax-query-group .group-item{transition:.5s}.ax-query-group .group-item .condition{width:40px;display:flex;align-items:center;background:linear-gradient(180deg,rgba(2,0,36,0) 49%,var(--ax-gray-light-color) 49%,var(--ax-gray-light-color) 55%,rgba(0,212,255,0) 50%)}.ax-query-group .group-item .condition .text{-webkit-margin-start:-50%;margin-inline-start:-50%;border-radius:50%;width:35px;height:35px;display:flex;align-items:center;justify-content:center}.ax-query-group .group-item .condition .text.OR{background:var(--ax-warning-color);color:var(--ax-warning-fore-color)}.ax-query-group .group-item .condition .text.AND{background:var(--ax-success-color);color:var(--ax-success-fore-color)}.ax-query-group .header{display:flex;flex-direction:row}.ax-query-group .header .handler{display:flex;align-items:center;background-color:var(--ax-light-light-color);color:var(--ax-light-fore-color);padding:5px;cursor:move;border:1px solid var(--ax-light-light-color);border-start-start-radius:4px;border-end-start-radius:4px}.ax-query-group .header .caption{padding:.5rem;background-color:var(--ax-gray-trans-light-color);color:var(--ax-gray-dark-color);font-weight:700;cursor:pointer}.ax-query-group .header .detail{padding:.5rem;background-color:var(--ax-gray-trans-light-color);border-right:none;border-start-end-radius:4px;border-end-end-radius:4px;cursor:pointer}.ax-query-group .header .detail.OR{background-color:var(--ax-warning-trans-light-color)}.ax-query-group .header .detail.AND{background-color:var(--ax-success-trans-light-color)}.ax-query-group .rules{-webkit-margin-start:10px;margin-inline-start:10px;-webkit-border-start:2px solid var(--ax-gray-light-color);border-inline-start:2px solid var(--ax-gray-light-color)}.ax-query-group .rules .rules{-webkit-margin-start:48px;margin-inline-start:48px}.ax-query-group .ax-query-rule{display:flex;margin:5px;flex-direction:row;transition:.5s}.ax-query-group .ax-query-rule .handler{display:flex;align-items:center;background-color:var(--ax-light-light-color);color:var(--ax-light-fore-color);padding:.5em;cursor:move;border:1px solid var(--ax-light-light-color);border-start-start-radius:4px;border-end-start-radius:4px}.ax-query-group .ax-query-rule .caption{padding:.5rem;background-color:var(--ax-gray-trans-light-color);border:1px solid var(--ax-gray-light-color);color:#333;font-weight:700;cursor:pointer}.ax-query-group .ax-query-rule .caption.editable{width:200px}.ax-query-group .ax-query-rule .operator{border-top:1px solid var(--ax-gray-light-color);border-bottom:1px solid var(--ax-gray-light-color);background-color:var(--ax-gray-trans-light-color);padding:.5rem}.ax-query-group .ax-query-rule .operator.editable{width:200px}.ax-query-group .ax-query-rule .operator .text{color:var(--ax-primary-color);font-weight:700;-webkit-text-decoration:underline dashed;text-decoration:underline dashed;cursor:pointer}.ax-query-group .ax-query-rule .operator.radius{border-top-left-radius:4px;border-bottom-left-radius:4px;border:1px solid var(--ax-gray-light-color);border-right:none}.ax-query-group .ax-query-rule .value{padding:.5rem;background-color:var(--ax-light-light-color);color:#000;border:1px solid var(--ax-gray-light-color);border-right:none;border-start-end-radius:4px;border-end-end-radius:4px;cursor:pointer}.ax-query-group .ax-query-rule .value.editable{width:200px}.ax-query-group .ax-query-rule .add-rule{border-top:1px dashed var(--ax-gray-light-color);border-bottom:1px dashed var(--ax-gray-light-color);color:var(--ax-gray-dark-color);padding:.5rem;font-weight:700;cursor:pointer}.ax-query-group .ax-query-rule .add-group:hover,.ax-query-group .ax-query-rule .add-rule:hover{background-color:var(--ax-gray-light-color)}.ax-query-group .ax-query-rule .add-condition,.ax-query-group .ax-query-rule .add-group{border-top:1px dashed var(--ax-gray-light-color);border-bottom:1px dashed var(--ax-gray-light-color);color:var(--ax-gray-dark-color);padding:.5rem;border:1px dashed var(--ax-gray-light-color);border-top-left-radius:4px;border-bottom-left-radius:4px;cursor:pointer}.ax-query-group .ax-query-rule .add-condition.OR{background-color:var(--ax-warning-trans-light-color);color:var(--ax-warning-dark-color)}.ax-query-group .ax-query-rule .add-condition.AND{background-color:var(--ax-success-trans-light-color);color:var(--ax-success-dark-color)}.ax-query-group .ax-query-rule .add-condition:hover.OR{background-color:var(--ax-warning-trans-light-color);color:var(--ax-warning-dark-color)}.ax-query-group .ax-query-rule .add-condition:hover.AND{background-color:var(--ax-success-trans-light-color);color:var(--ax-success-dark-color)}"]
     }),
     __metadata("design:paramtypes", [ElementRef, AXToastService])
 ], AXQueryBuilderComponent);
@@ -10824,7 +10921,7 @@ AXTabPageModule = __decorate([
         imports: [CommonModule, AXLoadingModule],
         exports: [AXTabPageRendererComponent],
         entryComponents: [AXTabPageRendererComponent, AXTabPageHostComponent],
-        providers: [AXTabPageService],
+        providers: [],
     })
 ], AXTabPageModule);
 
@@ -12811,7 +12908,10 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
         //seletedKeyFields set id of nodes and parents
         //selectedFieldName set name of fields that set selectes
         this.selectedFieldName = null;
-        this.selectNodesRecursive = 'all';
+        // @Input()
+        // selectNodesRecursive: 'all' | 'parents' | 'childs' | 'none' = 'all'; //leaf
+        this.checkParents = true;
+        this.checkChilds = true;
         this.seletedKeyFields = [];
         this.keyField = 'id';
         this.hasChildField = 'child';
@@ -12880,6 +12980,7 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
             }
             if (item.select == true) {
                 if (this.selectionMode === 'multiple') {
+                    this.selectedParents = this.selectedParents.filter((c) => c[this.keyField] !== item[this.keyField]);
                     this.selectedParents.push(item);
                 }
                 else {
@@ -12932,12 +13033,14 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
         }
         node.itemData.item = c; //TO DO
         node.itemData.selected = item.select === true ? item.select : false;
+        node.itemData.indeterminate = item.select === null ? true : false;
         node.itemData.hasChild = item[this.hasChildField];
         node.parent = item.parentNode === undefined ? null : this.makeNode(item.parentNode, false);
         return node;
     }
     changeChildSelect(item, s) {
-        if (this.selectNodesRecursive == 'all' || this.selectNodesRecursive == 'childs') {
+        // if (this.selectNodesRecursive == 'all' || this.selectNodesRecursive == 'childs') {
+        if (this.checkChilds == true) {
             item.select = s;
             if (item[this.hasChildField] === true && item[this.childField] && item[this.childField].length > 0) {
                 item[this.childField].forEach((elm) => {
@@ -12970,7 +13073,8 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
         }
     }
     changeParentSelect(item) {
-        if (this.selectNodesRecursive == 'all' || this.selectNodesRecursive == 'parents') {
+        //if (this.selectNodesRecursive == 'all' || this.selectNodesRecursive == 'parents') {
+        if (this.checkParents) {
             let allselect = true;
             let alldeselect = true;
             let oneselect = false;
@@ -12994,9 +13098,13 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
             }
             if (oneselect || (isindeterminate && !allselect)) {
                 item.select = null;
+                this.selectedParents = this.selectedParents.filter((c) => c[this.keyField] !== item[this.keyField]);
+                this.selectedParents.push(item);
             }
             if (allselect === true) {
                 item.select = true;
+                this.selectedParents = this.selectedParents.filter((c) => c[this.keyField] !== item[this.keyField]);
+                this.selectedParents.push(item);
             }
             if (alldeselect === true) {
                 item.select = false;
@@ -13082,9 +13190,11 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
                         this.seletedKeyFields.forEach((n) => {
                             if (n.includes(el[this.keyField])) {
                                 if (el[this.hasChildField] == true) {
-                                    //  if (this.selectNodesRecursive) {
+                                    if (this.checkParents == false && this.checkChilds == false) {
+                                        //select parent when check child and check parent is false TODO check this Action
+                                        this.selectItem(el);
+                                    }
                                     this.open(el);
-                                    // }
                                 }
                                 else {
                                     this.selectItem(el);
@@ -13095,9 +13205,11 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
                     }
                     else if (this.selectedFieldName != null) {
                         if (el[this.hasChildField] == true && el[this.selectedFieldName] == true) {
-                            // if (this.selectNodesRecursive) {
+                            if (this.checkParents == false && this.checkChilds == false) {
+                                //select parent when check child and check parent is false TODO check this Action
+                                this.selectItem(el);
+                            }
                             this.open(el);
-                            // }
                         }
                         else if (el[this.selectedFieldName] == true) {
                             this.selectItem(el);
@@ -13109,6 +13221,7 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
             else {
                 this.itemRow = this.listLoad.filter((c) => c.requestId === _data.data.requestId)[0];
                 this.listLoad = this.listLoad.filter((c) => c.requestId !== _data.data.requestId);
+                this.itemRow.loaded = true;
                 if (this.itemRow !== undefined) {
                     this.hideLoading(this.itemRow);
                     const result = _data.data.result;
@@ -13129,7 +13242,8 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
                             if (this.selectionLevel == 'parents' && result[i][this.hasChildField] == false) {
                                 result[i].disabledCheckBox = true;
                             }
-                            if (this.selectionMode !== 'single' && (this.selectNodesRecursive == 'all' || this.selectNodesRecursive == 'childs')) {
+                            // if (this.selectionMode !== 'single' && (this.selectNodesRecursive == 'all' || this.selectNodesRecursive == 'childs')) {
+                            if (this.selectionMode !== 'single' && this.checkChilds == true) {
                                 result[i].select = this.itemRow.select === (undefined || null) ? false : this.itemRow.select;
                                 if (this.itemRow.select === true && this.selectionMode == 'multiple' && result[i][this.hasChildField] === false) {
                                     this.selectedItems = this.selectedItems.filter((c) => c[this.keyField] !== result[i][this.keyField]);
@@ -13144,9 +13258,11 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
                                 this.seletedKeyFields.forEach((n) => {
                                     if (n.includes(result[i][this.keyField])) {
                                         if (result[i][this.hasChildField] == true) {
-                                            // if (this.selectNodesRecursive) {
+                                            if (this.checkParents == false && this.checkChilds == false) {
+                                                //select parent when check child and check parent is false TODO check this Action
+                                                this.selectItem(result[i]);
+                                            }
                                             this.open(result[i]);
-                                            // }
                                         }
                                         else {
                                             this.selectItem(result[i]);
@@ -13157,9 +13273,11 @@ let AXTreeViewComponent = class AXTreeViewComponent extends AXBaseComponent {
                             }
                             else if (this.selectedFieldName != null) {
                                 if (result[i][this.hasChildField] == true && result[i][this.selectedFieldName] == true) {
-                                    // if (this.selectNodesRecursive) {
+                                    if (this.checkParents == false && this.checkChilds == false) {
+                                        //select parent when check child and check parent is false TODO check this Action
+                                        this.selectItem(result[i]);
+                                    }
                                     this.open(result[i]);
-                                    // }
                                 }
                                 else if (result[i][this.selectedFieldName] == true) {
                                     this.selectItem(result[i]);
@@ -13405,8 +13523,12 @@ __decorate([
 ], AXTreeViewComponent.prototype, "selectedFieldName", void 0);
 __decorate([
     Input(),
-    __metadata("design:type", String)
-], AXTreeViewComponent.prototype, "selectNodesRecursive", void 0);
+    __metadata("design:type", Boolean)
+], AXTreeViewComponent.prototype, "checkParents", void 0);
+__decorate([
+    Input(),
+    __metadata("design:type", Boolean)
+], AXTreeViewComponent.prototype, "checkChilds", void 0);
 __decorate([
     Input(),
     __metadata("design:type", Array)