Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-10-18 20:47:01 +08:00
parent 2dc9632930
commit 7528699fba
1 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
app/src/protyle/wysiwyg/index.ts
View file

@ -307,9 +307,6 @@ export class WYSIWYG {
html += getTextStar(item) + "\n\n"; html += getTextStar(item) + "\n\n";
} else { } else {
let itemHTML = ""; let itemHTML = "";
if (item.getAttribute("data-type") === "NodeListItem") {
listHTML = `<div data-subtype="${item.getAttribute("data-subtype")}" data-node-id="${Lute.NewNodeID()}" data-type="NodeList" class="list">`;
}
if (item.getAttribute("data-type") === "NodeHeading" && item.getAttribute("fold") === "1") { if (item.getAttribute("data-type") === "NodeHeading" && item.getAttribute("fold") === "1") {
needClipboardWrite = true; needClipboardWrite = true;
const response = await fetchSyncPost("/api/block/getHeadingChildrenDOM", { const response = await fetchSyncPost("/api/block/getHeadingChildrenDOM", {
@ -326,12 +323,18 @@ export class WYSIWYG {
} else { } else {
itemHTML = removeEmbed(item); itemHTML = removeEmbed(item);
} }
if (listHTML && (i === selectElements.length - 1 || if (item.getAttribute("data-type") === "NodeListItem") {
selectElements[i + 1].getAttribute("data-type") !== "NodeListItem" || if (!listHTML) {
selectElements[i + 1].getAttribute("data-subtype") !== item.getAttribute("data-subtype") listHTML = `<div data-subtype="${item.getAttribute("data-subtype")}" data-node-id="${Lute.NewNodeID()}" data-type="NodeList" class="list">`;
)) { }
html += `${listHTML}${itemHTML}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`; listHTML += itemHTML;
listHTML = ""; if (i === selectElements.length - 1 ||
selectElements[i + 1].getAttribute("data-type") !== "NodeListItem" ||
selectElements[i + 1].getAttribute("data-subtype") !== item.getAttribute("data-subtype")
) {
html += `${listHTML}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
listHTML = "";
}
} else { } else {
html += itemHTML; html += itemHTML;
} }
@ -1826,9 +1829,6 @@ export class WYSIWYG {
for (let i = 0; i < selectElements.length; i++) { for (let i = 0; i < selectElements.length; i++) {
const item = getTopAloneElement(selectElements[i]); const item = getTopAloneElement(selectElements[i]);
let itemHTML = ""; let itemHTML = "";
if (item.getAttribute("data-type") === "NodeListItem") {
listHTML = `<div data-subtype="${item.getAttribute("data-subtype")}" data-node-id="${Lute.NewNodeID()}" data-type="NodeList" class="list">`;
}
if (item.getAttribute("data-type") === "NodeHeading" && item.getAttribute("fold") === "1") { if (item.getAttribute("data-type") === "NodeHeading" && item.getAttribute("fold") === "1") {
needClipboardWrite = true; needClipboardWrite = true;
const response = await fetchSyncPost("/api/block/getHeadingChildrenDOM", { const response = await fetchSyncPost("/api/block/getHeadingChildrenDOM", {
@ -1845,12 +1845,18 @@ export class WYSIWYG {
} else { } else {
itemHTML = removeEmbed(item); itemHTML = removeEmbed(item);
} }
if (listHTML && (i === selectElements.length - 1 || if (item.getAttribute("data-type") === "NodeListItem") {
selectElements[i + 1].getAttribute("data-type") !== "NodeListItem" || if (!listHTML) {
selectElements[i + 1].getAttribute("data-subtype") !== item.getAttribute("data-subtype") listHTML = `<div data-subtype="${item.getAttribute("data-subtype")}" data-node-id="${Lute.NewNodeID()}" data-type="NodeList" class="list">`;
)) { }
html += `${listHTML}${itemHTML}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`; listHTML += itemHTML;
listHTML = ""; if (i === selectElements.length - 1 ||
selectElements[i + 1].getAttribute("data-type") !== "NodeListItem" ||
selectElements[i + 1].getAttribute("data-subtype") !== item.getAttribute("data-subtype")
) {
html += `${listHTML}<div class="protyle-attr" contenteditable="false">${Constants.ZWSP}</div></div>`;
listHTML = "";
}
} else { } else {
html += itemHTML; html += itemHTML;
} }