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

✨ https://github.com/siyuan-note/siyuan/issues/2911 粘贴带样式的行内元素到另一个行内元素中需进行切割

Browse source
This commit is contained in:
Vanessa 2022-09-16 16:45:09 +08:00
parent 6b82e98eb0
commit b5e4ccf8c5
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,20 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) =>
if (tempElement.content.firstChild.nodeType !== 3 && tempElement.content.firstElementChild.classList.contains("p")) { if (tempElement.content.firstChild.nodeType !== 3 && tempElement.content.firstElementChild.classList.contains("p")) {
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;
if (spanElement.tagName === "SPAN" && spanElement.isSameNode( range.endContainer.nodeType === 3 ? range.endContainer.parentElement: range.endContainer)) {
const afterElement = document.createElement("span");
const attributes = spanElement.attributes;
for (let i = 0; i < attributes.length; i++) {
afterElement.setAttribute(attributes[i].name, attributes[i].value);
}
range.setEnd(spanElement.lastChild, spanElement.lastChild.textContent.length);
afterElement.append(range.extractContents());
spanElement.after(afterElement);
range.setStartBefore(afterElement);
range.collapse(true);
}
range.insertNode(tempElement.content.cloneNode(true)); range.insertNode(tempElement.content.cloneNode(true));
range.collapse(false); range.collapse(false);
blockElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); blockElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss"));

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

@ -1211,21 +1211,6 @@ export class WYSIWYG {
event.stopPropagation(); event.stopPropagation();
return; return;
} }
const range = getEditorRange(this.element);
// https://github.com/siyuan-note/siyuan/issues/3257
if (range.toString() === "" && range.startContainer.nodeType === 3 && !protyle.toolbar.isNewEmptyInline &&
// https://github.com/siyuan-note/siyuan/issues/4118
range.startOffset >= range.startContainer.textContent.length &&
protyle.toolbar.getCurrentType(range).length > 0) {
// 粗体等行内元素粘贴
if (!hasNextSibling(range.startContainer)) {
range.setEndAfter(range.startContainer.parentElement);
range.collapse(false);
} else if (!hasPreviousSibling(range.startContainer)) {
range.setStartBefore(range.startContainer.parentElement);
range.collapse(true);
}
}
paste(protyle, event); paste(protyle, event);
}); });