@acorex/modules 20.7.8 → 20.7.9

package/fesm2022/acorex-modules-dashboard-management.mjs

@@ -5254,7 +5254,7 @@ class AXMDashboardPopupService {
                 .query({ skip: 0, take: 100 })
                 .catch(() => ({ items: [] }))).items.map((i) => ({ id: i.id, title: i.title }))
             : [];
-        const dialogRef = await this.layoutBuilder
+        const result = await this.layoutBuilder
             .create()
             .dialog((dialog) => {
             dialog
@@ -5303,31 +5303,32 @@ class AXMDashboardPopupService {
             })
                 .setActions((actions) => {
                 actions.cancel('@general:actions.cancel.title').submit('@general:actions.save.title');
+            })
+                .onAction(async (dialogRef) => {
+                const context = dialogRef.context();
+                const action = dialogRef.action();
+                if (!context || action === 'cancel') {
+                    return undefined;
+                }
+                const formData = context;
+                const now = new Date();
+                const userId = this.sessionService.user?.id;
+                return {
+                    ...data,
+                    title: (formData['title'] ?? '').toString().trim(),
+                    description: (formData['description'] ?? '').toString().trim(),
+                    roleIds: isAdmin ? (formData['selectedRoleIds'] ?? []) : undefined,
+                    isDeleted: isAdmin ? Boolean(formData['isDisabled']) : undefined,
+                    locked: isAdmin ? Boolean(formData['isLocked']) : undefined,
+                    scope: isAdmin ? 'T' : 'U',
+                    createdBy: userId,
+                    createdAt: now,
+                    updatedBy: userId,
+                    updatedAt: now,
+                };
             });
         })
             .show();
-        const formData = dialogRef.context() ?? {};
-        const action = dialogRef.action();
-        if (action === 'cancel') {
-            dialogRef.close();
-            return;
-        }
-        const now = new Date();
-        const userId = this.sessionService.user?.id;
-        const result = {
-            ...data,
-            title: (formData['title'] ?? '').trim(),
-            description: (formData['description'] ?? '').trim(),
-            roleIds: isAdmin ? (formData['selectedRoleIds'] ?? []) : undefined,
-            isDeleted: isAdmin ? Boolean(formData['isDisabled']) : undefined,
-            locked: isAdmin ? Boolean(formData['isLocked']) : undefined,
-            scope: isAdmin ? 'T' : 'U',
-            createdBy: userId,
-            createdAt: now,
-            updatedBy: userId,
-            updatedAt: now,
-        };
-        dialogRef.close();
         return result;
     }
     async handlePopupConfiguration(widget) {