Ver código fonte

:art: https://github.com/siyuan-note/siyuan/issues/7071

Vanessa 2 anos atrás
pai
commit
c03d4ae10c

+ 0 - 1
app/appearance/langs/en_US.json

@@ -3,7 +3,6 @@
   "panel": "Panel",
   "panel": "Panel",
   "copyPath": "Copy Path",
   "copyPath": "Copy Path",
   "workspaceList": "Workspaces",
   "workspaceList": "Workspaces",
-  "openWorkspace": "Open Workspace",
   "removeWorkspaceTip": "Remove from Workspaces",
   "removeWorkspaceTip": "Remove from Workspaces",
   "new": "New",
   "new": "New",
   "share2LiandiConfirmTip": "Are you sure to share this document to Liandi?",
   "share2LiandiConfirmTip": "Are you sure to share this document to Liandi?",

+ 0 - 1
app/appearance/langs/es_ES.json

@@ -3,7 +3,6 @@
   "panel": "Panel",
   "panel": "Panel",
   "copyPath": "Copiar ruta",
   "copyPath": "Copiar ruta",
   "workspaceList": "Áreas de trabajo",
   "workspaceList": "Áreas de trabajo",
-  "openWorkspace": "Abrir espacio de trabajo",
   "removeWorkspaceTip": "Quitar de los espacios de trabajo",
   "removeWorkspaceTip": "Quitar de los espacios de trabajo",
   "new": "Nuevo",
   "new": "Nuevo",
   "share2LiandiConfirmTip": "¿Estás seguro de compartir este documento con Liandi?",
   "share2LiandiConfirmTip": "¿Estás seguro de compartir este documento con Liandi?",

+ 0 - 1
app/appearance/langs/fr_FR.json

@@ -3,7 +3,6 @@
   "panel": "Panneau",
   "panel": "Panneau",
   "copyPath": "Copier le chemin",
   "copyPath": "Copier le chemin",
   "workspaceList": "Espaces de travail",
   "workspaceList": "Espaces de travail",
-  "openWorkspace": "Ouvrir l'espace de travail",
   "removeWorkspaceTip": "Supprimer des espaces de travail",
   "removeWorkspaceTip": "Supprimer des espaces de travail",
   "new": "Nouveau",
   "new": "Nouveau",
   "share2LiandiConfirmTip": "Êtes-vous sûr de partager ce document avec Liandi ?",
   "share2LiandiConfirmTip": "Êtes-vous sûr de partager ce document avec Liandi ?",

+ 1 - 2
app/appearance/langs/zh_CHT.json

@@ -2,8 +2,7 @@
   "pointExchangeSize": "積分兌換",
   "pointExchangeSize": "積分兌換",
   "panel": "面板",
   "panel": "面板",
   "copyPath": "複製路徑",
   "copyPath": "複製路徑",
-  "workspaceList": "工作空間列表",
-  "openWorkspace": "打開工作空間",
+  "workspaceList": "工作空間",
   "removeWorkspaceTip": "從工作空間列表中移除",
   "removeWorkspaceTip": "從工作空間列表中移除",
   "new": "新建",
   "new": "新建",
   "share2LiandiConfirmTip": "確定將該文檔分享到鏈滴嗎?",
   "share2LiandiConfirmTip": "確定將該文檔分享到鏈滴嗎?",

+ 1 - 2
app/appearance/langs/zh_CN.json

@@ -2,8 +2,7 @@
   "pointExchangeSize": "积分兑换",
   "pointExchangeSize": "积分兑换",
   "panel": "面板",
   "panel": "面板",
   "copyPath": "复制路径",
   "copyPath": "复制路径",
-  "workspaceList": "工作空间列表",
-  "openWorkspace": "打开工作空间",
+  "workspaceList": "工作空间",
   "removeWorkspaceTip": "从工作空间列表中移除",
   "removeWorkspaceTip": "从工作空间列表中移除",
   "new": "新建",
   "new": "新建",
   "share2LiandiConfirmTip": "确定将该文档分享到链滴吗?",
   "share2LiandiConfirmTip": "确定将该文档分享到链滴吗?",

+ 11 - 9
app/src/menus/workspace.ts

@@ -54,7 +54,7 @@ export const workspaceMenu = (rect: DOMRect) => {
         }).element);
         }).element);
         /// #if !BROWSER
         /// #if !BROWSER
         const workspaceSubMenu: IMenu[] = [{
         const workspaceSubMenu: IMenu[] = [{
-            label: window.siyuan.languages.openWorkspace,
+            label: window.siyuan.languages.openBy + "...",
             iconHTML: Constants.ZWSP,
             iconHTML: Constants.ZWSP,
             click: async () => {
             click: async () => {
                 const localPath = await dialog.showOpenDialog({
                 const localPath = await dialog.showOpenDialog({
@@ -73,19 +73,12 @@ export const workspaceMenu = (rect: DOMRect) => {
         });
         });
         window.siyuan.menus.menu.append(new MenuItem({
         window.siyuan.menus.menu.append(new MenuItem({
             label: window.siyuan.languages.workspaceList,
             label: window.siyuan.languages.workspaceList,
+            icon: "iconFiles",
             type: "submenu",
             type: "submenu",
             submenu: workspaceSubMenu,
             submenu: workspaceSubMenu,
         }).element);
         }).element);
         /// #endif
         /// #endif
         window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
         window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
-        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 (!window.siyuan.config.readonly) {
             if (getOpenNotebookCount() < 2) {
             if (getOpenNotebookCount() < 2) {
                 window.siyuan.menus.menu.append(new MenuItem({
                 window.siyuan.menus.menu.append(new MenuItem({
@@ -138,6 +131,14 @@ export const workspaceMenu = (rect: DOMRect) => {
                 lockScreen();
                 lockScreen();
             }
             }
         }).element);
         }).element);
+        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);
         window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
         window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
         window.siyuan.menus.menu.append(new MenuItem({
         window.siyuan.menus.menu.append(new MenuItem({
             label: window.siyuan.languages.help,
             label: window.siyuan.languages.help,
@@ -192,6 +193,7 @@ const workspaceItem = (item: IWorkspace) => {
         label: `<div data-type="a" aria-label="${item.path}" class="fn__ellipsis" style="max-width: 256px">
         label: `<div data-type="a" aria-label="${item.path}" class="fn__ellipsis" style="max-width: 256px">
     ${originalPath().basename(item.path)}
     ${originalPath().basename(item.path)}
 </div>`,
 </div>`,
+        current: !item.closed,
         iconHTML: Constants.ZWSP,
         iconHTML: Constants.ZWSP,
         type: "submenu",
         type: "submenu",
         submenu: [{
         submenu: [{