Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-04 07:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/10282

Browse source
This commit is contained in:
Vanessa 2024-01-31 11:02:32 +08:00
parent 24ee5d14be
commit d9f7441170
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/render/av/cell.ts
View file

@ -467,7 +467,7 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
const cellId = item.getAttribute("data-id");
const colId = item.getAttribute("data-col-id");
text += getCellText(item) + " ";
text += getCellText(item) + ((cellElements[elementIndex + 1] && item.nextElementSibling && item.nextElementSibling.isSameNode(cellElements[elementIndex + 1])) ? "\t" : "\n\n");
const oldValue = genCellValueByElement(type, item);
json.push(oldValue);
// relation 为全部更新，以下类型为添加
@ -531,7 +531,7 @@ export const updateCellsValue = (protyle: IProtyle, nodeElement: HTMLElement, va
});
transaction(protyle, doOperations, undoOperations);
}
return {text: text.substring(0, text.length - 1), json};
return {text: text.substring(0, text.length - 2), json};
};
export const renderCellAttr = (cellElement: Element, value: IAVCellValue) => {

15
app/src/protyle/util/paste.ts
View file

@ -271,7 +271,20 @@ export const paste = async (protyle: IProtyle, event: (ClipboardEvent | DragEven
e.setAttribute("contenteditable", "true");
});
const tempInnerHTML = tempElement.innerHTML;
insertHTML(tempInnerHTML, protyle, isBlock);
if (!nodeElement.classList.contains("av") && tempInnerHTML.startsWith("[{") && tempInnerHTML.endsWith("}]")) {
try {
const json = JSON.parse(tempInnerHTML);
if (json.length > 0 && json[0].id && json[0].type) {
insertHTML(textPlain, protyle, isBlock);
} else {
insertHTML(tempInnerHTML, protyle, isBlock);
}
} catch (e) {
insertHTML(tempInnerHTML, protyle, isBlock);
}
} else {
insertHTML(tempInnerHTML, protyle, isBlock);
}
filterClipboardHint(protyle, protyle.lute.BlockDOM2StdMd(tempInnerHTML));
blockRender(protyle, protyle.wysiwyg.element);
processRender(protyle.wysiwyg.element);

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

@ -304,12 +304,12 @@ export class WYSIWYG {
}
if (cellElements.length > 0) {
html = "[";
cellElements.forEach((item: HTMLElement) => {
cellElements.forEach((item: HTMLElement, index) => {
const cellText = getCellText(item);
html += JSON.stringify(genCellValueByElement(getTypeByCellElement(item), item)) + ",";
textPlain += cellText + " ";
textPlain += cellText + ((cellElements[index + 1] && item.nextElementSibling && item.nextElementSibling.isSameNode(cellElements[index + 1])) ? "\t" : "\n\n");
});
textPlain = textPlain.substring(0, textPlain.length - 1);
textPlain = textPlain.substring(0, textPlain.length - 2);
html = html.substring(0, html.length - 1) + "]";
}
} else {