From 567df515208c4ae997311c110e58f05c0c32fae0 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 12 Dec 2023 14:07:54 +0600 Subject: [PATCH] fix(#5228): attach menu to modals wrapper --- .../canopsis-next/src/bootstrap/plugins.js | 4 ++ .../plugins/modals/components/the-modals.vue | 46 +++++++++++-------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js b/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js index 4fa394c060..b5cef24d5e 100644 --- a/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js +++ b/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js @@ -64,6 +64,7 @@ export const bootstrapApplicationPlugins = (Vue) => { offsetX: true, maxWidth: 500, openOnHover: true, + attach: '.modals-wrapper', }, }, dsCalendarEvent: { @@ -71,6 +72,7 @@ export const bootstrapApplicationPlugins = (Vue) => { offsetY: true, openOnHover: true, transition: 'fade-transition', + attach: '.modals-wrapper', }, }, dsCalendarEventPlaceholder: { @@ -78,12 +80,14 @@ export const bootstrapApplicationPlugins = (Vue) => { offsetY: true, openOnHover: true, transition: 'fade-transition', + attach: '.modals-wrapper', }, }, dsCalendarEventTimePlaceholder: { popoverProps: { openOnHover: true, transition: 'fade-transition', + attach: '.modals-wrapper', }, }, }, diff --git a/community/sources/webcore/src/canopsis-next/src/plugins/modals/components/the-modals.vue b/community/sources/webcore/src/canopsis-next/src/plugins/modals/components/the-modals.vue index e037838db3..d7e143011a 100644 --- a/community/sources/webcore/src/canopsis-next/src/plugins/modals/components/the-modals.vue +++ b/community/sources/webcore/src/canopsis-next/src/plugins/modals/components/the-modals.vue @@ -49,30 +49,36 @@ $minimizedDialogMaxWidth: 360px; align-content: flex-start; z-index: 300; - & ::v-deep .v-dialog__content { - &--minimized { - margin: 8px 8px 0 8px; - position: relative; - height: auto; - max-width: $minimizedDialogMaxWidth; - pointer-events: all; - z-index: inherit !important; + & ::v-deep { + .v-menu__content { + pointer-events: auto; + } - .v-dialog { - margin: 0; - box-shadow: none; - transition: none; + .v-dialog__content { + &--minimized { + margin: 8px 8px 0 8px; + position: relative; + height: auto; + max-width: $minimizedDialogMaxWidth; + pointer-events: all; + z-index: inherit !important; - .v-card { - &.fill-min-height { - min-height: auto; - } + .v-dialog { + margin: 0; + box-shadow: none; + transition: none; + + .v-card { + &.fill-min-height { + min-height: auto; + } - &__title { - padding: 0 10px; + &__title { + padding: 0 10px; - .headline { - font-size: 16px !important; + .headline { + font-size: 16px !important; + } } } }