0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🐛 fix https://github.com/siyuan-note/siyuan/issues/11312

Browse source
This commit is contained in:
Vanessa 2024-05-11 10:50:22 +08:00
parent 46c9f35b84
commit d12451e90e
3 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/menus/protyle.ts
View file

@ -1935,7 +1935,7 @@ export const setFold = (protyle: IProtyle, nodeElement: Element, isOpen?: boolea
const id = nodeElement.getAttribute("data-node-id");
if (nodeElement.getAttribute("data-type") === "NodeHeading") {
if (hasFold) {
nodeElement.insertAdjacentHTML("beforeend", '<div spin="1" style="text-align: center"><img width="24px" src="/stage/loading-pure.svg"></div>');
nodeElement.insertAdjacentHTML("beforeend", '<div spin="1" style="text-align: center"><img width="24px" height="24px" src="/stage/loading-pure.svg"></div>');
transaction(protyle, [{
action: "unfoldHeading",
id,

23
app/src/protyle/wysiwyg/remove.ts
View file

@ -45,6 +45,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
let listElement: Element;
let topParentElement: Element;
hideElements(["select"], protyle);
let foldPreviousId: string
selectElements.find((item: HTMLElement) => {
const topElement = getTopAloneElement(item);
topParentElement = topElement.parentElement;
@ -74,13 +75,27 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
if (topElement.getAttribute("data-type") === "NodeHeading" && topElement.getAttribute("fold") === "1") {
// https://github.com/siyuan-note/siyuan/issues/2188
setFold(protyle, topElement, undefined, true);
let previousID = topElement.previousElementSibling ? topElement.previousElementSibling.getAttribute("data-node-id") : ""
if (typeof foldPreviousId !== "undefined") {
previousID = foldPreviousId;
}
inserts.push({
action: "insert",
data: topElement.outerHTML,
id,
previousID: selectElements[0].previousElementSibling ? selectElements[0].previousElementSibling.getAttribute("data-node-id") : "",
previousID: previousID,
parentID: topElement.parentElement.getAttribute("data-node-id") || protyle.block.parentID
});
// 折叠块和非折叠块同时删除时撤销异常 https://github.com/siyuan-note/siyuan/issues/11312
let foldPreviousElement = getPreviousBlock(topElement);
while (foldPreviousElement && foldPreviousElement.childElementCount === 3) {
foldPreviousElement = getPreviousBlock(foldPreviousElement);
}
if (foldPreviousElement) {
foldPreviousId = foldPreviousElement.getAttribute("data-node-id");
} else {
foldPreviousId = "";
}
// https://github.com/siyuan-note/siyuan/issues/4422
topElement.firstElementChild.removeAttribute("contenteditable");
// 在折叠标题后输入文字，然后全选删除再撤销会重建索引。因此不能删除折叠标题后新输入的输入折叠标题下的内容
@ -97,11 +112,15 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
if (topElement.classList.contains("render-node") || topElement.querySelector("div.render-node")) {
data = protyle.lute.SpinBlockDOM(topElement.outerHTML); // 防止图表撤销问题
}
let previousID = topElement.previousElementSibling ? topElement.previousElementSibling.getAttribute("data-node-id") : "";
if (typeof foldPreviousId !== "undefined") {
previousID = foldPreviousId;
}
inserts.push({
action: "insert",
data,
id,
previousID: topElement.previousElementSibling ? topElement.previousElementSibling.getAttribute("data-node-id") : "",
previousID,
parentID: topElement.parentElement.getAttribute("data-node-id") || protyle.block.parentID
});
if (topElement.getAttribute("data-subtype") === "o" && topElement.classList.contains("li")) {

15
app/src/protyle/wysiwyg/transaction.ts
View file

@ -297,6 +297,21 @@ const promiseTransaction = () => {
updateRef(protyle, operation.id);
}
});
// 删除仅有的折叠标题后展开内容为空
if (protyle.wysiwyg.element.childElementCount === 0) {
const newID = Lute.NewNodeID();
const emptyElement = genEmptyElement(false, true, newID);
protyle.wysiwyg.element.insertAdjacentElement("afterbegin", emptyElement);
transaction(protyle, [{
action: "insert",
data: emptyElement.outerHTML,
id: newID,
parentID: protyle.block.parentID
}]);
// 不能撤销，否则就无限循环了
focusByWbr(emptyElement, range);
}
});
};