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

siyuan-note · Oct 3, 2022 · 658193a · 658193a
2 parents 4f9c1cb + 8cbdff7
commit 658193a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 3 deletions.
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "defBlock": "Def block",
+  "defBlockChildren": "Define block and its children",
   "filter": "Filter",
   "copyHeadings": "Copy Headings and Bottom Blocks",
   "tWithSubtitle":"Transformation with subtitles",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "defBlock": "Definir bloque",
+  "defBlockChildren": "Definir bloque y sus hijos",
   "filter": "Filtro",
   "copyHeadings": "Copiar encabezados y bloques inferiores",
   "tWithSubtitle": "Transformación con subtítulos",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "defBlock": "Définir le bloc",
+  "defBlockChildren": "Définir le bloc et ses enfants",
   "filter": "Filtre",
   "copyHeadings": "Copier les en-têtes et les blocs inférieurs",
   "tWithSubtitle": "Transformation avec sous-titres",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "defBlock": "定義塊",
+  "defBlockChildren": "定義塊及其子塊",
   "filter": "過濾",
   "copyHeadings": "複製標題及下方塊",
   "tWithSubtitle": "帶子標題轉換",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "defBlock": "定义块",
+  "defBlockChildren": "定义块及其子块",
   "filter": "过滤",
   "copyHeadings": "复制标题及下方块",
   "tWithSubtitle": "带子标题转换",

diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts
@@ -220,7 +220,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
         });
     }
     submenu.push({
-        label: "原始块",
+        label: window.siyuan.languages.defBlock,
         click() {
             fetchPost("/api/block/swapBlockRef", {
                 refID: id,
@@ -230,7 +230,7 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => {
         }
     });
     submenu.push({
-        label: "原始块及子块",
+        label: window.siyuan.languages.defBlockChildren,
         click() {
             fetchPost("/api/block/swapBlockRef", {
                 refID: id,

diff --git a/kernel/model/block.go b/kernel/model/block.go
@@ -129,12 +129,12 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
 
 	if ast.NodeListItem == defNode.Type {
 		if ast.NodeListItem == refNode.Type {
-			defNode.InsertAfter(refNode)
 			if !includeChildren {
 				for _, c := range defNodeChildren {
 					refNode.AppendChild(c)
 				}
 			}
+			defNode.InsertAfter(refNode)
 			refPivot.InsertAfter(defNode)
 		} else {
 			newID := ast.NewNodeID()