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

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

Browse source
This commit is contained in:
Vanessa 2022-06-29 09:09:18 +08:00
parent 22dad0a3b7
commit fa2b7c369f
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/layout/Wnd.ts
View file

@ -294,7 +294,10 @@ export class Wnd {
if (item.headElement && item.headElement.classList.contains("fn__none")) {
// https://github.com/siyuan-note/siyuan/issues/267
} else {
item.headElement?.classList.add("item--focus");
if (item.headElement) {
item.headElement.classList.add("item--focus");
item.headElement.setAttribute("data-activetime", (new Date()).getTime().toString());
}
item.panelElement.classList.remove("fn__none");
}
currentTab = item;
@ -310,7 +313,7 @@ export class Wnd {
if (currentTab && currentTab.model instanceof Editor) {
const keepCursorId = currentTab.headElement.getAttribute("keep-cursor");
if (keepCursorId) {
// 在新页签中打开，但不跳转到新页签，单切换到新页签时需调整滚动
// 在新页签中打开，但不跳转到新页签，但切换到新页签时需调整滚动
let nodeElement: HTMLElement;
Array.from(currentTab.model.editor.protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${keepCursorId}"]`)).find((item: HTMLElement) => {
if (!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed", true)) {
@ -405,7 +408,7 @@ export class Wnd {
event.preventDefault();
});
tab.headElement.setAttribute("data-opentime", (new Date()).getTime().toString());
tab.headElement.setAttribute("data-activetime", (new Date()).getTime().toString());
}
const containerElement = this.element.querySelector(".layout-tab-container");
if (!containerElement.querySelector(".fn__flex-1")) {
@ -433,10 +436,10 @@ export class Wnd {
return;
}
if (!openTime) {
openTime = item.headElement.getAttribute("data-opentime");
openTime = item.headElement.getAttribute("data-activetime");
removeId = this.children[index].id;
} else if (item.headElement.getAttribute("data-opentime") < openTime) {
openTime = item.headElement.getAttribute("data-opentime");
} else if (item.headElement.getAttribute("data-activetime") < openTime) {
openTime = item.headElement.getAttribute("data-activetime");
removeId = this.children[index].id;
}
});