renun/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-02-28 05:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa
2022-10-12 15:37:10 +08:00
parent 591d65b973
commit 4dfea2f9a6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/protyle/util/insertHTML.ts
View File

@@ -7,7 +7,7 @@ import {focusBlock, getEditorRange, focusByWbr, fixTableRange} from "./selection
import {mathRender} from "../markdown/mathRender";
import {Constants} from "../../constants";
export const insertHTML = (html: string, protyle: IProtyle, isBlock = false, splitSpan = true) => {
export const insertHTML = (html: string, protyle: IProtyle, isBlock = false) => {
if (html === "") {
return;
}
@@ -73,7 +73,9 @@ export const insertHTML = (html: string, protyle: IProtyle, isBlock = false, spl
}
// 粘贴带样式的行内元素到另一个行内元素中需进行切割
const spanElement = range.startContainer.nodeType === 3 ? range.startContainer.parentElement: range.startContainer as HTMLElement;
if (splitSpan && 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
) {
const afterElement = document.createElement("span");
const attributes = spanElement.attributes;
for (let i = 0; i < attributes.length; i++) {

2
app/src/protyle/util/paste.ts
View File

@@ -50,7 +50,7 @@ export const pasteAsPlainText = async (protyle:IProtyle) => {
uploadLocalFiles(localFiles, protyle, false);
writeText("");
} else {
insertHTML(protyle.lute.BlockDOM2Content(protyle.lute.InlineMd2BlockDOM(clipboard.readText())), protyle, false, false);
insertHTML(protyle.lute.BlockDOM2Content(protyle.lute.InlineMd2BlockDOM(clipboard.readText())), protyle, false);
}
/// #endif
};