From 48548de9be6b8d9b269fb2c8dccf5ea8ee65c0f1 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 9 Jan 2023 15:53:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E8=87=AA=E5=8A=A8=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B4=A2=E5=BC=95=20https:?= =?UTF-8?q?//github.com/siyuan-note/siyuan/issues/7016?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/transaction.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 92dc9be46..4992a1b41 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -20,6 +20,7 @@ import ( "bytes" "errors" "fmt" + "os" "path" "path/filepath" "strings" @@ -1295,6 +1296,10 @@ func reindexTree(rootID string, i, size int) { tree, err := LoadTree(root.BoxID, root.Path) if nil != err { + if os.IsNotExist(err) { + // 文件系统上没有找到该 .sy 文件，则订正块树 + treenode.RemoveBlockTreesByRootID(rootID) + } return } From 698d659efdf0d8c193936ce05b6e76b1be898b25 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 9 Jan 2023 16:02:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=8E=92=E5=BA=8F=E8=8F=9C=E5=8D=95=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/search/util.ts | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index bfaf29930..d7fb0f404 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -14,6 +14,7 @@ "recentDocs": "Recently opened documents", "autoLaunch": "Automatic launch at boot", "autoLaunchTip": "After enabling, the application will be automatically launched after logging into the operating system", + "sortByContent": "Original content order", "sortByRankDesc": "Relevance DESC", "sortByRankAsc": "Relevance ASC", "saveCriterion": "Save named criterion", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 057ca5592..a0bc4d887 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -14,6 +14,7 @@ "recentDocs": "Documentos abiertos recientemente", "autoLaunch": "Inicio automático al arrancar", "autoLaunchTip": "Después de habilitar, la aplicación se iniciará automáticamente después de iniciar sesión en el sistema operativo", + "sortByContent": "Orden de contenido original", "sortByRankDesc": "Relevancia DESC", "sortByRankAsc": "Relevancia ASC", "saveCriterion": "Guardar criterio nombrado", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index fec071b1e..74bcee165 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -14,6 +14,7 @@ "recentDocs": "Documents récemment ouverts", "autoLaunch": "Lancement automatique au démarrage", "autoLaunchTip": "Après l'activation, l'application sera automatiquement lancée après la connexion au système d'exploitation", + "sortByContent": "Ordre du contenu original", "sortByRankDesc": "DESC de pertinence", "sortByRankAsc": "ASC de pertinence", "saveCriterion": "Enregistrer le critère nommé", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index c374f55f1..4a6b13493 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -14,6 +14,7 @@ "recentDocs": "最近打開的文檔", "autoLaunch": "開機自動啟動", "autoLaunchTip": "啟用後會在登錄操作系統後自動啟動應用", + "sortByContent": "按原文內容順序", "sortByRankDesc": "按相關度降序", "sortByRankAsc": "按相關度升序", "saveCriterion": "保存命名查詢", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 16a301d47..635c437c2 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -14,6 +14,7 @@ "recentDocs": "最近打开的文档", "autoLaunch": "开机自动启动", "autoLaunchTip": "启用后会在登录操作系统后自动启动应用", + "sortByContent": "按原文内容顺序", "sortByRankDesc": "按相关度降序", "sortByRankAsc": "按相关度升序", "saveCriterion": "保存命名查询", diff --git a/app/src/search/util.ts b/app/src/search/util.ts index f29936802..987bd80d0 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -666,7 +666,7 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element: }]; if (config.group === 1) { sortMenu.push({ - label: window.siyuan.languages.context, + label: window.siyuan.languages.sortByContent, current: config.sort === 5, click() { config.sort = 5; From 6cfbffa7c94956d28df10372d6e337051e26933f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 9 Jan 2023 16:08:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=A9=BA=E9=97=B4=E8=8F=9C=E5=8D=95=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 3 ++- app/appearance/langs/es_ES.json | 3 ++- app/appearance/langs/fr_FR.json | 3 ++- app/appearance/langs/zh_CHT.json | 3 ++- app/appearance/langs/zh_CN.json | 3 ++- app/src/menus/workspace.ts | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index d7fb0f404..f0d18ac5c 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,5 +1,6 @@ { - "opendWorkspace": "Opened Workspace", + "openWorkspace": "Open Workspace", + "openedWorkspace": "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 a0bc4d887..a3993a5e1 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,5 +1,6 @@ { - "opendWorkspace": "Espacio de trabajo abierto", + "openWorkspace": "Abrir espacio de trabajo", + "openedWorkspace": "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 74bcee165..021cf1b3f 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,5 +1,6 @@ { - "opendWorkspace": "Espace de travail ouvert", + "openWorkspace": "Ouvrir l'espace de travail", + "openedWorkspace": "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 4a6b13493..55bea89b0 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,5 +1,6 @@ { - "opendWorkspace": "已打開的工作空間", + "openWorkspace": "打開工作空間", + "openedWorkspace": "已打開的工作空間", "removeWorkspaceTip": "刪除工作空間後無法恢復，確定刪除嗎？", "new": "新建", "share2LiandiConfirmTip": "確定將該文檔分享到鏈滴嗎？", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 635c437c2..7c6c6f75f 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,5 +1,6 @@ { - "opendWorkspace": "已打开的工作空间", + "openWorkspace": "打开工作空间", + "openedWorkspace": "已打开的工作空间", "removeWorkspaceTip": "删除工作空间后无法恢复，确定删除吗？", "new": "新建", "share2LiandiConfirmTip": "确定将该文档分享到链滴吗？", diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index 5a37c0ace..9c7c09262 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -89,7 +89,7 @@ export const workspaceMenu = (rect: DOMRect) => { }).element); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.opendWorkspace, + label: window.siyuan.languages.openedWorkspace, type: "readonly" }).element); response.data.forEach((item: IWorkspace) => {