From 5f15f6bb7e7bc0f900a31656b2018054b56efac5 Mon Sep 17 00:00:00 2001 From: Dmytro Lukashenko Date: Tue, 22 Aug 2023 10:37:58 +0300 Subject: [PATCH 1/3] fix: fix getComputedStyle error --- components/lib/dialog/Dialog.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue index bc4ac172e..ebfde1dba 100755 --- a/components/lib/dialog/Dialog.vue +++ b/components/lib/dialog/Dialog.vue @@ -322,24 +322,27 @@ export default { let leftPos = offset.left + deltaX; let topPos = offset.top + deltaY; let viewport = DomHandler.getViewport(); + let containerComputedStyle = getComputedStyle(this.container) + let marginLeft = parseFloat(containerComputedStyle.marginLeft); + let marginTop = parseFloat(containerComputedStyle.marginTop); this.container.style.position = 'fixed'; if (this.keepInViewport) { if (leftPos >= this.minX && leftPos + width < viewport.width) { this.lastPageX = event.pageX; - this.container.style.left = leftPos + 'px'; + this.container.style.left = (leftPos - marginLeft) + 'px'; } if (topPos >= this.minY && topPos + height < viewport.height) { this.lastPageY = event.pageY; - this.container.style.top = topPos + 'px'; + this.container.style.top = (topPos - marginTop) + 'px'; } } else { this.lastPageX = event.pageX; - this.container.style.left = leftPos + 'px'; + this.container.style.left = (leftPos - marginLeft) + 'px'; this.lastPageY = event.pageY; - this.container.style.top = topPos + 'px'; + this.container.style.top = (topPos - marginTop) + 'px'; } } }; @@ -369,7 +372,7 @@ export default { window.document.removeEventListener('mouseup', this.documentDragEndListener); this.documentDragEndListener = null; } - } + }, }, computed: { maximizeIconComponent() { From bb213cb9dfad51d75a411c12d2f871f1ff3c151d Mon Sep 17 00:00:00 2001 From: Dmytro Lukashenko Date: Tue, 22 Aug 2023 14:32:39 +0300 Subject: [PATCH 2/3] fix: fix error after merge conflict resolving --- components/lib/dialog/Dialog.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue index 42e5e3226..1000f52d3 100755 --- a/components/lib/dialog/Dialog.vue +++ b/components/lib/dialog/Dialog.vue @@ -338,6 +338,7 @@ export default { if (topPos >= this.minY && topPos + height < viewport.height) { this.lastPageY = event.pageY; this.container.style.top = topPos - marginTop + 'px'; + } } else { this.lastPageX = event.pageX; this.container.style.left = leftPos - marginLeft + 'px'; From 4dce22f9b3de19e1a1052e6b3c416cea8195ed8d Mon Sep 17 00:00:00 2001 From: Dmytro Lukashenko Date: Tue, 22 Aug 2023 14:41:15 +0300 Subject: [PATCH 3/3] fix: fix prettier format --- components/lib/dialog/Dialog.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue index 1000f52d3..986fb1ddb 100755 --- a/components/lib/dialog/Dialog.vue +++ b/components/lib/dialog/Dialog.vue @@ -336,7 +336,7 @@ export default { } if (topPos >= this.minY && topPos + height < viewport.height) { - this.lastPageY = event.pageY; + this.lastPageY = event.pageY; this.container.style.top = topPos - marginTop + 'px'; } } else { @@ -373,7 +373,7 @@ export default { window.document.removeEventListener('mouseup', this.documentDragEndListener); this.documentDragEndListener = null; } - }, + } }, computed: { maximizeIconComponent() {