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

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

Browse source
This commit is contained in:
Vanessa 2023-02-08 21:42:10 +08:00
parent 8d42449f17
commit 401f3d1ac6
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/layout/dock/Files.ts
View file

@ -15,7 +15,7 @@ import {newNotebook} from "../../util/mount";
import {confirmDialog} from "../../dialog/confirmDialog";
import {updateHotkeyTip} from "../../protyle/util/compatibility";
import {openFileById} from "../../editor/util";
import {hasClosestByTag, hasTopClosestByTag} from "../../protyle/util/hasClosest";
import {hasClosestByAttribute, hasClosestByTag, hasTopClosestByTag} from "../../protyle/util/hasClosest";
import {isTouchDevice} from "../../util/functions";
export class Files extends Model {
@ -372,7 +372,14 @@ export class Files extends Model {
event.preventDefault();
return;
}
if (window.siyuan.config.fileTree.sort === 6 &&
const notebookElement = hasClosestByAttribute(liElement, "data-sortmode", null);
if (!notebookElement) {
return;
}
const notebookSort = notebookElement.getAttribute("data-sortmode");
if ((
notebookSort === "6" || (window.siyuan.config.fileTree.sort === 6 && notebookSort === "15")
) &&
// 防止文档拖拽到笔记本外
!(!sourceOnlyRoot && targetType === "navigation-root")) {
const nodeRect = liElement.getBoundingClientRect();
@ -462,7 +469,10 @@ export class Files extends Model {
toPath,
});
}
if ((newElement.classList.contains("dragover__bottom") || newElement.classList.contains("dragover__top")) && window.siyuan.config.fileTree.sort === 6) {
const ulSort = newUlElement.getAttribute("data-sortmode");
if ((newElement.classList.contains("dragover__bottom") || newElement.classList.contains("dragover__top")) &&
(ulSort === "6" || (window.siyuan.config.fileTree.sort === 6 && ulSort === "15"))
) {
if (selectRootElements.length > 0 && newElement.getAttribute("data-path") === "/") {
if (newElement.classList.contains("dragover__top")) {
selectRootElements.forEach(item => {