@ldmjs/ui 1.0.85 → 1.0.86

package/dist/index.js

@@ -7740,10 +7740,8 @@ class DialogManager {
     }
     static alert(modal) {
         const modalInfo = {
-            title: modal.title,
-            content: modal.content,
+            ...modal,
             type: ModalType.Alert,
-            hostObject: modal.hostObject,
             managerId: DialogManager._id,
         };
         return DialogManager.execAsync(modalInfo);
@@ -7752,7 +7750,6 @@ class DialogManager {
         const modalInfo = {
             ...modal,
             type: ModalType.Prompt,
-            hostObject: modal.hostObject,
             managerId: DialogManager._id,
         };
         return DialogManager.execAsync(modalInfo);
@@ -7760,10 +7757,8 @@ class DialogManager {
     static confirm(modal) {
         const modalInfo = {
             ...modal,
-            content: modal.text,
             type: ModalType.Confirm,
             closable: true,
-            hostObject: modal.hostObject,
             managerId: DialogManager._id,
         };
         return DialogManager.execAsync(modalInfo);
@@ -8121,39 +8116,61 @@ const dialog_minimized_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(d
 /* harmony default export */ const dialog_minimized = (dialog_minimized_exports_);
 ;// ./src/ld-dialog/dialogs.ts
 class Dialog {
-    constructor(title, content) {
-        this.title = title;
-        this.content = content ?? '';
+    constructor(data) {
+        this.title = data.title;
+        this.content = data.content;
+        this.pressEnterAsOk = data.pressEnterAsOk !== false;
+        this.pressEscAsCancel = data.pressEscAsCancel !== false;
+        this.hostObject = data.hostObject;
     }
 }
 class AlertDialog extends Dialog {
     constructor(data) {
-        super(data.title, data.text);
-        this.hostObject = data.hostObject;
+        super({
+            title: data.title,
+            content: data.text,
+            pressEnterAsOk: data.pressEnterAsOk,
+            pressEscAsCancel: data.pressEscAsCancel,
+            hostObject: data.hostObject,
+        });
     }
 }
 class PromptDialog extends Dialog {
     constructor(data) {
-        super(data.title, data.content);
+        super({
+            title: data.title,
+            content: data.content,
+            pressEnterAsOk: data.pressEnterAsOk,
+            pressEscAsCancel: data.pressEscAsCancel,
+            hostObject: data.hostObject,
+        });
         this.width = data.width || '60%';
-        this.hostObject = data.hostObject;
     }
 }
 class ConfirmDialog extends Dialog {
     constructor(data) {
-        super(data.title);
-        this.title = data.title;
-        this.text = data.text;
+        super({
+            title: data.title,
+            content: data.text,
+            pressEnterAsOk: data.pressEnterAsOk,
+            pressEscAsCancel: data.pressEscAsCancel,
+            hostObject: data.hostObject,
+        });
         this.okTitle = data.okTitle;
         this.cancelTitle = data.cancelTitle;
         this.okResult = data.okResult;
         this.cancelResult = data.cancelResult;
-        this.hostObject = data.hostObject;
     }
 }
 class InfoDialog extends Dialog {
     constructor(data) {
-        super(data.title);
+        super({
+            title: data.title,
+            content: '',
+            pressEnterAsOk: data.pressEnterAsOk,
+            pressEscAsCancel: data.pressEscAsCancel,
+            hostObject: data.hostObject,
+        });
         this.component = data.component;
         this.componentProps = data.componentProps;
         this.width = data.width;
@@ -8164,13 +8181,18 @@ class InfoDialog extends Dialog {
         this.hideFooter = data.hideFooter;
         this.minimizable = data.minimizable;
         this.description = data.description;
-        this.hostObject = data.hostObject;
         this.help = data.help;
     }
 }
 class SelectDialog extends Dialog {
     constructor(data) {
-        super(data.title);
+        super({
+            title: data.title,
+            content: '',
+            pressEnterAsOk: data.pressEnterAsOk,
+            pressEscAsCancel: data.pressEscAsCancel,
+            hostObject: data.hostObject,
+        });
         this.component = data.component;
         this.componentProps = data.componentProps;
         this.loading = data.loading;
@@ -8180,20 +8202,24 @@ class SelectDialog extends Dialog {
         this.selectAsOk = data.selectAsOk;
         this.okTitle = data.okTitle;
         this.cancelTitle = data.cancelTitle;
-        this.hostObject = data.hostObject;
         this.help = data.help;
     }
 }
 class CreateEditDialog extends Dialog {
     constructor(data) {
-        super(data.title);
+        super({
+            title: data.title,
+            content: '',
+            pressEnterAsOk: data.pressEnterAsOk,
+            pressEscAsCancel: data.pressEscAsCancel,
+            hostObject: data.hostObject,
+        });
         this._isChanged = null;
         this.component = data.component;
         this.componentProps = {
             ...data.componentProps,
             setIsChangedCallback: this.setIsChangedCallback.bind(this),
         };
-        this.hostObject = data.hostObject;
         this.loading = data.loading;
         this.fullHeight = data.fullHeight;
         this.width = data.width;
@@ -8300,6 +8326,8 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
             component: modalInfo.component,
             componentProps: modalInfo.componentProps,
             hostObject: modalInfo.hostObject,
+            pressEnterAsOk: modalInfo.pressEnterAsOk,
+            pressEscAsCancel: modalInfo.pressEscAsCancel,
             loading: modalInfo.loading,
             noModal: modalInfo.noModal,
             type: modalInfo.type,
@@ -8377,16 +8405,24 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
                         return;
                     }
                     if (e.key === 'Enter') {
+                        if (!modal.pressEnterAsOk) {
+                            return;
+                        }
                         if (e.shiftKey) {
                             return;
                         }
                         this.handleOk(modal);
                     }
                     if (e.key === 'Escape') {
+                        if (!modal.pressEscAsCancel) {
+                            return;
+                        }
                         this.handleCancel(modal);
                     }
                 };
-                this.dialogListeners.set(modal, listenerHandler.bind(this));
+                if (modal.pressEnterAsOk || modal.pressEscAsCancel) {
+                    this.dialogListeners.set(modal, listenerHandler.bind(this));
+                }
                 modal.el = el;
                 if (this.isConfirmDialog(modal)) {
                     const btnOk = modal.el.querySelector('#modalOk');
@@ -8485,6 +8521,7 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
                                 resultSave = await resultSave;
                                 if (resultSave) {
                                     this.modalResult = resultSave;
+                                    removeModal = true;
                                 }
                                 else {
                                     return;
@@ -8504,6 +8541,7 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
                                 return;
                             }
                             this.modalResult = resultSave;
+                            removeModal = true;
                         }
                     }
                     break;

package/dist/types/dialogs.d.ts

@@ -27,6 +27,8 @@ export interface IModalInfo {
   processingDescription?: string | (() => string);
   el?: HTMLElement;
   managerId?: string;
+  pressEnterAsOk?: boolean;
+  pressEscAsCancel?: boolean;
   hostObject?: IHostObject;
   /**
    * Окно немодальное - это начит окно отображается поверх контента страницы и не ограничивает пользователя
@@ -95,32 +97,39 @@ export type ModalWindow = IModalWindow<IViewModel<number | string>>;
 export class Dialog {
   constructor(
     public title: string,
-    public content?: string
+    public content?: string,
+    public pressEnterAsOk?: boolean,
+    public pressEscAsCancel?: boolean,
+    public hostObject?: IHostObject
   ) {}
 }
 
 export class AlertDialog extends Dialog {
-  title: string;
-  text: string;
-  hostObject?: IHostObject;
-  constructor(data: { title: string; text: string; hostObject?: IHostObject });
+  constructor(data: {
+    title: string;
+    text: string;
+    pressEnterAsOk?: boolean;
+    pressEscAsCancel?: boolean;
+    hostObject?: IHostObject;
+  });
 }
 
 export class PromptDialog extends Dialog {
-  title: string;
   width?: string;
-  hostObject?: IHostObject;
-  constructor(data: { title: string; width?: string; hostObject?: IHostObject });
+  constructor(data: {
+    title: string;
+    width?: string;
+    pressEnterAsOk?: boolean;
+    pressEscAsCancel?: boolean;
+    hostObject?: IHostObject;
+  });
 }
 
 export class ConfirmDialog extends Dialog {
-  title: string;
-  text: string;
   okTitle?: string;
   cancelTitle?: string;
   okResult?: number | string | boolean;
   cancelResult?: number | string | boolean;
-  hostObject?: IHostObject;
   constructor(data: {
     title: string;
     text: string;
@@ -128,12 +137,13 @@ export class ConfirmDialog extends Dialog {
     cancelTitle?: string;
     okResult?: number | string | boolean;
     cancelResult?: number | string | boolean;
+    pressEnterAsOk?: boolean;
+    pressEscAsCancel?: boolean;
     hostObject?: IHostObject;
   });
 }
 
 export class InfoDialog extends Dialog {
-  title: string;
   component: string;
   componentProps: Record<string, unknown>;
   width?: string;
@@ -144,7 +154,6 @@ export class InfoDialog extends Dialog {
   hideFooter?: boolean;
   minimizable?: boolean;
   description?: string;
-  hostObject?: IHostObject;
   help?: boolean;
   constructor(data: {
     title: string;
@@ -158,13 +167,14 @@ export class InfoDialog extends Dialog {
     hideFooter?: boolean;
     minimizable?: boolean;
     description?: string;
+    pressEnterAsOk?: boolean;
+    pressEscAsCancel?: boolean;
     hostObject?: IHostObject;
     help?: boolean;
   });
 }
 
-export class SelectDialog<T> {
-  title: string;
+export class SelectDialog<T> extends Dialog {
   component: string;
   componentProps: {
     disabledItems: Array<T | number | string>;
@@ -189,7 +199,6 @@ export class SelectDialog<T> {
   selectAsOk?: boolean;
   okTitle?: string;
   cancelTitle?: string;
-  hostObject?: IHostObject;
   help?: boolean;
   constructor(data: {
     title: string;
@@ -210,19 +219,19 @@ export class SelectDialog<T> {
     selectAsOk?: boolean;
     okTitle?: string;
     cancelTitle?: string;
+    pressEnterAsOk?: boolean;
+    pressEscAsCancel?: boolean;
     hostObject?: IHostObject;
     help?: boolean;
   });
 }
 
-export class CreateEditDialog<T> {
-  title: string;
+export class CreateEditDialog<T> extends Dialog {
   component: string;
   componentProps: {
     model: T;
     [key: string]: unknown;
   };
-  hostObject?: IHostObject;
   loading?: boolean;
   fullHeight?: boolean;
   width?: string | number;
@@ -255,7 +264,6 @@ export class CreateEditDialog<T> {
       model: T;
       [key: string]: unknown;
     };
-    hostObject?: IHostObject;
     loading?: boolean;
     fullHeight?: boolean;
     width?: string | number;
@@ -280,6 +288,9 @@ export class CreateEditDialog<T> {
     noModal?: boolean;
     okTitle?: string;
     cancelTitle?: string;
+    pressEnterAsOk?: boolean;
+    pressEscAsCancel?: boolean;
+    hostObject?: IHostObject;
     help?: boolean;
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldmjs/ui",
-  "version": "1.0.85",
+  "version": "1.0.86",
   "description": "ldm ui",
   "main": "dist/index.js",
   "engines": {