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

fix: 当前工作空间不应该显示 打开 和 移除 (#14017)

Browse source 
fix https://github.com/siyuan-note/siyuan/issues/12018
This commit is contained in:
Jeffrey Chen 2025-02-07 11:23:02 +08:00 • committed by GitHub
parent dff19ad095
commit ae1912bfa2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,8 +208,9 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
}
}];
workspaceSubMenu.push({id: "separator_1", type: "separator"});
const workspaceDir = window.siyuan.config.system.workspaceDir;
response.data.forEach((item: IWorkspace) => {
workspaceSubMenu.push(workspaceItem(item) as IMenu);
workspaceSubMenu.push(workspaceItem(item, workspaceDir) as IMenu);
});
/// #else
workspaceSubMenu = [{
@ -532,16 +533,27 @@ const openWorkspace = (workspace: string) => {
/// #endif
};
const workspaceItem = (item: IWorkspace) => {
/// #if !BROWSER
return {
label: `<div aria-label="${item.path}" class="fn__ellipsis ariaLabel" style="max-width: 256px">
${originalPath().basename(item.path)}
</div>`,
current: !item.closed,
iconHTML: "",
type: "submenu",
submenu: [{
const workspaceItem = (item: IWorkspace, workspaceDir: string) => {
let submenu: any[];
if (item.path === workspaceDir) {
submenu = [{
id: "showInFolder",
icon: "iconFolder",
label: window.siyuan.languages.showInFolder,
click() {
showFileInFolder(item.path);
}
}, {
id: "copyPath",
icon: "iconCopy",
label: window.siyuan.languages.copyPath,
click() {
writeText(item.path);
showMessage(window.siyuan.languages.copied);
}
}];
} else {
submenu = [{
id: "openBy",
icon: "iconOpenWindow",
label: window.siyuan.languages.openBy,
@ -570,7 +582,14 @@ const workspaceItem = (item: IWorkspace) => {
click() {
fetchPost("/api/system/removeWorkspaceDir", {path: item.path});
}
}],
}];
}
return {
label: `<div aria-label="${item.path}" class="fn__ellipsis ariaLabel" style="max-width: 256px">${originalPath().basename(item.path)}</div>`,
current: !item.closed,
iconHTML: "",
type: "submenu",
submenu,
click() {
openWorkspace(item.path);
},