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

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

Browse source
This commit is contained in:
Vanessa 2022-11-09 23:53:33 +08:00
parent 9aadfe3041
commit 9cbcaf237a
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
if (inlineMathElement) { if (inlineMathElement) {
// 表格内选中数学公式 https://ld246.com/article/1631708573504 // 表格内选中数学公式 https://ld246.com/article/1631708573504
inlineMathElement.remove(); inlineMathElement.remove();
} else if (range.startContainer.nodeType === 3 && range.startContainer.parentElement.getAttribute("data-type")?.indexOf("block-ref")>-1) { } else if (range.startContainer.nodeType === 3 && range.startContainer.parentElement.getAttribute("data-type")?.indexOf("block-ref") > -1) {
// ref 选中处理 https://ld246.com/article/1629214377537 // ref 选中处理 https://ld246.com/article/1629214377537
range.startContainer.parentElement.remove(); range.startContainer.parentElement.remove();
// 选中 ref**bbb** 后 alt+[ // 选中 ref**bbb** 后 alt+[
@ -89,8 +89,8 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
tempElement.innerHTML = tempElement.content.firstElementChild.firstElementChild.innerHTML.trim(); tempElement.innerHTML = tempElement.content.firstElementChild.firstElementChild.innerHTML.trim();
} }
// 粘贴带样式的行内元素到另一个行内元素中需进行切割 // 粘贴带样式的行内元素到另一个行内元素中需进行切割
const spanElement = range.startContainer.nodeType === 3 ? range.startContainer.parentElement: range.startContainer as HTMLElement; const spanElement = range.startContainer.nodeType === 3 ? range.startContainer.parentElement : range.startContainer as HTMLElement;
if (spanElement.tagName === "SPAN" && spanElement.isSameNode( range.endContainer.nodeType === 3 ? range.endContainer.parentElement: range.endContainer) && if (spanElement.tagName === "SPAN" && spanElement.isSameNode(range.endContainer.nodeType === 3 ? range.endContainer.parentElement : range.endContainer) &&
tempElement.content.querySelector("span") // 粘贴纯文本不需切割 https://ld246.com/article/1665556907936 tempElement.content.querySelector("span") // 粘贴纯文本不需切割 https://ld246.com/article/1665556907936
) { ) {
const afterElement = document.createElement("span"); const afterElement = document.createElement("span");
@ -168,7 +168,7 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
} }
let lastElement: Element; let lastElement: Element;
Array.from(tempElement.content.children).reverse().forEach((item) => { Array.from(tempElement.content.children).reverse().forEach((item) => {
const addId = item.getAttribute("data-node-id"); let addId = item.getAttribute("data-node-id");
if (addId === id) { if (addId === id) {
doOperation.push({ doOperation.push({
action: "update", action: "update",
@ -181,6 +181,18 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
data: oldHTML, data: oldHTML,
}); });
} else { } else {
if (item.classList.contains("li") && !blockElement.parentElement.classList.contains("list")) {
// https://github.com/siyuan-note/siyuan/issues/6534
addId = Lute.NewNodeID()
const liElement = document.createElement("div");
liElement.setAttribute("data-subtype", item.getAttribute("data-subtype"));
liElement.setAttribute("data-node-id", addId);
liElement.setAttribute("data-type", "NodeList");
liElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));
liElement.classList.add("list");
liElement.append(item);
item = liElement;
}
doOperation.push({ doOperation.push({
action: "insert", action: "insert",
data: item.outerHTML, data: item.outerHTML,