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

🎨

Browse source 
https://ld246.com/article/1653490331030?r=88250
This commit is contained in:
Vanessa 2022-05-28 12:17:18 +08:00
parent 75f50c6d0a
commit e92c8e95c9
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,7 +185,7 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
topElementId = topElement.getAttribute("data-node-id");
if (topElement.parentElement.classList.contains("protyle-wysiwyg") && topElement.getAttribute("data-type") === "NodeListItem") {
// 缩放后列表项不能全选删除
return;
return true;
}
const id = topElement.getAttribute("data-node-id");
deletes.push({
@ -235,24 +235,25 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
topElement.remove();
}
});
if ((sideElement.classList.contains("protyle-wysiwyg") && protyle.wysiwyg.element.childElementCount === 0) ||
((sideElement.classList.contains("bq") || sideElement.classList.contains("sb")) && sideElement.childElementCount === 1)) {
const emptyElement = genEmptyElement(false, true, topElementId);
sideElement.insertAdjacentElement("afterbegin", emptyElement);
deletes.push({
action: "insert",
data: emptyElement.outerHTML,
id: topElementId,
parentID: sideElement.getAttribute("data-node-id") || protyle.block.parentID
});
inserts.push({
action: "delete",
id: topElementId,
});
sideElement = undefined;
focusByWbr(emptyElement, range);
}
if (sideElement) {
if ((sideElement.classList.contains("protyle-wysiwyg") && protyle.wysiwyg.element.childElementCount === 0) ||
((sideElement.classList.contains("bq") || sideElement.classList.contains("sb")) && sideElement.childElementCount === 1)) {
const emptyElement = genEmptyElement(false, true, topElementId);
sideElement.insertAdjacentElement("afterbegin", emptyElement);
deletes.push({
action: "insert",
data: emptyElement.outerHTML,
id: topElementId,
parentID: sideElement.getAttribute("data-node-id") || protyle.block.parentID
});
inserts.push({
action: "delete",
id: topElementId,
});
sideElement = undefined;
focusByWbr(emptyElement, range);
}
focusBlock(sideElement, undefined, false);
if (listElement) {
inserts.push({
@ -268,7 +269,9 @@ export const removeBlock = (protyle: IProtyle, blockElement: Element, range: Ran
});
}
}
transaction(protyle, deletes, inserts.reverse());
if (deletes.length > 0) {
transaction(protyle, deletes, inserts.reverse());
}
hideElements(["util"], protyle);
return;
}