@smartbit4all/ng-client 7.2.7 → 7.2.8

package/fesm2022/smartbit4all-ng-client.mjs

@@ -23217,14 +23217,43 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
 class ExpressionEditorDialogComponent {
     constructor() {
         this.service = inject(ExpressionEditorDialogService);
+        this._destroy$ = new Subject();
         this.smartForm = this.service.form;
+        // Reacts to any later refreshDialog() call while the dialog stays open.
+        // On the very first run (during construction) formComponent isn't resolved yet —
+        // that first run corresponds to the initial open, already handled by the constructor
+        // assignment above, so it's safely skipped.
+        effect(() => {
+            const form = this.service.formState();
+            if (!form || !this.formComponent) {
+                return;
+            }
+            this.smartForm = form;
+            this.formComponent.smartForm = form;
+            this.formComponent.refresh();
+        });
+    }
+    ngAfterViewInit() {
+        this.formComponent.sophisticatedValueChange
+            .pipe(takeUntil(this._destroy$))
+            .subscribe((change) => {
+            if (change.key === 'expressionData.currentOperation') {
+                // Push data up without closing; parent recomputes and calls refreshDialog().
+                const submittedForm = this.formComponent.submitForm(false);
+                this.service.onSave(submittedForm.componentModel.data);
+            }
+        });
+    }
+    ngOnDestroy() {
+        this._destroy$.next();
+        this._destroy$.complete();
     }
     cancel() {
         this.service.closeDialog(false);
     }
     save() {
         let submittedForm = this.formComponent.submitForm();
-        this.service.onSave(submittedForm.componentModel.data);
+        this.service.onSaveWithClose(submittedForm.componentModel.data);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: ExpressionEditorDialogComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "22.0.8", type: ExpressionEditorDialogComponent, isStandalone: true, selector: "lib-expression-editor-dialog", viewQueries: [{ propertyName: "formComponent", first: true, predicate: ["form"], descendants: true, read: SmartformComponent }], ngImport: i0, template: "<smartform #form [smartForm]=\"smartForm\"></smartform>\r\n<div class=\"button-container\">\r\n  <button (click)=\"save()\" mat-raised-button color=\"primary\">Ment\u00E9s</button>\r\n  <button (click)=\"cancel()\" mat-raised-button color=\"secondary\">M\u00E9gsem</button>\r\n</div>\r\n", styles: [".button-container{display:flex;justify-content:flex-end;gap:1rem}:host{display:flex;flex-direction:column;padding:1rem}:host::ng-deep h4{margin:0}:host::ng-deep .mat-mdc-form-field-infix:has(input){padding:0}\n"], dependencies: [{ kind: "component", type: SmartformComponent, selector: "smartform", inputs: ["smartForm"] }, { kind: "component", type: MatButton, selector: "    button[matButton], a[matButton], button[mat-button], button[mat-raised-button],    button[mat-flat-button], button[mat-stroked-button], a[mat-button], a[mat-raised-button],    a[mat-flat-button], a[mat-stroked-button]  ", inputs: ["matButton"], exportAs: ["matButton", "matAnchor"] }] }); }
@@ -23238,16 +23267,20 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
             }] } });
 
 class ExpressionEditorDialogService extends SmartdialogService {
+    get form() {
+        return this.formState();
+    }
     constructor() {
         const dialog = inject(MatDialog);
         const inject$1 = inject(Injector);
         super(dialog, inject$1);
         this._destroy$ = new Subject();
         this.saveEvent = new Subject();
+        this.formState = signal(undefined, /* @ts-ignore */
+        ...(ngDevMode ? [{ debugName: "formState" }] : /* istanbul ignore next */ []));
     }
     setDataAndOpenDialog(form) {
-        this.form = form;
-        console.log(this.form);
+        this.formState.set(form);
         this.openDialog();
     }
     openDialog() {
@@ -23260,11 +23293,15 @@ class ExpressionEditorDialogService extends SmartdialogService {
         };
         this.createDialog(dialogData, ExpressionEditorDialogComponent);
     }
+    refreshDialog(form) {
+        this.formState.set(form);
+    }
+    onSaveWithClose(data) {
+        this.onSave(data);
+        this.closeDialog();
+    }
     onSave(data) {
         this.saveEvent.next(data);
-        // this.onAction.complete();
-        this.closeDialog();
-        // this.onAction = new SmartSubject(this._destroy$);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: ExpressionEditorDialogService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: ExpressionEditorDialogService, providedIn: 'root' }); }
@@ -23344,7 +23381,12 @@ class SmartFilterEditorContentComponent {
         if (this.smartComponent && !this.service.parentSmartComponent) {
             this.service.parentSmartComponent = this.smartComponent;
         }
-        this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => this.setUp());
+        this.service.modelChanged.pipe(takeUntil(this._destroy$)).subscribe(() => {
+            this.setUp();
+            if (this.useAdvancedFilter) {
+                this.expressionEditorDialogService.refreshDialog(this.createFilterEditorForm());
+            }
+        });
         this.service.load();
         if (this.useAdvancedFilter) {
             this.service.itemSelected.pipe(takeUntil(this._destroy$)).subscribe((item) => {