@smartbit4all/ng-client 3.1.99 → 3.2.1

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,18 +13614,35 @@ class SmartFilterEditorContentComponent {
         this.expressionUiActionModels = [];
         this.type = FilterExpressionBuilderUiModel.TypeEnum;
     }
-    ngAfterViewChecked() { }
+    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.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => this.setUp());
     }
     ngOnDestroy() {
         this._destroy$.next();
         this._destroy$.complete();
     }
     setupSimpleFilter() {
+        if (this.simpleFilterForm) {
+            return;
+        }
         let widgets = [];
         let key;
         let model = {};
@@ -13655,26 +13682,6 @@ class SmartFilterEditorContentComponent {
             useOnBlurEvent: true,
             widgets,
         };
-        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') {
-                    console.log(change);
-                    this.saveFilter();
-                }
-            });
     }
     extractFilterFieldFromFormModel() {
         let simpleFilter = this.simpleFilterFormChild?.submitForm(false).componentModel.data;
@@ -13724,6 +13731,9 @@ class SmartFilterEditorContentComponent {
         }
     }
     constructForm() {
+        if (this.smartForm) {
+            return;
+        }
         let generatedWidgets = this.layoutService.render({
             layoutDefinitions: this.service.model?.selectedFieldEditor?.layoutDef?.widgets,
         });