Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-19 13:38:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/1359 批量删除

Browse source
This commit is contained in:
Vanessa 2022-11-03 11:12:23 +08:00
parent 8c4d00ed12
commit c8680c9fb3
9 changed files with 69 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/src/editor/deleteFile.ts
View file

@ -1,6 +1,9 @@
import {fetchPost} from "../util/fetch";
import {getDisplayName} from "../util/pathName";
import {getDisplayName, getNotebookName} from "../util/pathName";
import {confirmDialog} from "../dialog/confirmDialog";
import {hasTopClosestByTag} from "../protyle/util/hasClosest";
import {Constants} from "../constants";
import {showMessage} from "../dialog/message";
export const deleteFile = (notebookId: string, pathString: string, name: string) => {
if (window.siyuan.config.fileTree.removeDocWithoutConfirm) {
@ -25,3 +28,38 @@ export const deleteFile = (notebookId: string, pathString: string, name: string)
});
});
};
export const deleteFiles = (liElements: Element[]) => {
if (liElements.length === 1) {
const itemTopULElement = hasTopClosestByTag(liElements[0], "UL");
if (itemTopULElement) {
const itemNotebookId = itemTopULElement.getAttribute("data-url")
if (liElements[0].getAttribute("data-type") === "navigation-file") {
deleteFile(itemNotebookId, liElements[0].getAttribute("data-path"), getDisplayName(liElements[0].getAttribute("data-name"), false, true));
} else {
confirmDialog(window.siyuan.languages.deleteOpConfirm,
`${window.siyuan.languages.confirmDelete} <b>${Lute.EscapeHTMLStr(getNotebookName(itemNotebookId))}</b>?`, () => {
fetchPost("/api/notebook/removeNotebook", {
notebook: itemNotebookId,
callback: Constants.CB_MOUNT_REMOVE
});
});
}
}
} else {
const paths: string[] = []
liElements.forEach(item => {
paths.push(item.getAttribute("data-path"));
})
if (paths.includes("/")) {
showMessage(window.siyuan.languages.notBatchRemove);
return;
}
confirmDialog(window.siyuan.languages.deleteOpConfirm,
window.siyuan.languages.confirmRemove.replace("${count}", liElements.length), () => {
fetchPost("/api/notebook/removeDocs", {
paths
});
});
}
}

11
app/src/menus/commonMenuItem.ts
View file

@ -778,17 +778,6 @@ export const openMenu = (src: string, onlyMenu: boolean, showAccelerator: boolea
}).element);
};
export const deleteMenu = (notebookId: string, name: string, pathString: string) => {
return new MenuItem({
icon: "iconTrashcan",
label: window.siyuan.languages.delete,
accelerator: "⌦",
click: () => {
deleteFile(notebookId, pathString, name);
}
}).element;
};
export const renameMenu = (options: {
path: string
notebookId: string

28
app/src/menus/navigation.ts
View file

@ -1,6 +1,5 @@
import {
copySubMenu,
deleteMenu,
exportMd,
movePathToMenu,
openFileAttr,
@ -24,6 +23,7 @@ import {confirmDialog} from "../dialog/confirmDialog";
import {Constants} from "../constants";
import {newFile} from "../util/newFile";
import {hasClosestByClassName} from "../protyle/util/hasClosest";
import {deleteFile, deleteFiles} from "../editor/deleteFile";
export const initNavigationMenu = (liElement: HTMLElement) => {
if (!liElement.classList.contains("b3-list-item--focus")) {
@ -148,15 +148,16 @@ export const initNavigationMenu = (liElement: HTMLElement) => {
};
export const initFileMenu = (notebookId: string, pathString: string, liElement: Element) => {
const fileElement = hasClosestByClassName(liElement, "sy__file")
if (!fileElement) {
return;
}
if (!liElement.classList.contains("b3-list-item--focus")) {
const fileElement = hasClosestByClassName(liElement, "sy__file")
if (fileElement) {
fileElement.querySelectorAll(".b3-list-item--focus").forEach(item => {
item.classList.remove("b3-list-item--focus");
item.removeAttribute("select-end")
item.removeAttribute("select-start")
})
}
fileElement.querySelectorAll(".b3-list-item--focus").forEach(item => {
item.classList.remove("b3-list-item--focus");
item.removeAttribute("select-end")
item.removeAttribute("select-start")
})
liElement.classList.add("b3-list-item--focus");
}
const id = liElement.getAttribute("data-node-id");
@ -213,7 +214,14 @@ export const initFileMenu = (notebookId: string, pathString: string, liElement:
}])
}).element);
window.siyuan.menus.menu.append(movePathToMenu(notebookId, pathString));
window.siyuan.menus.menu.append(deleteMenu(notebookId, name, pathString));
window.siyuan.menus.menu.append(new MenuItem({
icon: "iconTrashcan",
label: window.siyuan.languages.delete,
accelerator: "⌦",
click: () => {
deleteFiles(Array.from(fileElement.querySelectorAll(".b3-list-item--focus")))
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
window.siyuan.menus.menu.append(renameMenu({
path: pathString,

21
app/src/util/globalShortcut.ts
View file

@ -35,7 +35,7 @@ import {showMessage} from "../dialog/message";
import {openHistory} from "./history";
import {Dialog} from "../dialog";
import {unicode2Emoji} from "../emoji";
import {deleteFile} from "../editor/deleteFile";
import {deleteFile, deleteFiles} from "../editor/deleteFile";
import {escapeHtml} from "./escape";
import {syncGuide} from "../sync/syncGuide";
import {showPopover} from "../block/popover";
@ -1094,26 +1094,9 @@ const fileTreeKeydown = (event: KeyboardEvent) => {
return true;
}
}
if (event.key === "Delete" || (event.key === "Backspace" && isMac())) {
window.siyuan.menus.menu.remove();
liElements.forEach(item => {
const itemTopULElement = hasTopClosestByTag(item, "UL");
if (itemTopULElement) {
const itemNotebookId = itemTopULElement.getAttribute("data-url")
if (item.getAttribute("data-type") === "navigation-file") {
deleteFile(itemNotebookId, item.getAttribute("data-path"), getDisplayName(item.getAttribute("data-name"), false, true));
} else {
confirmDialog(window.siyuan.languages.deleteOpConfirm,
`${window.siyuan.languages.confirmDelete} <b>${Lute.EscapeHTMLStr(getNotebookName(itemNotebookId))}</b>?`, () => {
fetchPost("/api/notebook/removeNotebook", {
notebook: itemNotebookId,
callback: Constants.CB_MOUNT_REMOVE
});
});
}
}
})
deleteFiles(liElements)
return true;
}
if (event.key === "Enter") {