From 199ffc62c76fdfa4096872854b85ccd30591e858 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 15 Apr 2024 15:00:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AB=E6=9C=89=E6=B0=B4=E5=8D=B0=E7=9A=84?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=9C=A8=E5=B5=8C=E5=85=A5=E7=BD=91?= =?UTF-8?q?=E9=A1=B5=E6=97=B6=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E9=83=A8=E5=88=86=E7=A9=BA=E7=99=BD=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/components/watermark/watermark.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/components/watermark/watermark.ts b/core/core-frontend/src/components/watermark/watermark.ts index 03024a00a3..bc541fd4a1 100644 --- a/core/core-frontend/src/components/watermark/watermark.ts +++ b/core/core-frontend/src/components/watermark/watermark.ts @@ -36,7 +36,7 @@ export function watermark(settings, domId) { page_width = page_width - cutWidth // 获取页面最大高度 let page_height = watermarkDom.scrollHeight - 56 - page_height = page_height < 400 ? 400 : page_height + page_height = page_height < 220 ? 220 : page_height // page_height = Math.max(page_height, window.innerHeight - 30) // 如果将水印列数设置为0，或水印列数设置过大，超过页面最大宽度，则重新计算水印列数和水印x轴间隔 if ( From 2da605e5c10df33d631208cd9fae87aba1657977 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 15 Apr 2024 15:09:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/assist-button/ColorButton.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/core-frontend/src/components/assist-button/ColorButton.vue b/core/core-frontend/src/components/assist-button/ColorButton.vue index 70b1f9e9fc..15a42f1be0 100644 --- a/core/core-frontend/src/components/assist-button/ColorButton.vue +++ b/core/core-frontend/src/components/assist-button/ColorButton.vue @@ -52,17 +52,17 @@ const colorButtonClick = () => { padding-left: 5px; padding-top: 5px; &:hover { - padding-left: 4px; - padding-top: 4px; - border-width: 2px; + padding-left: 5px; + padding-top: 5px; + border-width: 1px; border-color: var(--ed-color-primary-99, #3370ff99); } } .color-button-active { - padding-left: 4px; - padding-top: 4px; - border-width: 2px; - border-color: var(--ed-color-primary); + padding-left: 5px; + padding-top: 5px; + border-width: 1px; + border-color: var(--ed-color-primary) !important; } .color-button-inner { From 7acb8b09efb483282695c6431de78426a2df48d8 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 15 Apr 2024 18:10:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E6=8C=89=E9=94=AE?= =?UTF-8?q?=E5=92=8C=E5=9C=B0=E5=9B=BE=E5=86=85=E9=83=A8=E4=BD=8D=E7=A7=BB?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/DeShortcutKey.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/core/core-frontend/src/utils/DeShortcutKey.ts b/core/core-frontend/src/utils/DeShortcutKey.ts index b202a77d14..f1bef64f21 100644 --- a/core/core-frontend/src/utils/DeShortcutKey.ts +++ b/core/core-frontend/src/utils/DeShortcutKey.ts @@ -106,6 +106,7 @@ export function listenGlobalKeyDown() { if (positionMoveKey[keyCode] && curComponent.value) { positionMoveKey[keyCode](keyCode) e.preventDefault() + e.stopPropagation() } else if (keyCode === shiftKey) { isShiftDown = true composeStore.setIsShiftDownStatus(true)