Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-15 11:38:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2025-02-17 12:27:28 +08:00
parent 2a4531194c
commit 476b3a8467
2 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/protyle/util/insertHTML.ts
View file

@ -309,6 +309,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
if (!blockElement) {
return;
}
if (blockElement.classList.contains("av")) {
range.deleteContents();
processAV(range, html, protyle, blockElement as HTMLElement);
@ -318,15 +319,17 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
processTable(range, html, protyle, blockElement)) {
return;
}
let id = blockElement.getAttribute("data-node-id");
range.insertNode(document.createElement("wbr"));
let oldHTML = blockElement.outerHTML;
const isNodeCodeBlock = blockElement.getAttribute("data-type") === "NodeCodeBlock";
const editableElement = getContenteditableElement(blockElement);
if (!isBlock &&
(isNodeCodeBlock || protyle.toolbar.getCurrentType(range).includes("code"))) {
range.deleteContents();
// 代码块需保持至少一个 \n https://github.com/siyuan-note/siyuan/pull/13271#issuecomment-2502672155
if (isNodeCodeBlock && getContenteditableElement(blockElement).textContent === "") {
if (isNodeCodeBlock && editableElement.textContent === "") {
html += "\n";
}
range.insertNode(document.createTextNode(html.replace(/\r\n|\r|\u2028|\u2029/g, "\n")));
@ -385,10 +388,18 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,
innerHTML = innerHTML.replace(/;;;lt;;;/g, "<").replace(/;;;gt;;;/g, ">");
tempElement.innerHTML = innerHTML;
const editableElement = getContenteditableElement(blockElement);
// https://github.com/siyuan-note/siyuan/issues/14114
let heading2text = false;
if (isBlock && editableElement.textContent.replace(Constants.ZWSP, "") !== "" && tempElement.content.childElementCount === 1 &&
tempElement.content.firstChild.nodeType !== 3 &&
tempElement.content.firstElementChild.getAttribute("data-type") === "NodeHeading") {
isBlock = false;
heading2text = true
}
// 使用 lute 方法会添加 p 元素，只有一个 p 元素或者只有一个字符串或者为 <u>b</u> 时的时候只拷贝内部
if (!isBlock) {
if (tempElement.content.firstChild.nodeType === 3 ||
if (tempElement.content.firstChild.nodeType === 3 || heading2text ||
(tempElement.content.firstChild.nodeType !== 3 &&
((tempElement.content.firstElementChild.classList.contains("p") && tempElement.content.childElementCount === 1) ||
tempElement.content.firstElementChild.tagName !== "DIV"))) {