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

🎨 从工作空间列表中移除

Browse source
This commit is contained in:
Vanessa 2023-01-10 22:33:54 +08:00
parent c50400428b
commit de8949d88d
8 changed files with 52 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/assets/scss/base.scss
View file

@ -256,6 +256,8 @@ progressLoading: 400
max-width: 96px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
user-select: none;
}
}

62
app/src/menus/workspace.ts
View file

@ -1,15 +1,16 @@
import {MenuItem} from "./Menu";
/// #if !BROWSER
import {dialog} from "@electron/remote";
import {ipcRenderer} from "electron";
import {ipcRenderer, shell} from "electron";
/// #endif
import {openHistory} from "../history/history";
import {getOpenNotebookCount, originalPath} from "../util/pathName";
import {mountHelp, newDailyNote} from "../util/mount";
import {fetchPost} from "../util/fetch";
import {Constants} from "../constants";
import {setStorageVal} from "../protyle/util/compatibility";
import {setStorageVal, writeText} from "../protyle/util/compatibility";
import {openCard} from "../card/openCard";
import {showMessage} from "../dialog/message";
export const workspaceMenu = (rect: DOMRect) => {
window.siyuan.menus.menu.remove();
@ -90,37 +91,23 @@ export const workspaceMenu = (rect: DOMRect) => {
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
window.siyuan.menus.menu.append(new MenuItem({
iconHTML: window.siyuan.languages.openedWorkspace,
label:"",
label: "",
type: "readonly"
}).element);
response.data.forEach((item: IWorkspace) => {
if (item.closed) {
return;
}
window.siyuan.menus.menu.append(new MenuItem({
label: `<div class="b3-tooltips b3-tooltips__e" aria-label="${item.path}">
<div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
</div>`,
click: () => {
openWorkspace(item.path);
}
}).element);
workspaceItem(item)
});
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
window.siyuan.menus.menu.append(new MenuItem({
iconHTML: window.siyuan.languages.workspaceList,
label:"",
label: "",
type: "readonly"
}).element);
response.data.forEach((item: IWorkspace) => {
window.siyuan.menus.menu.append(new MenuItem({
label: `<div class="b3-tooltips b3-tooltips__e" aria-label="${item.path}">
<div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
</div>`,
click: () => {
openWorkspace(item.path);
}
}).element);
workspaceItem(item)
});
/// #endif
window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom});
@ -139,3 +126,38 @@ const openWorkspace = (workspace: string) => {
});
/// #endif
};
const workspaceItem = (item: IWorkspace) => {
/// #if !BROWSER
window.siyuan.menus.menu.append(new MenuItem({
label: `<div class="b3-tooltips b3-tooltips__ne" aria-label="${item.path}">
<div class="fn__ellipsis" style="max-width: 256px">${originalPath().basename(item.path)}</div>
</div>`,
click() {
openWorkspace(item.path);
},
submenu: [{
label: window.siyuan.languages.openBy,
click() {
openWorkspace(item.path);
}
}, {
label: window.siyuan.languages.showInFolder,
click() {
shell.showItemInFolder(item.path);
}
}, {
label: window.siyuan.languages.copy,
click() {
writeText(item.path);
showMessage(window.siyuan.languages.copied);
}
}, {
label: window.siyuan.languages.removeWorkspaceTip,
click() {
fetchPost("/api/system/removeWorkspaceDir", {path: item.path});
}
}]
}).element);
/// #endif
}

8
app/src/mobile/util/menu.ts
View file

@ -476,16 +476,14 @@ ${accountHTML}
break;
} else if (target.getAttribute("data-type") === "remove") {
const p = target.parentElement.getAttribute("data-path");
confirmDialog("⚠️ " + window.siyuan.languages.remove + " " + pathPosix().basename(p), window.siyuan.languages.removeWorkspaceTip, () => {
fetchPost("/api/system/removeWorkspaceDir", {path: p}, () => {
genWorkspace(workspaceDirElement);
});
fetchPost("/api/system/removeWorkspaceDir", {path: p}, () => {
genWorkspace(workspaceDirElement);
});
event.preventDefault();
event.stopPropagation();
break;
} else if (target.classList.contains("b3-list-item") && !target.classList.contains("b3-list-item--focus")) {
confirmDialog(window.siyuan.languages.confirm,`${pathPosix().basename(window.siyuan.config.system.workspaceDir)} -> ${pathPosix().basename(target.getAttribute("data-path"))}?`, () => {
confirmDialog(window.siyuan.languages.confirm, `${pathPosix().basename(window.siyuan.config.system.workspaceDir)} -> ${pathPosix().basename(target.getAttribute("data-path"))}?`, () => {
fetchPost("/api/system/setWorkspaceDir", {
path: target.getAttribute("data-path")
}, () => {