🧑‍💻 Improve kernel API /api/block/updateBlock and /api/block/batchUpdateBlock https://github.com/siyuan-note/siyuan/issues/15301

kernel/api/block_op.go

@@ -575,7 +575,6 @@ func updateBlock(c *gin.Context) {
 		return
 	}
 
-	var transactions []*model.Transaction
 	if "NodeDocument" == block.Type {
 		oldTree, err := filesys.LoadTree(block.Box, block.Path, luteEngine)
 		if err != nil {
@@ -584,39 +583,46 @@ func updateBlock(c *gin.Context) {
 			return
 		}
 		var toRemoves []*ast.Node
-		var ops []*model.Operation
 		for n := oldTree.Root.FirstChild; nil != n; n = n.Next {
 			toRemoves = append(toRemoves, n)
-			ops = append(ops, &model.Operation{Action: "delete", ID: n.ID})
 		}
 		for _, n := range toRemoves {
 			n.Unlink()
 		}
-		ops = append(ops, &model.Operation{Action: "appendInsert", Data: data, ParentID: id})
-		transactions = append(transactions, &model.Transaction{
-			DoOperations: ops,
-		})
-	} else {
-		if "NodeListItem" == block.Type && ast.NodeList == tree.Root.FirstChild.Type {
-			// 使用 API `api/block/updateBlock` 更新列表项时渲染错误 https://github.com/siyuan-note/siyuan/issues/4658
-			tree.Root.AppendChild(tree.Root.FirstChild.FirstChild) // 将列表下的第一个列表项移到文档结尾，移动以后根下面直接挂列表项，渲染器可以正常工作
-			tree.Root.FirstChild.Unlink()                          // 删除列表
-			tree.Root.FirstChild.Unlink()                          // 继续删除列表 IAL
-		}
-		tree.Root.FirstChild.SetIALAttr("id", id)
 
-		data = luteEngine.Tree2BlockDOM(tree, luteEngine.RenderOptions)
+		var toAppends []*ast.Node
-		transactions = []*model.Transaction{
+		for n := tree.Root.FirstChild; nil != n; n = n.Next {
-			{
+			toAppends = append(toAppends, n)
-				DoOperations: []*model.Operation{
+		}
-					{
+		for _, n := range toAppends {
-						Action: "update",
+			oldTree.Root.AppendChild(n)
-						ID:     id,
+		}
-						Data:   data,
+
-					},
+		model.WriteTreeUpsertQueue(oldTree)
+		model.ReloadProtyle(id)
+		return
+	}
+
+	var transactions []*model.Transaction
+	if "NodeListItem" == block.Type && ast.NodeList == tree.Root.FirstChild.Type {
+		// 使用 API `api/block/updateBlock` 更新列表项时渲染错误 https://github.com/siyuan-note/siyuan/issues/4658
+		tree.Root.AppendChild(tree.Root.FirstChild.FirstChild) // 将列表下的第一个列表项移到文档结尾，移动以后根下面直接挂列表项，渲染器可以正常工作
+		tree.Root.FirstChild.Unlink()                          // 删除列表
+		tree.Root.FirstChild.Unlink()                          // 继续删除列表 IAL
+	}
+	tree.Root.FirstChild.SetIALAttr("id", id)
+
+	data = luteEngine.Tree2BlockDOM(tree, luteEngine.RenderOptions)
+	transactions = []*model.Transaction{
+		{
+			DoOperations: []*model.Operation{
+				{
+					Action: "update",
+					ID:     id,
+					Data:   data,
 				},
 			},
-		}
+		},
 	}
 
 	model.PerformTransactions(&transactions)
@@ -704,15 +710,22 @@ func batchUpdateBlock(c *gin.Context) {
 				return
 			}
 			var toRemoves []*ast.Node
-
 			for n := oldTree.Root.FirstChild; nil != n; n = n.Next {
 				toRemoves = append(toRemoves, n)
-				ops = append(ops, &model.Operation{Action: "delete", ID: n.ID})
 			}
 			for _, n := range toRemoves {
 				n.Unlink()
 			}
-			ops = append(ops, &model.Operation{Action: "appendInsert", Data: data, ParentID: id})
+			var toAppends []*ast.Node
+			for n := tree.Root.FirstChild; nil != n; n = n.Next {
+				toAppends = append(toAppends, n)
+			}
+			for _, n := range toAppends {
+				oldTree.Root.AppendChild(n)
+			}
+
+			model.WriteTreeUpsertQueue(oldTree)
+			model.ReloadProtyle(id)
 		} else {
 			if "NodeListItem" == block.Type && ast.NodeList == tree.Root.FirstChild.Type {
 				// 使用 API `api/block/updateBlock` 更新列表项时渲染错误 https://github.com/siyuan-note/siyuan/issues/4658
@@ -731,13 +744,14 @@ func batchUpdateBlock(c *gin.Context) {
 		}
 	}
 
-	tx.DoOperations = ops
+	if 0 < len(ops) {
-	model.PerformTransactions(&transactions)
+		tx.DoOperations = ops
-	model.FlushTxQueue()
+		model.PerformTransactions(&transactions)
-
+		model.FlushTxQueue()
-	ret.Data = transactions
-	broadcastTransactions(transactions)
 
+		ret.Data = transactions
+		broadcastTransactions(transactions)
+	}
 }
 
 func deleteBlock(c *gin.Context) {

kernel/model/assets.go

@@ -321,7 +321,7 @@ func NetAssets2LocalAssets(rootID string, onlyImg bool, originalURL string) (err
 	util.PushClearMsg(msgId)
 	if 0 < files {
 		msgId = util.PushMsg(Conf.Language(113), 7000)
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			return
 		}
 		util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(120), files), 5000)

kernel/model/bookmark.go

@@ -66,7 +66,7 @@ func RemoveBookmark(bookmark string) (err error) {
 		}
 
 		util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			util.ClearPushProgress(100)
 			return
 		}
@@ -124,7 +124,7 @@ func RenameBookmark(oldBookmark, newBookmark string) (err error) {
 		}
 
 		util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			util.ClearPushProgress(100)
 			return
 		}

kernel/model/export.go

@@ -310,7 +310,7 @@ func Export2Liandi(id string) (err error) {
 		articleId = result.Data.(string)
 		tree, _ = LoadTreeByBlockID(id) // 这里必须重新加载，因为前面导出时已经修改了树结构
 		tree.Root.SetIALAttr(liandiArticleIdAttrName, articleId)
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			return
 		}
 	}

kernel/model/file.go

@@ -922,7 +922,7 @@ func loadNodesByMode(node *ast.Node, inputIndex, mode, size int, isDoc, isHeadin
 	return
 }
 
-func writeTreeUpsertQueue(tree *parse.Tree) (err error) {
+func WriteTreeUpsertQueue(tree *parse.Tree) (err error) {
 	size, err := filesys.WriteTree(tree)
 	if err != nil {
 		return
@@ -944,7 +944,7 @@ func indexWriteTreeIndexQueue(tree *parse.Tree) (err error) {
 
 func indexWriteTreeUpsertQueue(tree *parse.Tree) (err error) {
 	treenode.UpsertBlockTree(tree)
-	return writeTreeUpsertQueue(tree)
+	return WriteTreeUpsertQueue(tree)
 }
 
 func renameWriteJSONQueue(tree *parse.Tree) (err error) {

kernel/model/format.go

@@ -68,7 +68,7 @@ func AutoSpace(rootID string) (err error) {
 	newTree.Path = tree.Path
 	newTree.HPath = tree.HPath
 	newTree.Box = tree.Box
-	err = writeTreeUpsertQueue(newTree)
+	err = WriteTreeUpsertQueue(newTree)
 	if err != nil {
 		return
 	}

kernel/model/search.go

@@ -932,7 +932,7 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids
 			}
 		}
 
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			return
 		}
 		updateNodes[id] = node

kernel/model/tag.go

@@ -96,7 +96,7 @@ func RemoveTag(label string) (err error) {
 			n.Unlink()
 		}
 		util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			util.ClearPushProgress(100)
 			return
 		}
@@ -195,7 +195,7 @@ func RenameTag(oldLabel, newLabel string) (err error) {
 			updateNodes[node.ID] = node
 		}
 		util.PushEndlessProgress(fmt.Sprintf(Conf.Language(111), util.EscapeHTML(tree.Root.IALAttr("title"))))
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			util.ClearPushProgress(100)
 			return
 		}

kernel/model/transaction.go

@@ -1553,7 +1553,7 @@ func (tx *Transaction) begin() (err error) {
 
 func (tx *Transaction) commit() (err error) {
 	for _, tree := range tx.trees {
-		if err = writeTreeUpsertQueue(tree); err != nil {
+		if err = WriteTreeUpsertQueue(tree); err != nil {
 			return
 		}