@smartbit4all/ng-client 3.1.74 → 3.1.76

package/fesm2020/smartbit4all-ng-client.mjs

@@ -10965,7 +10965,7 @@ class SmartGridComponent {
         this.afterViewInitExecuted = false;
         this.isBlocked = true;
         this.getLevel = (node) => node.level ?? 0;
-        this.isExpandable = (node) => (node.children ? true : false);
+        this.isExpandable = (node) => (node.children && node.children.length > 0 ? true : false);
         this.getChildren = (node) => {
             if (node.children) {
                 let rows = this.smartGrid?.gridModel.page.rows?.filter((row) => node.children?.some((child) => child === row.id));
@@ -10975,7 +10975,7 @@ class SmartGridComponent {
             }
             return [];
         };
-        this.hasChild = (_, _nodeData) => (_nodeData.children ? true : false);
+        this.hasChild = (_, _nodeData) => this.isExpandable(_nodeData);
         this.transformer = (row, level) => {
             row.level = level;
             return row;
@@ -13032,6 +13032,15 @@ class SmartFilterEditorContentComponent {
         this.expressionUiActionModels = [];
         this.type = FilterExpressionBuilderUiModel.TypeEnum;
     }
+    ngAfterViewInit() {
+        if (this.service.model?.type === this.type.Simple) {
+            this.smartFilterChangeSubscription = this.smartFilterChild?.service.change
+                .pipe(takeUntil(this._destroy$))
+                .subscribe(() => {
+                this.saveFilter();
+            });
+        }
+    }
     ngOnInit() {
         this.service.load();
         this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => {
@@ -13048,11 +13057,6 @@ class SmartFilterEditorContentComponent {
             type: SmartFilterType.SIMPLE,
         };
         if (!this.smartFilterChangeSubscription) {
-            this.smartFilterChangeSubscription = this.smartFilterChild?.service.change
-                .pipe(takeUntil(this._destroy$))
-                .subscribe(() => {
-                this.saveFilter();
-            });
         }
     }
     setUp() {
@@ -13152,10 +13156,10 @@ class SmartFilterEditorContentComponent {
     }
 }
 SmartFilterEditorContentComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartFilterEditorContentComponent, deps: [{ token: SmartformLayoutDefinitionService }], target: i0.ɵɵFactoryTarget.Component });
-SmartFilterEditorContentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartFilterEditorContentComponent, selector: "smart-filter-expression-editor", inputs: { service: "service" }, viewQueries: [{ propertyName: "formChild", first: true, predicate: ["form"], descendants: true }, { propertyName: "smartFilterChild", first: true, predicate: ["smartFilter"], descendants: true }], ngImport: i0, template: "<div class=\"targetGroupContentContainer\">\r\n  <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n  <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n  <ng-template #simpleFilter>\r\n    <div class=\"expressionsContainer\">\r\n      <smart-filter #smartFilter [filter]=\"simpleFilterModel\"></smart-filter>\r\n      <button (click)=\"saveFilter()\" mat-raised-button color=\"primary\">Ment\u00E9s</button>\r\n    </div>\r\n  </ng-template>\r\n  <ng-template #complexFilter>\r\n    <div class=\"uiActionsBar\" *ngIf=\"!service.model?.readOnly\">\r\n      <div class=\"uiActionsInsideOfBar\">\r\n        <smart-ui-action-toolbar [uiActionModels]=\"uiActionModels\"></smart-ui-action-toolbar>\r\n      </div>\r\n    </div>\r\n    <div\r\n      *ngIf=\"\r\n        service?.model?.model?.workplaceList?.filters?.length;\r\n        then withParameters;\r\n        else withoutParameters\r\n      \"\r\n    ></div>\r\n    <ng-template #withoutParameters>\r\n      <div class=\"withoutParametersContainer\">\r\n        <span class=\"mat-body\"> M\u00E9g nincs megadva param\u00E9ter </span>\r\n      </div>\r\n    </ng-template>\r\n    <ng-template #withParameters>\r\n      <div class=\"withParametersContainer\">\r\n        <div\r\n          class=\"expressionsContainer\"\r\n          *ngIf=\"service?.model?.model?.workplaceList?.filters?.length\"\r\n        >\r\n          <app-expression-items\r\n            [items]=\"(service.model?.model?.workplaceList)!.filters\"\r\n          ></app-expression-items>\r\n        </div>\r\n        <div class=\"expressionEditorContainer\">\r\n          <smartform #form [smartForm]=\"smartForm\"></smartform>\r\n          <div *ngIf=\"smartForm\">\r\n            <button (click)=\"save()\" mat-raised-button color=\"primary\">Ment\u00E9s</button>\r\n            <button (click)=\"remove()\" mat-button color=\"accent\">T\u00F6rl\u00E9s</button>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </ng-template>\r\n  </ng-template>\r\n</div>\r\n", styles: [".targetGroupContentContainer{padding:1.5rem;display:flex;flex-direction:column;gap:2.5rem;height:calc(100% - 3rem);overflow:auto;position:relative}.targetGroupContentContainer h3{margin:0;font-weight:600}.uiActionsBar{padding:1.5rem;border-radius:.25rem;background-color:var(--container-color)}.uiActionsBar,.uiActionsInsideOfBar{display:flex;flex-direction:row;gap:1rem}.uiActionsInsideOfBar{position:relative;left:-3rem}.section,.notSection{display:flex;flex-direction:row;gap:1rem}.section:before{content:\"\";border:1px solid #d9d9d9;align-self:stretch}.withoutParametersContainer{display:flex;flex-direction:column;padding:2rem;background-color:var(--container-color);border-radius:.25rem}.withoutParametersContainer .mat-body{font-weight:600;text-align:center}.withParametersContainer{display:flex;flex-direction:column;padding:1.5rem;background-color:var(--container-color);border-radius:.25rem;gap:.75rem}.expressionsContainer{display:flex;flex-direction:row;flex-wrap:wrap;gap:.75rem;margin-bottom:1px solid #cdcdcd}.expressionEditorContainer{display:flex;flex-direction:column;gap:.75rem}\n"], components: [{ type: SmartFilterComponent, selector: "smart-filter", inputs: ["filter"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: UiActionToolbarComponent, selector: "smart-ui-action-toolbar", inputs: ["uiActionModels", "uiActionDescriptorService"] }, { type: SmartFilterExpressionItemsComponent, selector: "app-expression-items", inputs: ["items"] }, { type: SmartformComponent, selector: "smartform", inputs: ["smartForm"] }], directives: [{ type: i3$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
+SmartFilterEditorContentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.4.0", type: SmartFilterEditorContentComponent, selector: "smart-filter-expression-editor", inputs: { service: "service" }, viewQueries: [{ propertyName: "formChild", first: true, predicate: ["form"], descendants: true }, { propertyName: "smartFilterChild", first: true, predicate: ["smartFilter"], descendants: true }], ngImport: i0, template: "<div class=\"targetGroupContentContainer\">\r\n  <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n  <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n  <ng-template #simpleFilter>\r\n    <div class=\"expressionsContainer\">\r\n      <smart-filter #smartFilter [filter]=\"simpleFilterModel\"></smart-filter>\r\n    </div>\r\n  </ng-template>\r\n  <ng-template #complexFilter>\r\n    <div class=\"uiActionsBar\" *ngIf=\"!service.model?.readOnly\">\r\n      <div class=\"uiActionsInsideOfBar\">\r\n        <smart-ui-action-toolbar [uiActionModels]=\"uiActionModels\"></smart-ui-action-toolbar>\r\n      </div>\r\n    </div>\r\n    <div\r\n      *ngIf=\"\r\n        service?.model?.model?.workplaceList?.filters?.length;\r\n        then withParameters;\r\n        else withoutParameters\r\n      \"\r\n    ></div>\r\n    <ng-template #withoutParameters>\r\n      <div class=\"withoutParametersContainer\">\r\n        <span class=\"mat-body\"> M\u00E9g nincs megadva param\u00E9ter </span>\r\n      </div>\r\n    </ng-template>\r\n    <ng-template #withParameters>\r\n      <div class=\"withParametersContainer\">\r\n        <div\r\n          class=\"expressionsContainer\"\r\n          *ngIf=\"service?.model?.model?.workplaceList?.filters?.length\"\r\n        >\r\n          <app-expression-items\r\n            [items]=\"(service.model?.model?.workplaceList)!.filters\"\r\n          ></app-expression-items>\r\n        </div>\r\n        <div class=\"expressionEditorContainer\">\r\n          <smartform #form [smartForm]=\"smartForm\"></smartform>\r\n          <div *ngIf=\"smartForm\">\r\n            <button (click)=\"remove()\" mat-button color=\"accent\">T\u00F6rl\u00E9s</button>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </ng-template>\r\n  </ng-template>\r\n</div>\r\n", styles: [".targetGroupContentContainer{padding:1.5rem;display:flex;flex-direction:column;gap:2.5rem;height:calc(100% - 3rem);overflow:auto;position:relative}.targetGroupContentContainer h3{margin:0;font-weight:600}.uiActionsBar{padding:1.5rem;border-radius:.25rem;background-color:var(--container-color)}.uiActionsBar,.uiActionsInsideOfBar{display:flex;flex-direction:row;gap:1rem}.uiActionsInsideOfBar{position:relative;left:-3rem}.section,.notSection{display:flex;flex-direction:row;gap:1rem}.section:before{content:\"\";border:1px solid #d9d9d9;align-self:stretch}.withoutParametersContainer{display:flex;flex-direction:column;padding:2rem;background-color:var(--container-color);border-radius:.25rem}.withoutParametersContainer .mat-body{font-weight:600;text-align:center}.withParametersContainer{display:flex;flex-direction:column;padding:1.5rem;background-color:var(--container-color);border-radius:.25rem;gap:.75rem}.expressionsContainer{display:flex;flex-direction:row;flex-wrap:wrap;gap:.75rem;margin-bottom:1px solid #cdcdcd}.expressionEditorContainer{display:flex;flex-direction:column;gap:.75rem}\n"], components: [{ type: SmartFilterComponent, selector: "smart-filter", inputs: ["filter"] }, { type: UiActionToolbarComponent, selector: "smart-ui-action-toolbar", inputs: ["uiActionModels", "uiActionDescriptorService"] }, { type: SmartFilterExpressionItemsComponent, selector: "app-expression-items", inputs: ["items"] }, { type: SmartformComponent, selector: "smartform", inputs: ["smartForm"] }, { type: i3.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }], directives: [{ type: i3$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartFilterEditorContentComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'smart-filter-expression-editor', template: "<div class=\"targetGroupContentContainer\">\r\n  <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n  <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n  <ng-template #simpleFilter>\r\n    <div class=\"expressionsContainer\">\r\n      <smart-filter #smartFilter [filter]=\"simpleFilterModel\"></smart-filter>\r\n      <button (click)=\"saveFilter()\" mat-raised-button color=\"primary\">Ment\u00E9s</button>\r\n    </div>\r\n  </ng-template>\r\n  <ng-template #complexFilter>\r\n    <div class=\"uiActionsBar\" *ngIf=\"!service.model?.readOnly\">\r\n      <div class=\"uiActionsInsideOfBar\">\r\n        <smart-ui-action-toolbar [uiActionModels]=\"uiActionModels\"></smart-ui-action-toolbar>\r\n      </div>\r\n    </div>\r\n    <div\r\n      *ngIf=\"\r\n        service?.model?.model?.workplaceList?.filters?.length;\r\n        then withParameters;\r\n        else withoutParameters\r\n      \"\r\n    ></div>\r\n    <ng-template #withoutParameters>\r\n      <div class=\"withoutParametersContainer\">\r\n        <span class=\"mat-body\"> M\u00E9g nincs megadva param\u00E9ter </span>\r\n      </div>\r\n    </ng-template>\r\n    <ng-template #withParameters>\r\n      <div class=\"withParametersContainer\">\r\n        <div\r\n          class=\"expressionsContainer\"\r\n          *ngIf=\"service?.model?.model?.workplaceList?.filters?.length\"\r\n        >\r\n          <app-expression-items\r\n            [items]=\"(service.model?.model?.workplaceList)!.filters\"\r\n          ></app-expression-items>\r\n        </div>\r\n        <div class=\"expressionEditorContainer\">\r\n          <smartform #form [smartForm]=\"smartForm\"></smartform>\r\n          <div *ngIf=\"smartForm\">\r\n            <button (click)=\"save()\" mat-raised-button color=\"primary\">Ment\u00E9s</button>\r\n            <button (click)=\"remove()\" mat-button color=\"accent\">T\u00F6rl\u00E9s</button>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </ng-template>\r\n  </ng-template>\r\n</div>\r\n", styles: [".targetGroupContentContainer{padding:1.5rem;display:flex;flex-direction:column;gap:2.5rem;height:calc(100% - 3rem);overflow:auto;position:relative}.targetGroupContentContainer h3{margin:0;font-weight:600}.uiActionsBar{padding:1.5rem;border-radius:.25rem;background-color:var(--container-color)}.uiActionsBar,.uiActionsInsideOfBar{display:flex;flex-direction:row;gap:1rem}.uiActionsInsideOfBar{position:relative;left:-3rem}.section,.notSection{display:flex;flex-direction:row;gap:1rem}.section:before{content:\"\";border:1px solid #d9d9d9;align-self:stretch}.withoutParametersContainer{display:flex;flex-direction:column;padding:2rem;background-color:var(--container-color);border-radius:.25rem}.withoutParametersContainer .mat-body{font-weight:600;text-align:center}.withParametersContainer{display:flex;flex-direction:column;padding:1.5rem;background-color:var(--container-color);border-radius:.25rem;gap:.75rem}.expressionsContainer{display:flex;flex-direction:row;flex-wrap:wrap;gap:.75rem;margin-bottom:1px solid #cdcdcd}.expressionEditorContainer{display:flex;flex-direction:column;gap:.75rem}\n"] }]
+            args: [{ selector: 'smart-filter-expression-editor', template: "<div class=\"targetGroupContentContainer\">\r\n  <h3>{{ service.model?.model?.label }}</h3>\r\n\r\n  <div *ngIf=\"service.model?.type === type.Simple; then simpleFilter; else complexFilter\"></div>\r\n\r\n  <ng-template #simpleFilter>\r\n    <div class=\"expressionsContainer\">\r\n      <smart-filter #smartFilter [filter]=\"simpleFilterModel\"></smart-filter>\r\n    </div>\r\n  </ng-template>\r\n  <ng-template #complexFilter>\r\n    <div class=\"uiActionsBar\" *ngIf=\"!service.model?.readOnly\">\r\n      <div class=\"uiActionsInsideOfBar\">\r\n        <smart-ui-action-toolbar [uiActionModels]=\"uiActionModels\"></smart-ui-action-toolbar>\r\n      </div>\r\n    </div>\r\n    <div\r\n      *ngIf=\"\r\n        service?.model?.model?.workplaceList?.filters?.length;\r\n        then withParameters;\r\n        else withoutParameters\r\n      \"\r\n    ></div>\r\n    <ng-template #withoutParameters>\r\n      <div class=\"withoutParametersContainer\">\r\n        <span class=\"mat-body\"> M\u00E9g nincs megadva param\u00E9ter </span>\r\n      </div>\r\n    </ng-template>\r\n    <ng-template #withParameters>\r\n      <div class=\"withParametersContainer\">\r\n        <div\r\n          class=\"expressionsContainer\"\r\n          *ngIf=\"service?.model?.model?.workplaceList?.filters?.length\"\r\n        >\r\n          <app-expression-items\r\n            [items]=\"(service.model?.model?.workplaceList)!.filters\"\r\n          ></app-expression-items>\r\n        </div>\r\n        <div class=\"expressionEditorContainer\">\r\n          <smartform #form [smartForm]=\"smartForm\"></smartform>\r\n          <div *ngIf=\"smartForm\">\r\n            <button (click)=\"remove()\" mat-button color=\"accent\">T\u00F6rl\u00E9s</button>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </ng-template>\r\n  </ng-template>\r\n</div>\r\n", styles: [".targetGroupContentContainer{padding:1.5rem;display:flex;flex-direction:column;gap:2.5rem;height:calc(100% - 3rem);overflow:auto;position:relative}.targetGroupContentContainer h3{margin:0;font-weight:600}.uiActionsBar{padding:1.5rem;border-radius:.25rem;background-color:var(--container-color)}.uiActionsBar,.uiActionsInsideOfBar{display:flex;flex-direction:row;gap:1rem}.uiActionsInsideOfBar{position:relative;left:-3rem}.section,.notSection{display:flex;flex-direction:row;gap:1rem}.section:before{content:\"\";border:1px solid #d9d9d9;align-self:stretch}.withoutParametersContainer{display:flex;flex-direction:column;padding:2rem;background-color:var(--container-color);border-radius:.25rem}.withoutParametersContainer .mat-body{font-weight:600;text-align:center}.withParametersContainer{display:flex;flex-direction:column;padding:1.5rem;background-color:var(--container-color);border-radius:.25rem;gap:.75rem}.expressionsContainer{display:flex;flex-direction:row;flex-wrap:wrap;gap:.75rem;margin-bottom:1px solid #cdcdcd}.expressionEditorContainer{display:flex;flex-direction:column;gap:.75rem}\n"] }]
         }], ctorParameters: function () { return [{ type: SmartformLayoutDefinitionService }]; }, propDecorators: { service: [{
                 type: Input
             }], formChild: [{