github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-02 06:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 https://github.com/siyuan-note/siyuan/issues/14126

Browse Source
This commit is contained in:
Vanessa 2025-04-28 12:00:10 +08:00
parent 73fd05c3b3
commit 23fbf94e8a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/protyle/wysiwyg/keydown.ts
View File

@ -991,10 +991,10 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
// 代码块语言选择 https://github.com/siyuan-note/siyuan/issues/14126 // 代码块语言选择 https://github.com/siyuan-note/siyuan/issues/14126
if (matchHotKey("⌥↩", event) && selectText === "") { if (matchHotKey("⌥↩", event) && selectText === "") {
const selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select")); const selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectElements.length === 0 && nodeElement.classList.contains("code-block")) { if (selectElements.length === 0) {
selectElements.push(nodeElement); selectElements.push(nodeElement);
} }
if (selectElements.length > 0) { if (selectElements.length > 0 && !isIncludesHotKey("⌥↩")) {
const otherElement = selectElements.find(item => { const otherElement = selectElements.find(item => {
return !item.classList.contains("code-block"); return !item.classList.contains("code-block");
}); });
@ -1004,25 +1004,23 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
languageElements.push(item.querySelector(".protyle-action__language")); languageElements.push(item.querySelector(".protyle-action__language"));
}); });
protyle.toolbar.showCodeLanguage(protyle, languageElements); protyle.toolbar.showCodeLanguage(protyle, languageElements);
event.stopPropagation(); } else {
event.preventDefault(); addSubList(protyle, nodeElement, range);
return;
} }
}
}
// 回车
if (isNotCtrl(event) && event.key === "Enter") {
if (event.altKey) {
addSubList(protyle, nodeElement, range);
} else if (!event.shiftKey) {
enter(nodeElement, range, protyle);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
return; return;
} }
} }
// 回车
if (matchHotKey("↩", event)) {
enter(nodeElement, range, protyle);
event.stopPropagation();
event.preventDefault();
return;
}
if (matchHotKey("⌘A", event)) { if (matchHotKey("⌘A", event)) {
event.preventDefault(); event.preventDefault();
selectAll(protyle, nodeElement, range); selectAll(protyle, nodeElement, range);