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

✨ fix https://github.com/siyuan-note/siyuan/issues/6159

Browse source
This commit is contained in:
Vanessa 2022-10-13 11:33:55 +08:00
parent 951e94b02a
commit 61f73a3132
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,11 +128,20 @@ export class Wnd {
} }
}); });
this.headersElement.addEventListener("dragover", function (event: DragEvent & { target: HTMLElement }) { this.headersElement.addEventListener("dragover", function (event: DragEvent & { target: HTMLElement }) {
if (!window.siyuan.dragElement || !event.dataTransfer.types.includes(Constants.SIYUAN_DROP_TAB)) { if (!window.siyuan.dragElement ||
(!event.dataTransfer.types.includes(Constants.SIYUAN_DROP_TAB) && !event.dataTransfer.types.includes(Constants.SIYUAN_DROP_FILE))) {
return;
}
if (window.siyuan.dragElement.getAttribute("data-type") === "navigation-root") {
// 文档数中笔记本不能拖拽打开
return; return;
} }
event.preventDefault(); event.preventDefault();
const it = this as HTMLElement; const it = this as HTMLElement;
if (event.dataTransfer.types.includes(Constants.SIYUAN_DROP_FILE)) {
it.style.opacity = ".1"
return;
}
const newTabHeaderElement = hasClosestByTag(event.target, "LI"); const newTabHeaderElement = hasClosestByTag(event.target, "LI");
let oldTabHeaderElement = window.siyuan.dragElement; let oldTabHeaderElement = window.siyuan.dragElement;
let exitDrag = false; let exitDrag = false;
@ -180,10 +189,22 @@ export class Wnd {
} }
} }
}); });
it.style.opacity = "";
}); });
this.headersElement.addEventListener("drop", function (event: DragEvent & { target: HTMLElement }) { this.headersElement.addEventListener("drop", function (event: DragEvent & { target: HTMLElement }) {
const oldTab = getInstanceById(event.dataTransfer.getData(Constants.SIYUAN_DROP_TAB)) as Tab;
const it = this as HTMLElement; const it = this as HTMLElement;
if (event.dataTransfer.types.includes(Constants.SIYUAN_DROP_FILE)) {
// 文档树拖拽
setPanelFocus(it.parentElement.parentElement);
openFileById({
id: window.siyuan.dragElement.getAttribute("data-node-id"),
action: [Constants.CB_GET_FOCUS, Constants.CB_GET_SCROLL]
});
window.siyuan.dragElement = undefined;
it.style.opacity = "";
return;
}
const oldTab = getInstanceById(event.dataTransfer.getData(Constants.SIYUAN_DROP_TAB)) as Tab;
it.classList.remove("layout-tab-bar--drag"); it.classList.remove("layout-tab-bar--drag");
const nextTabHeaderElement = (Array.from(it.childNodes).find((item: HTMLElement) => { const nextTabHeaderElement = (Array.from(it.childNodes).find((item: HTMLElement) => {