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

🎨 fix https://github.com/siyuan-note/siyuan/pull/9617

Browse source
This commit is contained in:
Vanessa 2023-11-14 12:58:45 +08:00
parent 092c58f629
commit 70e6a3182d
23 changed files with 382 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/boot/globalEvent/keydown.ts
View file

@ -1270,15 +1270,20 @@ export const windowKeyDown = (app: App, event: KeyboardEvent) => {
}
}
if (window.siyuan.dialogs.length > 0) {
window.siyuan.dialogs[window.siyuan.dialogs.length - 1].destroy();
// 需放在 menus 后，否则资源列中添加资源会先关闭菜单
// 需放在 dialog 前，否则属性面板中修改日期会先关闭 dialog，只剩修改界面
const avElement = document.querySelector(".av__panel");
if (avElement) {
const selectCellElement = document.querySelector(".av__cell--select")
if (selectCellElement) {
focusBlock(hasClosestBlock(selectCellElement) as HTMLElement);
}
avElement.remove();
return;
}
// 需放在 menus 后，否则资源列中添加资源会先关闭菜单
const avElement = document.querySelector(".av__panel");
if (avElement) {
avElement.remove();
if (window.siyuan.dialogs.length > 0) {
window.siyuan.dialogs[window.siyuan.dialogs.length - 1].destroy();
return;
}