@ldmjs/ui 1.0.39 → 1.0.41

package/dist/index.d.ts

@@ -149,6 +149,7 @@ export declare const ValidateMixinOptions: Record<string, any>;
 
 export declare class DialogManager {
   static exec<T>(modal: Dialog, fetchData?: () => Promise<any>): Promise<T>;
+  static id: (value: string) => DialogManager
 }
 
 declare const ldmui: {

package/dist/index.js

@@ -11263,14 +11263,17 @@ let SelectListBoxComponent = class SelectListBoxComponent extends (0,external_vu
     emitClick() {
         return true;
     }
-    async onValueChanged(value) {
+    async onValueChanged(value, oldValue) {
         if (!this.$utils.isDefined(value)) {
             if (this.hasSelected) {
                 this.clear();
             }
             return;
         }
-        let val = this.toArray(value);
+        if (this.$utils.isDefined(value) && this.$utils.isDefined(oldValue) && lodash_es_isEqual(value, oldValue)) {
+            return;
+        }
+        let val = Array.from(new Set(this.toArray(value)));
         if (lodash_es_isEqual(val, this.selectedIds)) {
             return;
         }
@@ -11642,7 +11645,7 @@ ld_select_list_boxvue_type_script_lang_ts_external_decorate([
 ld_select_list_boxvue_type_script_lang_ts_external_decorate([
     (0,external_vue_property_decorator_.Watch)('modelValue', { immediate: true }),
     ld_select_list_boxvue_type_script_lang_ts_external_metadata("design:type", Function),
-    ld_select_list_boxvue_type_script_lang_ts_external_metadata("design:paramtypes", [Object]),
+    ld_select_list_boxvue_type_script_lang_ts_external_metadata("design:paramtypes", [Object, Object]),
     ld_select_list_boxvue_type_script_lang_ts_external_metadata("design:returntype", Promise)
 ], SelectListBoxComponent.prototype, "onValueChanged", null);
 ld_select_list_boxvue_type_script_lang_ts_external_decorate([
@@ -11825,8 +11828,6 @@ class CheckboxComponent extends (0,external_vue_property_decorator_.mixins)(Inpu
         return value;
     }
     onValueChanged() {
-        /* eslint-disable no-console */
-        console.log('onValueChanged!!!');
         if (this.modelValue === this.internalValue) {
             return;
         }
@@ -11852,8 +11853,6 @@ class CheckboxComponent extends (0,external_vue_property_decorator_.mixins)(Inpu
         }
     }
     onChange(event) {
-        /* eslint-disable no-console */
-        console.log('onChange!!!');
         const checked = event.target.checked;
         if (this.$utils.isDefined(this.checkedValue) && this.$utils.isDefined(this.uncheckedValue)) {
             this.fireinputEvent(checked ? this.checkedValue : this.uncheckedValue);
@@ -15492,10 +15491,10 @@ function ld_switch_reg(vue, options) {
 }
 /* harmony default export */ const src_ld_switch = (ld_switch_reg);
 
-;// CONCATENATED MODULE: ./node_modules/ts-loader/index.js??clonedRuleSet-1.use!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use!./src/ld-dialog/ld-dialog.vue?vue&type=template&id=184339ee&ts=true
+;// CONCATENATED MODULE: ./node_modules/ts-loader/index.js??clonedRuleSet-1.use!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use!./src/ld-dialog/ld-dialog.vue?vue&type=template&id=a2e3c6ee&ts=true
 
-const ld_dialogvue_type_template_id_184339ee_ts_true_hoisted_1 = { class: "ld-dialog" };
-function ld_dialogvue_type_template_id_184339ee_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+const ld_dialogvue_type_template_id_a2e3c6ee_ts_true_hoisted_1 = { class: "ld-dialog" };
+function ld_dialogvue_type_template_id_a2e3c6ee_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_minimized = (0,external_vue_.resolveComponent)("minimized");
     const _component_v_spacer = (0,external_vue_.resolveComponent)("v-spacer");
     const _component_square_button = (0,external_vue_.resolveComponent)("square-button");
@@ -15505,13 +15504,14 @@ function ld_dialogvue_type_template_id_184339ee_ts_true_render(_ctx, _cache, $pr
     const _component_v_card_actions = (0,external_vue_.resolveComponent)("v-card-actions");
     const _component_v_card = (0,external_vue_.resolveComponent)("v-card");
     const _component_v_dialog = (0,external_vue_.resolveComponent)("v-dialog");
-    return ((0,external_vue_.openBlock)(), (0,external_vue_.createElementBlock)("div", ld_dialogvue_type_template_id_184339ee_ts_true_hoisted_1, [
+    return ((0,external_vue_.openBlock)(), (0,external_vue_.createElementBlock)("div", ld_dialogvue_type_template_id_a2e3c6ee_ts_true_hoisted_1, [
         (0,external_vue_.createVNode)(_component_minimized, {
+            id: _ctx.id,
             dialogs: _ctx.minimized,
             onMaximize: _cache[0] || (_cache[0] = ($event) => (_ctx.onMinimize($event))),
             onClose: _cache[1] || (_cache[1] = ($event) => (_ctx.handleCancel($event))),
             onCloseAll: _ctx.handleCancelAll
-        }, null, 8, ["dialogs", "onCloseAll"]),
+        }, null, 8, ["id", "dialogs", "onCloseAll"]),
         (0,external_vue_.createTextVNode)(),
         ((0,external_vue_.openBlock)(true), (0,external_vue_.createElementBlock)(external_vue_.Fragment, null, (0,external_vue_.renderList)(_ctx.modals, (modal) => {
             return ((0,external_vue_.openBlock)(), (0,external_vue_.createElementBlock)("div", {
@@ -15739,7 +15739,7 @@ function ld_dialogvue_type_template_id_184339ee_ts_true_render(_ctx, _cache, $pr
     ]));
 }
 
-;// CONCATENATED MODULE: ./src/ld-dialog/ld-dialog.vue?vue&type=template&id=184339ee&ts=true
+;// CONCATENATED MODULE: ./src/ld-dialog/ld-dialog.vue?vue&type=template&id=a2e3c6ee&ts=true
 
 // EXTERNAL MODULE: ./node_modules/@ldmjs/core/dist/index.js
 var dist = __webpack_require__(634);
@@ -15764,23 +15764,6 @@ const GAP = 17;
 const MARGIN_RIGHT = 25;
 const MARGIN_BOTTOM = 68;
 class DialogManager {
-    static exec(modal, fetchData) {
-        switch (modal.constructor.name) {
-            case 'AlertDialog':
-                return DialogManager.alert(modal);
-            case 'PromptDialog':
-                return DialogManager.prompt(modal);
-            case 'ConfirmDialog':
-                return DialogManager.confirm(modal);
-            case 'InfoDialog':
-                return DialogManager.info(modal, fetchData);
-            case 'SelectDialog':
-                return DialogManager.select(modal, fetchData);
-            case 'CreateEditDialog':
-                return DialogManager.createEdit(modal, fetchData);
-        }
-        return null;
-    }
     constructor() {
         this._visibled = [];
         this._minimized = [];
@@ -16020,18 +16003,43 @@ class DialogManager {
     uniqKey(info) {
         return `dlg-${info.id}`;
     }
+    static id(value) {
+        DialogManager._id = value;
+        return DialogManager;
+    }
+    static exec(modal, fetchData) {
+        switch (modal.constructor.name) {
+            case 'AlertDialog':
+                return DialogManager.alert(modal);
+            case 'PromptDialog':
+                return DialogManager.prompt(modal);
+            case 'ConfirmDialog':
+                return DialogManager.confirm(modal);
+            case 'InfoDialog':
+                return DialogManager.info(modal, fetchData);
+            case 'SelectDialog':
+                return DialogManager.select(modal, fetchData);
+            case 'CreateEditDialog':
+                return DialogManager.createEdit(modal, fetchData);
+        }
+        return null;
+    }
     static alert(modal) {
         const modalInfo = {
             title: modal.title,
             content: modal.content,
             type: ModalType.Alert,
+            hostObject: modal.hostObject,
+            managerId: DialogManager._id,
         };
         return DialogManager.execAsync(modalInfo);
     }
     static prompt(modal) {
         const modalInfo = {
             ...modal,
-            type: ModalType.Prompt
+            type: ModalType.Prompt,
+            hostObject: modal.hostObject,
+            managerId: DialogManager._id
         };
         return DialogManager.execAsync(modalInfo);
     }
@@ -16041,6 +16049,8 @@ class DialogManager {
             content: modal.text,
             type: ModalType.Confirm,
             closable: true,
+            hostObject: modal.hostObject,
+            managerId: DialogManager._id
         };
         return DialogManager.execAsync(modalInfo);
     }
@@ -16048,6 +16058,7 @@ class DialogManager {
         const modalInfo = {
             ...modal,
             type: ModalType.Info,
+            managerId: DialogManager._id
         };
         if (!modalInfo.hostObject) {
             modalInfo.hostObject = {
@@ -16062,6 +16073,7 @@ class DialogManager {
         const modalInfo = {
             ...modal,
             type: ModalType.Select,
+            managerId: DialogManager._id
         };
         if (!modalInfo.hostObject) {
             modalInfo.hostObject = {
@@ -16076,6 +16088,7 @@ class DialogManager {
         const modalInfo = {
             ...modal,
             type: ModalType.CreateEdit,
+            managerId: DialogManager._id
         };
         if (!modalInfo.hostObject) {
             modalInfo.hostObject = {
@@ -16090,22 +16103,24 @@ class DialogManager {
         return new Promise(resolve => {
             modalInfo.resolveFunction = resolve;
             let fetchProps = null;
+            const managerId = modalInfo.managerId || '';
             if (fetchData instanceof Function) {
                 fetchProps = async (host) => {
                     if (host.id === modalInfo.hostObject.id) {
                         if (fetchData instanceof Function) {
                             const props = await fetchData();
-                            dist.eventBus.$off('dialog:created', fetchProps);
-                            dist.eventBus.$emit('dialog:props', props, modalInfo.hostObject);
+                            dist.eventBus.$off('dialog:created' + managerId, fetchProps);
+                            dist.eventBus.$emit('dialog:props' + managerId, props, modalInfo.hostObject);
                         }
                     }
                 };
-                dist.eventBus.$on('dialog:created', fetchProps);
+                dist.eventBus.$on('dialog:created' + managerId, fetchProps);
             }
-            dist.eventBus.$emit('dialog:open', modalInfo);
+            dist.eventBus.$emit('dialog:open' + managerId, modalInfo);
         });
     }
 }
+DialogManager._id = '';
 
 ;// CONCATENATED MODULE: ./node_modules/ts-loader/index.js??clonedRuleSet-1.use!./node_modules/vue-loader/dist/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use!./src/ld-dialog/dialog.minimized.vue?vue&type=template&id=719819aa&ts=true
 
@@ -16328,10 +16343,10 @@ var dialog_minimizedvue_type_script_lang_ts_external_a;
 let DialogMinimizedComponent = class DialogMinimizedComponent extends external_vue_property_decorator_.Vue {
     created() {
         this.maximizeHandler = this.onMaximize.bind(this);
-        dist.eventBus.$on('modal-maximize', this.maximizeHandler);
+        dist.eventBus.$on('modal-maximize' + this.id, this.maximizeHandler);
     }
     beforeUnmount() {
-        dist.eventBus.$off('modal-maximize', this.maximizeHandler);
+        dist.eventBus.$off('modal-maximize' + this.id, this.maximizeHandler);
     }
     onMaximize(item) {
         const dlg = this.dialogs.find(d => d.id === item.id);
@@ -16364,6 +16379,10 @@ let DialogMinimizedComponent = class DialogMinimizedComponent extends external_v
         return this.items.length && this.items.length < 5;
     }
 };
+dialog_minimizedvue_type_script_lang_ts_external_decorate([
+    (0,external_vue_property_decorator_.Prop)({ type: String, default: '' }),
+    dialog_minimizedvue_type_script_lang_ts_external_metadata("design:type", String)
+], DialogMinimizedComponent.prototype, "id", void 0);
 dialog_minimizedvue_type_script_lang_ts_external_decorate([
     (0,external_vue_property_decorator_.Prop)(),
     dialog_minimizedvue_type_script_lang_ts_external_metadata("design:type", typeof (dialog_minimizedvue_type_script_lang_ts_external_a = typeof Array !== "undefined" && Array) === "function" ? dialog_minimizedvue_type_script_lang_ts_external_a : Object)
@@ -16401,13 +16420,14 @@ class Dialog {
 class AlertDialog extends Dialog {
     constructor(data) {
         super(data.title, data.text);
+        this.hostObject = data.hostObject;
     }
 }
 class PromptDialog extends Dialog {
     constructor(data) {
         super(data.title, data.content);
-        this.title = data.title;
         this.width = data.width || '60%';
+        this.hostObject = data.hostObject;
     }
 }
 class ConfirmDialog extends Dialog {
@@ -16419,6 +16439,7 @@ class ConfirmDialog extends Dialog {
         this.cancelTitle = data.cancelTitle;
         this.okResult = data.okResult;
         this.cancelResult = data.cancelResult;
+        this.hostObject = data.hostObject;
     }
     ;
 }
@@ -16449,6 +16470,9 @@ class SelectDialog {
         this.width = data.width;
         this.height = data.height;
         this.selectAsOk = data.selectAsOk;
+        this.okTitle = data.okTitle;
+        this.cancelTitle = data.cancelTitle;
+        this.hostObject = data.hostObject;
     }
 }
 class CreateEditDialog {
@@ -16529,15 +16553,15 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
     }
     mounted() {
         this.$nextTick(() => {
-            dist.eventBus.$on('dialog:open', this.open);
-            dist.eventBus.$on('dialog:props', this.onSetProps);
-            dist.eventBus.$on('dialog:close:all', this.closeAll);
+            dist.eventBus.$on('dialog:open' + this.id, this.open);
+            dist.eventBus.$on('dialog:props' + this.id, this.onSetProps);
+            dist.eventBus.$on('dialog:close:all' + this.id, this.closeAll);
         });
     }
     beforeUnmount() {
-        dist.eventBus.$off('dialog:open', this.open);
-        dist.eventBus.$off('dialog:props', this.onSetProps);
-        dist.eventBus.$off('dialog:close:all', this.closeAll);
+        dist.eventBus.$off('dialog:open' + this.id, this.open);
+        dist.eventBus.$off('dialog:props' + this.id, this.onSetProps);
+        dist.eventBus.$off('dialog:close:all' + this.id, this.closeAll);
     }
     async open(modalInfo) {
         if (modalInfo.hostObject) {
@@ -16643,7 +16667,7 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
                     }
                 }
                 this.dialogManager.dialogCreated(modal);
-                dist.eventBus.$emit('dialog:created', modal.hostObject);
+                dist.eventBus.$emit('dialog:created' + this.id, modal.hostObject);
             }
         }, 100);
     }
@@ -16651,6 +16675,9 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
         const result = [
             `${this.uniqKey(modal)} ${ModalType[modal.type]}`
         ];
+        if (this.id) {
+            result.push(`${ModalType[modal.type]}-${this.id}`);
+        }
         if (this.isMobileGlobal) {
             return result;
         }
@@ -16806,7 +16833,7 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
             if (!modal.show) {
                 this.remove(modal);
                 this.listenerMap.remove(modal);
-                dist.eventBus.$emit('modal-cancel');
+                dist.eventBus.$emit('modal-cancel' + this.id);
             }
         }
     }
@@ -16877,7 +16904,7 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
     onMinimize(modal) {
         modal.minimized = !modal.minimized;
         this.dialogManager.dialogMinimizeChanged(modal);
-        dist.eventBus.$emit('on-minimize', modal.minimized);
+        dist.eventBus.$emit('on-minimize' + this.id, modal.minimized);
     }
     onActivate(modal) {
         modal.processingDescription = null;
@@ -17034,6 +17061,10 @@ let DialogComponent = class DialogComponent extends (0,external_vue_class_compon
         };
     }
 };
+ld_dialogvue_type_script_lang_ts_external_decorate([
+    (0,external_vue_property_decorator_.Prop)({ type: String, default: '' }),
+    ld_dialogvue_type_script_lang_ts_external_metadata("design:type", String)
+], DialogComponent.prototype, "id", void 0);
 ld_dialogvue_type_script_lang_ts_external_decorate([
     Emit('modal-in-focus'),
     ld_dialogvue_type_script_lang_ts_external_metadata("design:type", Function),
@@ -17063,7 +17094,7 @@ DialogComponent = ld_dialogvue_type_script_lang_ts_external_decorate([
 
 
 ;
-const ld_dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ld_dialogvue_type_script_lang_ts_external, [['render',ld_dialogvue_type_template_id_184339ee_ts_true_render]])
+const ld_dialog_exports_ = /*#__PURE__*/(0,exportHelper/* default */.A)(ld_dialogvue_type_script_lang_ts_external, [['render',ld_dialogvue_type_template_id_a2e3c6ee_ts_true_render]])
 
 /* harmony default export */ const ld_dialog = (ld_dialog_exports_);
 ;// CONCATENATED MODULE: ./src/ld-dialog/index.ts

package/dist/types/dialogs.d.ts

@@ -26,6 +26,7 @@ export interface IModalInfo {
   description?: string | (() => string);
   processingDescription?: string | (() => string);
   el?: HTMLElement;
+  managerId?: string;
   hostObject?: IHostObject;
   /**
    * Окно немодальное - это начит окно отображается поверх контента страницы и не ограничивает пользователя
@@ -94,13 +95,17 @@ export class Dialog {
 }
 
 export class AlertDialog extends Dialog {
-  constructor(data: { title: string; text: string });
+  title: string;
+  text: string;
+  hostObject?: IHostObject;
+  constructor(data: { title: string; text: string; hostObject?: IHostObject });
 }
 
 export class PromptDialog extends Dialog {
   title: string;
   width?: string;
-  constructor(data: { title: string; width?: string });
+  hostObject?: IHostObject;
+  constructor(data: { title: string; width?: string; hostObject?: IHostObject; });
 }
 
 export class ConfirmDialog extends Dialog {
@@ -110,6 +115,7 @@ export class ConfirmDialog extends Dialog {
   cancelTitle?: string;
   okResult?: number | string | boolean;
   cancelResult?: number | string | boolean;
+  hostObject?: IHostObject;
   constructor(data: {
     title: string;
     text: string;
@@ -117,6 +123,7 @@ export class ConfirmDialog extends Dialog {
     cancelTitle?: string;
     okResult?: number | string | boolean;
     cancelResult?: number | string | boolean;
+    hostObject?: IHostObject;
   });
 }
 
@@ -132,6 +139,7 @@ export class InfoDialog extends Dialog {
   hideFooter?: boolean;
   minimizable?: boolean;
   description?: string;
+  hostObject?: IHostObject;
   constructor(data: {
     title: string;
     component: string;
@@ -144,6 +152,7 @@ export class InfoDialog extends Dialog {
     hideFooter?: boolean;
     minimizable?: boolean;
     description?: string;
+    hostObject?: IHostObject;
   });
 }
 
@@ -171,6 +180,9 @@ export class SelectDialog<T> {
   width?: string | number;
   height?: string | number;
   selectAsOk?: boolean;
+  okTitle?: string;
+  cancelTitle?: string;
+  hostObject?: IHostObject;
   constructor(data: {
     title: string;
     component: string;
@@ -188,6 +200,7 @@ export class SelectDialog<T> {
     width?: string | number;
     height?: string | number;
     selectAsOk?: boolean;
+    hostObject?: IHostObject;
   });
 }
 

package/package.json

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