@smartbit4all/ng-client 3.0.27 → 3.0.29

package/fesm2020/smartbit4all-ng-client.mjs

@@ -2497,12 +2497,13 @@ class SmartdialogService {
         this.router = router;
     }
     createDialog(smartDialog, component) {
-        this.dialogData = smartDialog;
-        this.dialogRef = this.dialog.open(component, { data: this.dialogData });
-        this.dialogRef.afterClosed().subscribe((result) => {
+        let dialogData = smartDialog;
+        let dialogRef = this.dialog.open(component, { data: dialogData });
+        dialogRef.afterClosed().subscribe((result) => {
             this.handleAfterClosed(result);
-            this.closeDialog();
+            this.closeDialog(dialogRef, dialogData);
         });
+        return dialogRef;
     }
     createDialogRef(smartDialog, component) {
         const dialogRef = this.dialog.open(component, { data: smartDialog });
@@ -2520,22 +2521,21 @@ class SmartdialogService {
             },
             customComponent: component,
         };
-        this.createDialog(smartDialog, component);
-        return this.dialogRef;
+        return this.createDialog(smartDialog, component);
     }
     handleAfterClosed(result) { }
     openDialog() {
         throw new Error('openDialog function is not implemented!');
     }
-    async closeDialog() {
-        if (this.dialogData?.outlets) {
+    async closeDialog(dialogRef, dialogData) {
+        if (dialogData?.outlets) {
             await this.router.navigate([
                 {
-                    outlets: this.dialogData.outlets,
+                    outlets: dialogData.outlets,
                 },
             ]);
         }
-        this.dialogRef?.close();
+        dialogRef?.close();
     }
 }
 SmartdialogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartdialogService, deps: [{ token: i1$2.MatDialog }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -3320,8 +3320,7 @@ class SmartFormService {
         }
     }
     addEmptyItemToValueList(widget) {
-        if (widget.type == SmartFormWidgetType.SELECT ||
-            widget.type == SmartFormWidgetType.SELECT_MULTIPLE) {
+        if (widget.type == SmartFormWidgetType.SELECT) {
             widget.valueList?.unshift({
                 key: this.emptyKey,
                 label: '',
@@ -6736,14 +6735,14 @@ class SmartDevToolDialogService extends SmartdialogService {
     }
     handleAfterClosed(result) { }
     openDialog() {
-        const dialogData = {
+        this.dialogData = {
             content: {
                 title: '',
             },
             size: {},
             customComponent: SmartDevToolDialogComponent,
         };
-        this.createDialog(dialogData, SmartDevToolDialogComponent);
+        this.dialogRef = this.createDialog(this.dialogData, SmartDevToolDialogComponent);
     }
     getData() {
         return this.service.descriptor;
@@ -6813,7 +6812,7 @@ class SmartDevToolDialogComponent {
         });
     }
     close() {
-        this.service.closeDialog();
+        this.service.closeDialog(this.service.dialogRef, this.service.dialogData);
     }
 }
 SmartDevToolDialogComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartDevToolDialogComponent, deps: [{ token: SmartDevToolDialogService }], target: i0.ɵɵFactoryTarget.Component });
@@ -7523,24 +7522,24 @@ class UiActionConfirmDialogService extends SmartdialogService {
     openDialog() {
         this.shouldDoAction = false;
         this.onAction = new SmartSubject(this._destroy$);
-        const dialogData = {
+        this.dialogData = {
             content: {
                 title: '',
             },
             size: {},
             customComponent: UiActionConfirmDialogComponent,
         };
-        this.createDialog(dialogData, UiActionConfirmDialogComponent);
+        this.dialogRef = this.createDialog(this.dialogData, UiActionConfirmDialogComponent);
     }
     doAction() {
         this.shouldDoAction = true;
         this.onAction.complete();
-        this.closeDialog();
+        this.closeDialog(this.dialogRef, this.dialogData);
         this.onAction = new SmartSubject(this._destroy$);
     }
     cancel() {
         this.onAction.complete();
-        this.closeDialog();
+        this.closeDialog(this.dialogRef, this.dialogData);
         this.onAction = new SmartSubject(this._destroy$);
     }
 }
@@ -7677,24 +7676,24 @@ class UiActionInputDialogService extends SmartdialogService {
     openDialog() {
         this.params = undefined;
         this.onAction = new SmartSubject(this._destroy$);
-        const dialogData = {
+        this.dialogData = {
             content: {
                 title: '',
             },
             size: {},
             customComponent: UiActionInputDialogComponent,
         };
-        this.createDialog(dialogData, UiActionInputDialogComponent);
+        this.dialogRef = this.createDialog(this.dialogData, UiActionInputDialogComponent);
     }
     async onSave(params) {
         this.params = params;
         this.onAction.complete();
-        this.closeDialog();
+        this.closeDialog(this.dialogRef, this.dialogData);
         this.onAction = new SmartSubject(this._destroy$);
     }
     cancel() {
         this.onAction.complete();
-        this.closeDialog();
+        this.closeDialog(this.dialogRef, this.dialogData);
         this.onAction = new SmartSubject(this._destroy$);
     }
 }
@@ -7783,24 +7782,24 @@ class UiActionFileUploadDialogService extends SmartdialogService {
     openDialog() {
         this.files = undefined;
         this.onAction = new SmartSubject(this._destroy$);
-        const dialogData = {
+        this.dialogData = {
             content: {
                 title: '',
             },
             size: {},
             customComponent: UiActionFileUploadDialogComponent,
         };
-        this.createDialog(dialogData, UiActionFileUploadDialogComponent);
+        this.dialogRef = this.createDialog(this.dialogData, UiActionFileUploadDialogComponent);
     }
     async onSave(files) {
         this.files = files;
         this.onAction.complete();
-        this.closeDialog();
+        this.closeDialog(this.dialogRef, this.dialogData);
         this.onAction = new SmartSubject(this._destroy$);
     }
     cancel() {
         this.onAction.complete();
-        this.closeDialog();
+        this.closeDialog(this.dialogRef, this.dialogData);
         this.onAction = new SmartSubject(this._destroy$);
     }
 }