@smartbit4all/ng-client 3.1.98 → 3.2.0

package/fesm2020/smartbit4all-ng-client.mjs

@@ -3877,13 +3877,18 @@ class SmartFormService {
     }
     toFormGroup() {
         this.createFormControls(this.smartForm.widgets);
-        let formGroup = new FormGroup(this.group);
+        if (this.formGroup) {
+            this.formGroup.controls = this.group;
+        }
+        else {
+            this.formGroup = new FormGroup(this.group);
+        }
         if (this.smartForm.validators && this.smartForm.validators.length) {
-            formGroup.setValidators(this.smartForm.validators.map((validator) => {
+            this.formGroup.setValidators(this.smartForm.validators.map((validator) => {
                 return validator.validator;
             }));
         }
-        return formGroup;
+        return this.formGroup;
     }
     createFormControls(widgets, parentKey) {
         widgets.map((widget) => {
@@ -3899,13 +3904,18 @@ class SmartFormService {
                 widget.type !== SmartFormWidgetType.COMPONENT &&
                 widget.type !== SmartFormWidgetType.MATRIX &&
                 widget.type !== SmartFormWidgetType.YOUTUBE_PLAYER) {
-                let formControl = new FormControl(widget.value || '', widget.validators?.map((validator) => {
-                    return validator.validator;
-                }));
-                if (widget.isDisabled) {
-                    formControl.disable();
+                let formControl = this.group[`${widget.key}`];
+                if (formControl) {
+                }
+                else {
+                    formControl = new FormControl(widget.value || '', widget.validators?.map((validator) => {
+                        return validator.validator;
+                    }));
+                    if (widget.isDisabled) {
+                        formControl.disable();
+                    }
+                    this.group[`${widget.key}`] = formControl;
                 }
-                this.group[`${widget.key}`] = formControl;
             }
             if (widget.type === SmartFormWidgetType.MATRIX) {
                 if (widget.isMultiple) {
@@ -13604,35 +13614,79 @@ class SmartFilterEditorContentComponent {
         this.expressionUiActionModels = [];
         this.type = FilterExpressionBuilderUiModel.TypeEnum;
     }
-    ngAfterViewChecked() {
-        if (this.service.model?.type === this.type.Simple) {
-            if (this.smartFilterChangeSubscription) {
-                this.smartFilterChangeSubscription.unsubscribe();
-            }
-            this.smartFilterChangeSubscription = this.smartFilterChild?.service.change
-                .pipe(takeUntil(this._destroy$))
-                .subscribe(() => {
-                this.saveFilter();
-            });
+    ngAfterViewInit() {
+        if (this.smartFilterChangeSubscription) {
+            this.smartFilterChangeSubscription.unsubscribe();
         }
+        this.smartFilterChangeSubscription = this.simpleFilterFormChild.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
+            this.saveFilter();
+        });
+        if (this.smartFilterSophisticatedChangeSubscription) {
+            this.smartFilterSophisticatedChangeSubscription.unsubscribe();
+        }
+        this.smartFilterSophisticatedChangeSubscription =
+            this.simpleFilterFormChild.sophisticatedValueChange?.pipe(takeUntil(this._destroy$)).subscribe((change) => {
+                if (change.kind === 'selection') {
+                    this.saveFilter();
+                }
+            });
     }
     ngOnInit() {
         this.service.load();
-        this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => {
-            this.setUp();
-        });
+        this.setUp();
     }
     ngOnDestroy() {
         this._destroy$.next();
         this._destroy$.complete();
     }
     setupSimpleFilter() {
-        this.simpleFilterModel = {
-            data: this.service.model.model.workplaceList.filters,
-            type: SmartFilterType.SIMPLE,
+        let widgets = [];
+        let key;
+        let model = {};
+        this.service.model?.model?.workplaceList?.filters.forEach((filterExpressionField, index) => {
+            model[index] = filterExpressionField;
+            if (filterExpressionField.widgetType === 'SELECT_MULTIPLE') {
+                key = index + '.expressionData.operand2.selectedValues';
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                return;
+            }
+            if (filterExpressionField.expressionData?.currentOperation === 'BETWEEN') {
+                key = index + '.expressionData.operand2.valueAsString';
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                key = index + '.expressionData.operand3.valueAsString';
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                return;
+            }
+            if (filterExpressionField.expressionData?.operand2) {
+                if (key !== index + '.expressionData.operand2.selectedValues') {
+                    key = index + '.expressionData.operand2.valueAsString';
+                }
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label2, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                return;
+            }
+            if (filterExpressionField?.expressionData?.operand3) {
+                if (key !== index + '.selectedValues') {
+                    key = index + '.expressionData.operand3.valueAsString';
+                }
+                widgets.push(this.constructFormWidget(key, filterExpressionField.label3, filterExpressionField.widgetType ?? FilterExpressionFieldWidgetType.TextField, filterExpressionField.possibleValues));
+                return;
+            }
+        });
+        this.simpleFilterForm = {
+            direction: SmartFormWidgetDirection.ROW,
+            componentModel: { data: model },
+            useOnValueChangeEvent: true,
+            useOnBlurEvent: true,
+            widgets,
         };
-        if (!this.smartFilterChangeSubscription) {
-        }
+    }
+    extractFilterFieldFromFormModel() {
+        let simpleFilter = this.simpleFilterFormChild?.submitForm(false).componentModel.data;
+        let result = [];
+        Object.keys(simpleFilter).forEach((key) => {
+            result.push(simpleFilter[key]);
+        });
+        this.service.model.model.workplaceList.filters = result;
     }
     setUp() {
         if (this.service.model?.type === this.type.Simple) {
@@ -13730,9 +13784,7 @@ class SmartFilterEditorContentComponent {
         return [];
     }
     async saveFilter() {
-        let smartFilter = await this.smartFilterChild?.submit();
-        this.service.model.model.workplaceList.filters =
-            smartFilter?.data;
+        this.extractFilterFieldFromFormModel();
         this.service.performUiActionRequest({
             code: FilterExpressionBuilderApiActions.SAVE_EXPRESSION_FIELD_LIST,
             params: {
@@ -13740,20 +13792,45 @@ class SmartFilterEditorContentComponent {
             },
         });
     }
+    constructFormWidget(key, label, widgetType, possibleValues) {
+        let type = widgetType;
+        if (type === FilterExpressionFieldWidgetType.Date) {
+            type = SmartFormWidgetType.DATE_PICKER;
+        }
+        else if (type === FilterExpressionFieldWidgetType.DateTime) {
+            type = SmartFormWidgetType.DATE_TIME_PICKER;
+        }
+        let widget = {
+            key,
+            label,
+            type,
+            value: '',
+            showLabel: true,
+            valueList: possibleValues.map((value) => {
+                return {
+                    key: value.objectUri ? value.objectUri : value.code,
+                    label: value.displayValue,
+                    type: SmartFormWidgetType.ITEM,
+                    value: value.objectUri ? value.objectUri : value.code,
+                };
+            }),
+        };
+        return widget;
+    }
 }
 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    </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-raised-button color=\"primary\">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"] }] });
+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: "simpleFilterFormChild", first: true, predicate: ["simpleFilterFromChild"], 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      <smartform #simpleFilterFromChild [smartForm]=\"simpleFilterForm\"></smartform>\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-raised-button color=\"primary\">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: SmartformComponent, selector: "smartform", inputs: ["smartForm"] }, { type: UiActionToolbarComponent, selector: "smart-ui-action-toolbar", inputs: ["uiActionModels", "uiActionDescriptorService"] }, { type: SmartFilterExpressionItemsComponent, selector: "app-expression-items", inputs: ["items"] }, { 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    </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-raised-button color=\"primary\">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      <smartform #simpleFilterFromChild [smartForm]=\"simpleFilterForm\"></smartform>\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-raised-button color=\"primary\">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: [{
                 type: ViewChild,
                 args: ['form']
-            }], smartFilterChild: [{
+            }], simpleFilterFormChild: [{
                 type: ViewChild,
-                args: ['smartFilter']
+                args: ['simpleFilterFromChild']
             }] } });
 
 class SmartFilterEditorModule {
@@ -13769,7 +13846,8 @@ SmartFilterEditorModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0",
         SmartViewContextModule,
         SmartformModule,
         MatButtonModule,
-        SmartFilterModule], exports: [SmartFilterParamsComponent,
+        SmartFilterModule,
+        SmartformModule], exports: [SmartFilterParamsComponent,
         SmartFilterParamComponent,
         SmartFilterEditorContentComponent,
         SmartFilterExpressionItemsComponent,
@@ -13782,6 +13860,7 @@ SmartFilterEditorModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0",
             SmartformModule,
             MatButtonModule,
             SmartFilterModule,
+            SmartformModule,
         ]] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartFilterEditorModule, decorators: [{
             type: NgModule,
@@ -13801,6 +13880,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.4.0", ngImpor
                         SmartformModule,
                         MatButtonModule,
                         SmartFilterModule,
+                        SmartformModule,
                     ],
                     exports: [
                         SmartFilterParamsComponent,