diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 44674c082..f84cd603b 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "opendWorkspace": "Opened Workspace", "removeWorkspaceTip": "The workspace cannot be recovered after being deleted, are you sure to delete it?", "new": "New", "share2LiandiConfirmTip": "Are you sure to share this document to Liandi?", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index faa83e5a9..eb1986ea7 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "opendWorkspace": "Espacio de trabajo abierto", "removeWorkspaceTip": "El espacio de trabajo no se puede recuperar después de eliminarlo, ¿está seguro de eliminarlo?", "new": "Nuevo", "share2LiandiConfirmTip": "¿Estás seguro de compartir este documento con Liandi?", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 6dc7daf26..37c5d6b99 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "opendWorkspace": "Espace de travail ouvert", "removeWorkspaceTip": "L'espace de travail ne peut pas être récupéré après avoir été supprimé, êtes-vous sûr de le supprimer ?", "new": "Nouveau", "share2LiandiConfirmTip": "Êtes-vous sûr de partager ce document avec Liandi ?", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 4f146dac3..c21d8102c 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "opendWorkspace": "已打開的工作空間", "removeWorkspaceTip": "刪除工作空間後無法恢復，確定刪除嗎？", "new": "新建", "share2LiandiConfirmTip": "確定將該文檔分享到鏈滴嗎？", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index a6c306590..282c77e4c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "opendWorkspace": "已打开的工作空间", "removeWorkspaceTip": "删除工作空间后无法恢复，确定删除吗？", "new": "新建", "share2LiandiConfirmTip": "确定将该文档分享到链滴吗？", diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss index 2b8ad395c..9f73e20ae 100644 --- a/app/src/assets/scss/base.scss +++ b/app/src/assets/scss/base.scss @@ -214,6 +214,7 @@ progressLoading: 400 align-self: center; background-color: transparent; border: 0; + line-height: 14px; &:not(.toolbar__item--disabled):not(.toolbar__item--close):hover, &--active { @@ -226,6 +227,12 @@ progressLoading: 400 width: 14px; } + svg.toolbar__svg { + width: 8px; + height: 14px; + margin-left: 4px; + } + &--disabled { opacity: .54; cursor: not-allowed; diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts new file mode 100644 index 000000000..d25606db4 --- /dev/null +++ b/app/src/menus/workspace.ts @@ -0,0 +1,133 @@ +import {MenuItem} from "./Menu"; +/// #if !BROWSER +import {dialog} from "@electron/remote"; +import {ipcRenderer} from "electron"; +/// #endif +import {openHistory} from "../history/history"; +import {getOpenNotebookCount, pathPosix} 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 {openCard} from "../card/openCard"; + +export const workspaceMenu = (rect: DOMRect) => { + window.siyuan.menus.menu.remove(); + fetchPost("/api/system/getWorkspaces", {}, (response) => { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.dataHistory, + icon: "iconHistory", + accelerator: window.siyuan.config.keymap.general.dataHistory.custom, + click: () => { + openHistory(); + } + }).element); + if (!window.siyuan.config.readonly) { + if (getOpenNotebookCount() < 2) { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.dailyNote, + icon: "iconCalendar", + accelerator: window.siyuan.config.keymap.general.dailyNote.custom, + click: () => { + newDailyNote(); + } + }).element); + } else { + const submenu: IMenu[] = [] + window.siyuan.notebooks.forEach(item => { + if (!item.closed) { + submenu.push({ + label: item.name, + click: () => { + fetchPost("/api/filetree/createDailyNote", { + notebook: item.id, + app: Constants.SIYUAN_APPID, + }); + window.siyuan.storage[Constants.LOCAL_DAILYNOTEID] = item.id; + setStorageVal(Constants.LOCAL_DAILYNOTEID, window.siyuan.storage[Constants.LOCAL_DAILYNOTEID]); + } + }); + } + }); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.dailyNote, + icon: "iconCalendar", + accelerator: window.siyuan.config.keymap.general.dailyNote.custom, + type: "submenu", + submenu + }).element); + } + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.riffCard, + icon: "iconRiffCard", + accelerator: window.siyuan.config.keymap.general.riffCard.custom, + click: () => { + openCard(); + } + }).element); + } + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.help, + icon: "iconHelp", + click: () => { + mountHelp(); + } + }).element); + /// #if !BROWSER + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.openBy + "...", + click: async () => { + const localPath = await dialog.showOpenDialog({ + defaultPath: window.siyuan.config.system.homeDir, + properties: ["openDirectory", "createDirectory"], + }); + if (localPath.filePaths.length === 0) { + return; + } + openWorkspace(localPath.filePaths[0]) + } + }).element); + window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.opendWorkspace, + type: "readonly" + }).element); + response.data.forEach((item: { path: string, closed: boolean }) => { + if (item.closed) { + return; + } + window.siyuan.menus.menu.append(new MenuItem({ + label: pathPosix().basename(item.path), + click: () => { + openWorkspace(item.path) + } + }).element); + }); + window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.about7, + type: "readonly" + }).element); + response.data.forEach((item: { path: string, closed: boolean }) => { + window.siyuan.menus.menu.append(new MenuItem({ + label: pathPosix().basename(item.path), + click: () => { + openWorkspace(item.path) + } + }).element); + }); + /// #endif + window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom}); + }); +} + +const openWorkspace = (workspace: string) => { + fetchPost("/api/system/setWorkspaceDir", { + path: workspace + }, () => { + ipcRenderer.send(Constants.SIYUAN_OPEN_WORKSPACE, { + workspace, + lang: window.siyuan.config.appearance.lang + }); + }); +} diff --git a/app/src/util/onGetConfig.ts b/app/src/util/onGetConfig.ts index e78a83729..e77977001 100644 --- a/app/src/util/onGetConfig.ts +++ b/app/src/util/onGetConfig.ts @@ -12,11 +12,11 @@ import {Constants} from "../constants"; import {appearance} from "../config/appearance"; import {globalShortcut} from "./globalShortcut"; import {fetchPost} from "./fetch"; -import {mountHelp, newDailyNote} from "./mount"; +import {mountHelp} from "./mount"; import {MenuItem} from "../menus/Menu"; import {addGA, initAssets, setInlineStyle, setMode} from "./assets"; import {renderSnippet} from "../config/util/snippets"; -import {getOpenNotebookCount} from "./pathName"; +import {pathPosix} from "./pathName"; import {openFileById} from "../editor/util"; import {focusByRange} from "../protyle/util/selection"; import {exitSiYuan} from "../dialog/processSystem"; @@ -28,8 +28,7 @@ import {showMessage} from "../dialog/message"; import {editor} from "../config/editor"; import {goBack, goForward} from "./backForward"; import {replaceLocalPath} from "../editor/rename"; -import {openHistory} from "../history/history"; -import {openCard} from "../card/openCard"; +import {workspaceMenu} from "../menus/workspace"; const matchKeymap = (keymap: Record, key1: "general" | "editor", key2?: "general" | "insert" | "heading" | "list" | "table") => { if (key1 === "general") { @@ -181,19 +180,14 @@ export const onGetConfig = (isStart: boolean) => { }; const initBar = () => { - document.querySelector(".toolbar").innerHTML = `
+ document.querySelector(".toolbar").innerHTML = ` +
+ ${pathPosix().basename(window.siyuan.config.system.workspaceDir)} + +
-
- -
-
- -
-
- -
@@ -201,21 +195,19 @@ const initBar = () => {
开发版，使用前请进行备份 Development version, please backup before use
+
+
+ +
-
- -
-
- -
`; document.querySelector(".toolbar").addEventListener("click", (event: MouseEvent) => { let target = event.target as HTMLElement; @@ -232,6 +224,10 @@ const initBar = () => { syncGuide(target); event.stopPropagation(); break; + } else if (target.id === "barWorkspace") { + workspaceMenu(target.getBoundingClientRect()) + event.stopPropagation(); + break; } else if (target.id === "barReadonly") { editor.setMode(); event.stopPropagation(); @@ -262,21 +258,14 @@ const initBar = () => { setMode(2); } }).element); - window.siyuan.menus.menu.popup({x: event.clientX, y: event.clientY + 18}); - event.stopPropagation(); - break; - } else if (target.id === "barHistory") { - openHistory(); + const rect = target.getBoundingClientRect() + window.siyuan.menus.menu.popup({x: rect.left, y: rect.bottom}); event.stopPropagation(); break; } else if (target.id === "barSetting") { openSetting(); event.stopPropagation(); break; - } else if (target.id === "barTopHelp") { - mountHelp(); - event.stopPropagation(); - break; } else if (target.id === "toolbarVIP") { const dialogSetting = openSetting(); dialogSetting.element.querySelector('.b3-tab-bar [data-name="account"]').dispatchEvent(new CustomEvent("click")); @@ -286,34 +275,6 @@ const initBar = () => { openSearch(window.siyuan.config.keymap.general.globalSearch.custom); event.stopPropagation(); break; - } else if (target.id === "barRiffCard") { - openCard(); - event.stopPropagation(); - break; - } else if (target.id === "barDailyNote") { - if (getOpenNotebookCount() < 2) { - newDailyNote(); - } else { - window.siyuan.menus.menu.remove(); - window.siyuan.notebooks.forEach(item => { - if (!item.closed) { - window.siyuan.menus.menu.append(new MenuItem({ - label: item.name, - click: () => { - fetchPost("/api/filetree/createDailyNote", { - notebook: item.id, - app: Constants.SIYUAN_APPID, - }); - window.siyuan.storage[Constants.LOCAL_DAILYNOTEID] = item.id; - setStorageVal(Constants.LOCAL_DAILYNOTEID, window.siyuan.storage[Constants.LOCAL_DAILYNOTEID]); - } - }).element); - } - }); - window.siyuan.menus.menu.popup({x: event.clientX, y: event.clientY + 18}); - } - event.stopPropagation(); - break; } target = target.parentElement; }