Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Daniel 2025-07-15 23:39:59 +08:00
parent 049b4d4b4b
commit 70e31c71cc
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
9 changed files with 59 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

40
kernel/api/block_op.go
View file

@ -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,19 +583,27 @@ 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 {
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)
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) // 将列表下的第一个列表项移到文档结尾，移动以后根下面直接挂列表项，渲染器可以正常工作
@ -617,7 +624,6 @@ func updateBlock(c *gin.Context) {
},
},
}
}
model.PerformTransactions(&transactions)
model.FlushTxQueue()
@ -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) {
}
}
if 0 < len(ops) {
tx.DoOperations = ops
model.PerformTransactions(&transactions)
model.FlushTxQueue()
ret.Data = transactions
broadcastTransactions(transactions)
}
}
func deleteBlock(c *gin.Context) {

2
kernel/model/assets.go
View file

@ -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)

4
kernel/model/bookmark.go
View file

@ -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
}

2
kernel/model/export.go
View file

@ -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
}
}

4
kernel/model/file.go
View file

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

2
kernel/model/format.go
View file

@ -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
}

2
kernel/model/search.go
View file

@ -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

4
kernel/model/tag.go
View file

@ -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
}

2
kernel/model/transaction.go
View file

@ -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
}