From 8f063e9f37636f52557d67fe0076c7b412811941 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 7 Jul 2023 20:16:37 +0800 Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/8700 --- app/src/menus/workspace.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index a69bc7849..034c87534 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -35,7 +35,7 @@ const togglePinDock = (dock: Dock, icon: string) => { }; }; -export const workspaceMenu = (app:App, rect: DOMRect) => { +export const workspaceMenu = (app: App, rect: DOMRect) => { if (!window.siyuan.menus.menu.element.classList.contains("fn__none") && window.siyuan.menus.menu.element.getAttribute("data-name") === "barWorkspace") { window.siyuan.menus.menu.remove(); @@ -80,8 +80,8 @@ export const workspaceMenu = (app:App, rect: DOMRect) => { /// #if !BROWSER if (!window.siyuan.config.readonly) { const workspaceSubMenu: IMenu[] = [{ - label: window.siyuan.languages.openBy + "...", - iconHTML: Constants.ZWSP, + label: `${window.siyuan.languages.new} / ${window.siyuan.languages.openBy}`, + iconHTML: "", click: async () => { const localPath = await dialog.showOpenDialog({ defaultPath: window.siyuan.config.system.homeDir, @@ -90,7 +90,15 @@ export const workspaceMenu = (app:App, rect: DOMRect) => { if (localPath.filePaths.length === 0) { return; } - openWorkspace(localPath.filePaths[0]); + fetchPost("/api/system/checkWorkspaceDir", {path: localPath.filePaths[0]}, (response) => { + if (response.data.isWorkspace) { + openWorkspace(localPath.filePaths[0]); + } else { + confirmDialog(window.siyuan.languages.new, `TODO: ${localPath.filePaths[0]}`, () => { + openWorkspace(localPath.filePaths[0]); + }) + } + }) } }]; workspaceSubMenu.push({type: "separator"});