From 3979a72d1673a9ac52498ebb32f3d5719cb23ff4 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Thu, 30 Nov 2023 16:03:26 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E7=A6=81=E6=AD=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E7=AD=BE=E6=A0=87=E9=A2=98=E5=9B=9E=E8=BD=A6?= =?UTF-8?q?=E5=92=8C=E8=BD=AF=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/protyle/wysiwyg/enter.ts | 4 ++++ app/src/protyle/wysiwyg/keydown.ts | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/protyle/wysiwyg/enter.ts b/app/src/protyle/wysiwyg/enter.ts index 530b49b70..74c2103fe 100644 --- a/app/src/protyle/wysiwyg/enter.ts +++ b/app/src/protyle/wysiwyg/enter.ts @@ -233,6 +233,10 @@ export const enter = (blockElement: HTMLElement, range: Range, protyle: IProtyle editableElement.querySelectorAll(".img--select").forEach(item => { item.classList.remove("img--select"); }); + // 数据库 + if (blockElement.getAttribute("data-type") === "NodeAttributeView") { + return true; + } // 代码块 const trimStartText = editableElement.innerHTML.trimStart(); if (trimStartText.startsWith("```") || trimStartText.startsWith("···") || trimStartText.startsWith("~~~") || diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts index 78836954c..5cded9039 100644 --- a/app/src/protyle/wysiwyg/keydown.ts +++ b/app/src/protyle/wysiwyg/keydown.ts @@ -935,11 +935,17 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { } // 回车 - if (!event.altKey && !event.shiftKey && isNotCtrl(event) && event.key === "Enter") { - event.stopPropagation(); - event.preventDefault(); - enter(nodeElement, range, protyle); - return; + if (!event.altKey && isNotCtrl(event) && event.key === "Enter") { + if (!event.shiftKey) { + enter(nodeElement, range, protyle); + event.stopPropagation(); + event.preventDefault(); + return; + } else if (nodeElement.getAttribute("data-type") === "NodeAttributeView") { + event.stopPropagation(); + event.preventDefault(); + return; + } } if (matchHotKey("⌘A", event)) {