From 1bf898e84d56df3be75debd6bfe8b40370f408e3 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 7 Nov 2023 10:54:17 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/9587 --- app/src/assets/scss/business/_block.scss | 1 + app/src/dialog/moveResize.ts | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/app/src/assets/scss/business/_block.scss b/app/src/assets/scss/business/_block.scss index 76e8c45a9..3b142c8c3 100644 --- a/app/src/assets/scss/business/_block.scss +++ b/app/src/assets/scss/business/_block.scss @@ -14,6 +14,7 @@ min-height: 197px; z-index: -1; border: 1px solid var(--b3-theme-surface-lighter); + max-width: 1024px; &--open { opacity: 1; diff --git a/app/src/dialog/moveResize.ts b/app/src/dialog/moveResize.ts index 3b2bf661b..94ed4919c 100644 --- a/app/src/dialog/moveResize.ts +++ b/app/src/dialog/moveResize.ts @@ -63,6 +63,7 @@ export const moveResize = (element: HTMLElement, afterCB?: (type: string) => voi if (type === "r" && moveEvent.clientX - x + width > 200 && moveEvent.clientX - x + width < window.innerWidth) { element.style.width = moveEvent.clientX - x + width + "px"; + element.style.maxWidth = "none"; } else if (type === "d" && moveEvent.clientY - y + height > 160 && moveEvent.clientY - y + height < window.innerHeight - Constants.SIZE_TOOLBAR_HEIGHT) { element.style.height = moveEvent.clientY - y + height + "px"; @@ -76,11 +77,13 @@ export const moveResize = (element: HTMLElement, afterCB?: (type: string) => voi moveEvent.clientX > 0 && x - moveEvent.clientX + width > 200) { element.style.left = moveEvent.clientX + "px"; element.style.width = (x - moveEvent.clientX + width) + "px"; + element.style.maxWidth = "none"; } else if (type === "rd" && moveEvent.clientX - x + width > 200 && moveEvent.clientX - x + width < window.innerWidth && moveEvent.clientY - y + height > 160 && moveEvent.clientY - y + height < window.innerHeight - Constants.SIZE_TOOLBAR_HEIGHT) { element.style.height = moveEvent.clientY - y + height + "px"; element.style.maxHeight = ""; + element.style.maxWidth = "none"; element.style.width = moveEvent.clientX - x + width + "px"; } else if (type === "rt" && moveEvent.clientX - x + width > 200 && moveEvent.clientX - x + width < window.innerWidth && @@ -88,6 +91,7 @@ export const moveResize = (element: HTMLElement, afterCB?: (type: string) => voi element.style.width = moveEvent.clientX - x + width + "px"; element.style.top = moveEvent.clientY + "px"; element.style.maxHeight = ""; + element.style.maxWidth = "none"; element.style.height = (y - moveEvent.clientY + height) + "px"; } else if (type === "lt" && moveEvent.clientX > 0 && x - moveEvent.clientX + width > 200 && @@ -96,6 +100,7 @@ export const moveResize = (element: HTMLElement, afterCB?: (type: string) => voi element.style.width = (x - moveEvent.clientX + width) + "px"; element.style.top = moveEvent.clientY + "px"; element.style.maxHeight = ""; + element.style.maxWidth = "none"; element.style.height = (y - moveEvent.clientY + height) + "px"; } else if (type === "ld" && moveEvent.clientX > 0 && x - moveEvent.clientX + width > 200 && @@ -104,6 +109,7 @@ export const moveResize = (element: HTMLElement, afterCB?: (type: string) => voi element.style.width = (x - moveEvent.clientX + width) + "px"; element.style.height = moveEvent.clientY - y + height + "px"; element.style.maxHeight = ""; + element.style.maxWidth = "none"; } } };