@smartbit4all/ng-client 3.1.73 → 3.1.74

package/fesm2020/smartbit4all-ng-client.mjs

@@ -13034,49 +13034,39 @@ class SmartFilterEditorContentComponent {
     }
     ngOnInit() {
         this.service.load();
-        this.initChildComponents();
         this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => {
-            this.bindChildComps();
+            this.setUp();
         });
     }
     ngOnDestroy() {
         this._destroy$.next();
         this._destroy$.complete();
     }
-    initChildComponents() {
-        if (this.service.model?.type === this.type.Simple) {
-            this.simpleFilterModel = {
-                data: [],
-                type: SmartFilterType.SIMPLE,
-            };
-            this.smartFilterChild.service.change.pipe(takeUntil(this._destroy$)).subscribe(() => {
+    setupSimpleFilter() {
+        this.simpleFilterModel = {
+            data: this.service.model.model.workplaceList.filters,
+            type: SmartFilterType.SIMPLE,
+        };
+        if (!this.smartFilterChangeSubscription) {
+            this.smartFilterChangeSubscription = 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() {
+    setUp() {
         if (this.service.model?.type === this.type.Simple) {
-            this.smartFilterChild.filter = {
-                data: this.service.model.model.workplaceList.filters,
-                type: SmartFilterType.SIMPLE,
-            };
+            this.setupSimpleFilter();
         }
         else {
             this.constructUiActionModels();
             if (this.service.model.selectedFieldEditor) {
                 this.constructForm();
             }
+            else {
+                this.smartForm = undefined;
+            }
         }
     }
     constructUiActionModels() {
@@ -13108,12 +13098,20 @@ class SmartFilterEditorContentComponent {
         let generatedWidgets = this.layoutService.render({
             layoutDefinitions: this.service.model?.selectedFieldEditor?.layoutDef?.widgets,
         });
-        this.formChild.smartForm = {
+        this.smartForm = {
             direction: SmartFormWidgetDirection.ROW,
             useOnBlurEvent: true,
             componentModel: { data: this.service.model?.selectedField },
             widgets: generatedWidgets,
         };
+        if (this.smartformChangeSubscription) {
+            this.smartformChangeSubscription.unsubscribe();
+        }
+        this.smartformChangeSubscription = this.formChild?.onBlurSubject
+            ?.pipe(takeUntil(this._destroy$))
+            .subscribe(() => {
+            this.save();
+        });
     }
     save() {
         this.formChild?.submitForm(false);