Merge remote-tracking branch 'origin/dev' into dev

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?",
@@ -14,6 +15,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",

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?",
@@ -14,6 +15,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",

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 ?",
@@ -14,6 +15,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é",

app/appearance/langs/zh_CHT.json

@@ -1,5 +1,6 @@
 {
-  "opendWorkspace": "已打開的工作空間",
+  "openWorkspace": "打開工作空間",
+  "openedWorkspace": "已打開的工作空間",
   "removeWorkspaceTip": "刪除工作空間後無法恢復，確定刪除嗎？",
   "new": "新建",
   "share2LiandiConfirmTip": "確定將該文檔分享到鏈滴嗎？",
@@ -14,6 +15,7 @@
   "recentDocs": "最近打開的文檔",
   "autoLaunch": "開機自動啟動",
   "autoLaunchTip": "啟用後會在登錄操作系統後自動啟動應用",
+  "sortByContent": "按原文內容順序",
   "sortByRankDesc": "按相關度降序",
   "sortByRankAsc": "按相關度升序",
   "saveCriterion": "保存命名查詢",

app/appearance/langs/zh_CN.json

@@ -1,5 +1,6 @@
 {
-  "opendWorkspace": "已打开的工作空间",
+  "openWorkspace": "打开工作空间",
+  "openedWorkspace": "已打开的工作空间",
   "removeWorkspaceTip": "删除工作空间后无法恢复，确定删除吗？",
   "new": "新建",
   "share2LiandiConfirmTip": "确定将该文档分享到链滴吗？",
@@ -14,6 +15,7 @@
   "recentDocs": "最近打开的文档",
   "autoLaunch": "开机自动启动",
   "autoLaunchTip": "启用后会在登录操作系统后自动启动应用",
+  "sortByContent": "按原文内容顺序",
   "sortByRankDesc": "按相关度降序",
   "sortByRankAsc": "按相关度升序",
   "saveCriterion": "保存命名查询",

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) => {

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;

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
 	}