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

🎨 https://github.com/siyuan-note/siyuan/issues/12089

Browse source
This commit is contained in:
Vanessa 2025-09-30 23:51:47 +08:00
parent 15a2a7f758
commit 2fd720696e
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/protyle/toolbar/index.ts
View file

@ -712,7 +712,8 @@ export class Toolbar {
} else {
// 测试不存在 https://ld246.com/article/1664454663564 情况，故移除引用合并限制
// 搜索结果引用被高亮隔断需进行合并 https://github.com/siyuan-note/siyuan/issues/7588
currentNode.textContent = previousElement.textContent + currentNode.textContent;
// textContent：防止赋值后 \n 转换为 br 导致后续 this.range.setStart 报错；innerText：获取 br 的 \n， https://github.com/siyuan-note/siyuan/issues/15968
currentNode.textContent = previousElement.innerText + currentNode.innerText;
// 如果为备注时，合并备注内容
if (currentType.includes("inline-memo")) {
currentNode.setAttribute("data-inline-memo-content", (previousElement.getAttribute("data-inline-memo-content") || "") +