@smartbit4all/ng-client 3.1.71 → 3.1.73

package/fesm2020/smartbit4all-ng-client.mjs

@@ -13032,32 +13032,42 @@ class SmartFilterEditorContentComponent {
         this.expressionUiActionModels = [];
         this.type = FilterExpressionBuilderUiModel.TypeEnum;
     }
-    ngAfterViewInit() {
-        if (this.smartFilterChild) {
-            this.smartFilterChild.service.change.pipe(takeUntil(this._destroy$)).subscribe(() => {
-                this.saveFilter();
-            });
-        }
-        if (this.formChild) {
-            this.formChild.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
-                this.save();
-            });
-        }
-    }
     ngOnInit() {
         this.service.load();
+        this.initChildComponents();
         this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => {
-            this.setUp();
+            this.bindChildComps();
         });
     }
     ngOnDestroy() {
         this._destroy$.next();
         this._destroy$.complete();
     }
-    setupSimpleFilter() { }
-    setUp() {
+    initChildComponents() {
         if (this.service.model?.type === this.type.Simple) {
             this.simpleFilterModel = {
+                data: [],
+                type: SmartFilterType.SIMPLE,
+            };
+            this.smartFilterChild.service.change.pipe(takeUntil(this._destroy$)).subscribe(() => {
+                this.saveFilter();
+            });
+        }
+        else {
+            this.smartForm = {
+                direction: SmartFormWidgetDirection.ROW,
+                useOnBlurEvent: true,
+                componentModel: { data: this.service.model?.selectedField },
+                widgets: [],
+            };
+            this.formChild.onBlurSubject?.pipe(takeUntil(this._destroy$)).subscribe(() => {
+                this.save();
+            });
+        }
+    }
+    bindChildComps() {
+        if (this.service.model?.type === this.type.Simple) {
+            this.smartFilterChild.filter = {
                 data: this.service.model.model.workplaceList.filters,
                 type: SmartFilterType.SIMPLE,
             };
@@ -13067,9 +13077,6 @@ class SmartFilterEditorContentComponent {
             if (this.service.model.selectedFieldEditor) {
                 this.constructForm();
             }
-            else {
-                this.smartForm = undefined;
-            }
         }
     }
     constructUiActionModels() {
@@ -13101,7 +13108,7 @@ class SmartFilterEditorContentComponent {
         let generatedWidgets = this.layoutService.render({
             layoutDefinitions: this.service.model?.selectedFieldEditor?.layoutDef?.widgets,
         });
-        this.smartForm = {
+        this.formChild.smartForm = {
             direction: SmartFormWidgetDirection.ROW,
             useOnBlurEvent: true,
             componentModel: { data: this.service.model?.selectedField },