0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-09-19 17:52:20 +08:00
commit a8bfc6b8c7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/block/popover.ts
View file

@ -235,7 +235,7 @@ const hidePopover = (event: MouseEvent & { path: HTMLElement[] }) => {
// 有 gutter 菜单时不隐藏
} else if (item.targetElement && item.targetElement.classList.contains("protyle-wysiwyg__embed") &&
item.targetElement.contains(targetElement)) {
// 点击潜入块后浮窗消失后再快速点击潜入块无法弹出浮窗 https://github.com/siyuan-note/siyuan/issues/12511
// 点击嵌入块后浮窗消失后再快速点击嵌入块无法弹出浮窗 https://github.com/siyuan-note/siyuan/issues/12511
} else {
item.destroy();
}

4
app/src/dialog/processSystem.ts
View file

@ -154,7 +154,7 @@ export const setRefDynamicText = (data: {
"rootID": string
}) => {
getAllEditor().forEach(item => {
// 不能对比 rootId，否则潜入块中的锚文本无法更新
// 不能对比 rootId，否则嵌入块中的锚文本无法更新
item.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${data.blockID}"] span[data-type="block-ref"][data-subtype="d"][data-id="${data.defBlockID}"]`).forEach(item => {
item.innerHTML = data.refText;
});
@ -184,7 +184,7 @@ export const setDefRefCount = (data: {
}
return;
}
// 不能对比 rootId，否则潜入块中的锚文本无法更新
// 不能对比 rootId，否则嵌入块中的锚文本无法更新
item.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${data.blockID}"]`).forEach(item => {
const countElement = item.querySelector(".protyle-attr--refcount");
if (countElement) {