diff --git a/app/src/config/about.ts b/app/src/config/about.ts index 1e7425e3d..d8af5952b 100644 --- a/app/src/config/about.ts +++ b/app/src/config/about.ts @@ -1,7 +1,6 @@ import {Constants} from "../constants"; /// #if !BROWSER -import {app, ipcRenderer, shell} from "electron"; -import {dialog} from "@electron/remote"; +import {app, shell} from "electron"; /// #endif import {isBrowser} from "../util/functions"; import {fetchPost} from "../util/fetch"; diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index 2ae7f691a..cbb3a6b68 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -4,7 +4,7 @@ import {dialog} from "@electron/remote"; import {ipcRenderer} from "electron"; /// #endif import {openHistory} from "../history/history"; -import {getOpenNotebookCount, pathPosix} from "../util/pathName"; +import {getOpenNotebookCount} from "../util/pathName"; import {mountHelp, newDailyNote} from "../util/mount"; import {fetchPost} from "../util/fetch"; import {Constants} from "../constants"; @@ -33,7 +33,7 @@ export const workspaceMenu = (rect: DOMRect) => { } }).element); } else { - const submenu: IMenu[] = [] + const submenu: IMenu[] = []; window.siyuan.notebooks.forEach(item => { if (!item.closed) { submenu.push({ @@ -84,7 +84,7 @@ export const workspaceMenu = (rect: DOMRect) => { if (localPath.filePaths.length === 0) { return; } - openWorkspace(localPath.filePaths[0]) + openWorkspace(localPath.filePaths[0]); } }).element); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); @@ -97,9 +97,9 @@ export const workspaceMenu = (rect: DOMRect) => { return; } window.siyuan.menus.menu.append(new MenuItem({ - label: pathPosix().basename(item.path), + label: item.path, click: () => { - openWorkspace(item.path) + openWorkspace(item.path); } }).element); }); @@ -110,16 +110,16 @@ export const workspaceMenu = (rect: DOMRect) => { }).element); response.data.forEach((item: IWorkspace) => { window.siyuan.menus.menu.append(new MenuItem({ - label: pathPosix().basename(item.path), + label: item.path, click: () => { - openWorkspace(item.path) + openWorkspace(item.path); } }).element); }); /// #endif window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom}); }); -} +}; const openWorkspace = (workspace: string) => { fetchPost("/api/system/setWorkspaceDir", { @@ -130,4 +130,4 @@ const openWorkspace = (workspace: string) => { lang: window.siyuan.config.appearance.lang }); }); -} +}; diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index e77977001..53eb37de0 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -16,7 +16,7 @@ import {mountHelp} from "./mount"; import {MenuItem} from "../menus/Menu"; import {addGA, initAssets, setInlineStyle, setMode} from "./assets"; import {renderSnippet} from "../config/util/snippets"; -import {pathPosix} from "./pathName"; +import {originalPath} from "./pathName"; import {openFileById} from "../editor/util"; import {focusByRange} from "../protyle/util/selection"; import {exitSiYuan} from "../dialog/processSystem"; @@ -182,7 +182,7 @@ export const onGetConfig = (isStart: boolean) => { const initBar = () => { document.querySelector(".toolbar").innerHTML = `
- ${pathPosix().basename(window.siyuan.config.system.workspaceDir)} + ${originalPath().basename(window.siyuan.config.system.workspaceDir)}
@@ -225,7 +225,7 @@ const initBar = () => { event.stopPropagation(); break; } else if (target.id === "barWorkspace") { - workspaceMenu(target.getBoundingClientRect()) + workspaceMenu(target.getBoundingClientRect()); event.stopPropagation(); break; } else if (target.id === "barReadonly") { @@ -258,7 +258,7 @@ const initBar = () => { setMode(2); } }).element); - const rect = target.getBoundingClientRect() + const rect = target.getBoundingClientRect(); window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom}); event.stopPropagation(); break;