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

siyuan-note · Dec 7, 2024 · dacbb22 · dacbb22
2 parents c18f710 + ff39ea8
commit dacbb22
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 18 deletions.
diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Es kann jeweils nur ein Dokument konvertiert werden",
   "empty": "Leer",
   "newRowInRelation": "Erstellen Sie einen neuen Eintrag in ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Primärschlüsseltext kopieren",

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Only one document can be converted at a time",
   "empty": "Empty",
   "newRowInRelation": "Create a new entry in ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copy primary key text",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Solo se puede convertir un documento a la vez",
   "empty": "Vacío",
   "newRowInRelation": "Crear una nueva entrada en ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copiar texto de la clave principal",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Vous ne pouvez convertir qu'un seul document à la fois",
   "empty": "Vide",
   "newRowInRelation": "Créer une nouvelle entrée dans ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copier le texte de la clé principale",

diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "ניתן להמיר רק מסמך אחד בכל פעם",
   "empty": "ריק",
   "newRowInRelation": "צור ערך חדש ב-${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "העתק טקסט מפתח ראשי",

diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "È possibile convertire solo un documento alla volta",
   "empty": "Vuoto",
   "newRowInRelation": "Crea una nuova voce in ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Copia il testo della chiave primaria",

diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "一度に変換できるドキュメントは1つだけです",
   "empty": "空白",
   "newRowInRelation": "${x} に新しい項目を作成 <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "主キーのテキストをコピー",

diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Można konwertować tylko jeden dokument na raz",
   "empty": "Pusty",
   "newRowInRelation": "Utwórz nowy wpis w ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Skopiuj tekst klucza głównego",

diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "Можно конвертировать только один документ за раз",
   "empty": "Пусто",
   "newRowInRelation": "Создать новую запись в ${x} <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "Скопировать текст основного ключа",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "每次只能轉換一個文檔",
   "empty": "空白",
   "newRowInRelation": "在 ${x} 中新建條目 <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "複製主鍵文本",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1,5 +1,4 @@
 {
-  "onlyOneDocConvert": "每次只能转换一个文档",
   "empty": "空白",
   "newRowInRelation": "在 ${x} 中新建条目 <b class='ft__on-surface'>${y}</b>",
   "copyKeyContent": "复制主键文本",

diff --git a/app/stage/protyle/js/lute/lute.min.js b/app/stage/protyle/js/lute/lute.min.js
diff --git a/kernel/go.mod b/kernel/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
 	github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
 	github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d
-	github.com/88250/lute v1.7.7-0.20241204161642-8a0f920b0d68
+	github.com/88250/lute v1.7.7-0.20241206153537-408cb4f3fbab
 	github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
 	github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
 	github.com/ConradIrwin/font v0.0.0-20240627033111-8567075b2bfe
@@ -57,7 +57,7 @@ require (
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/sashabaranov/go-openai v1.29.1
 	github.com/shirou/gopsutil/v3 v3.24.5
-	github.com/siyuan-note/dejavu v0.0.0-20241203001841-7d657c12d5dd
+	github.com/siyuan-note/dejavu v0.0.0-20241206093814-2bd2e504b64f
 	github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4
 	github.com/siyuan-note/eventbus v0.0.0-20240627125516-396fdb0f0f97
 	github.com/siyuan-note/filelock v0.0.0-20241202160444-1a99015900ff

diff --git a/kernel/go.sum b/kernel/go.sum
@@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
 github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d h1:dexFyk3UkR4c2xpyrC4Zk4L28xFbfLYAeowIW/7QYEA=
 github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
-github.com/88250/lute v1.7.7-0.20241204161642-8a0f920b0d68 h1:90W/4r6MrUEyseqm15ix0x8+xBiHEIDaXfWk92bn5qY=
-github.com/88250/lute v1.7.7-0.20241204161642-8a0f920b0d68/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
+github.com/88250/lute v1.7.7-0.20241206153537-408cb4f3fbab h1:TRN5UZIude8Gmks6ODC6bpT6MklMhBCDwjclpsX0YgQ=
+github.com/88250/lute v1.7.7-0.20241206153537-408cb4f3fbab/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
 github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM=
 github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=
@@ -341,8 +341,8 @@ github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+D
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
 github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
-github.com/siyuan-note/dejavu v0.0.0-20241203001841-7d657c12d5dd h1:WcgF6efOjk4sAcBudgAWRAWWyzv6Hf39PVS3onfQSqU=
-github.com/siyuan-note/dejavu v0.0.0-20241203001841-7d657c12d5dd/go.mod h1:Xu51gaOy8gup2N1q9xwdYdHDqKdCMLL7GiGEno3VnMQ=
+github.com/siyuan-note/dejavu v0.0.0-20241206093814-2bd2e504b64f h1:4NOFYagREPvdf24wG8rMd8qMW0BVnbArIHq4Js6XeyA=
+github.com/siyuan-note/dejavu v0.0.0-20241206093814-2bd2e504b64f/go.mod h1:Xu51gaOy8gup2N1q9xwdYdHDqKdCMLL7GiGEno3VnMQ=
 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4 h1:kJaw5L/evyW6LcB9IQT8PR4ppx8JVqOFP9Ix3rfwSrc=
 github.com/siyuan-note/encryption v0.0.0-20231219001248-1e028a4d13b4/go.mod h1:UYcCCY+0wh+GmUoDOaO63j1sV5lgy7laLAk1XhEiUis=
 github.com/siyuan-note/eventbus v0.0.0-20240627125516-396fdb0f0f97 h1:lM5v8BfNtbOL5jYwhCdMYBcYtr06IYBKjjSLAPMKTM8=

diff --git a/kernel/model/heading.go b/kernel/model/heading.go
@@ -122,6 +122,8 @@ func Doc2Heading(srcID, targetID string, after bool) (srcTreeBox, srcTreePath st
 		return
 	}
 
+	FlushTxQueue()
+
 	srcTree, _ := LoadTreeByBlockID(srcID)
 	if nil == srcTree {
 		err = ErrBlockNotFound
@@ -274,6 +276,8 @@ func Doc2Heading(srcID, targetID string, after bool) (srcTreeBox, srcTreePath st
 }
 
 func Heading2Doc(srcHeadingID, targetBoxID, targetPath, previousPath string) (srcRootBlockID, newTargetPath string, err error) {
+	FlushTxQueue()
+
 	srcTree, _ := LoadTreeByBlockID(srcHeadingID)
 	if nil == srcTree {
 		err = ErrBlockNotFound

diff --git a/kernel/model/listitem.go b/kernel/model/listitem.go
@@ -28,6 +28,8 @@ import (
 )
 
 func ListItem2Doc(srcListItemID, targetBoxID, targetPath, previousPath string) (srcRootBlockID, newTargetPath string, err error) {
+	FlushTxQueue()
+
 	srcTree, _ := LoadTreeByBlockID(srcListItemID)
 	if nil == srcTree {
 		err = ErrBlockNotFound