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

🎨 Improve reference count update after moving container blocks https://github.com/siyuan-note/siyuan/issues/15289

Browse source
This commit is contained in:
Daniel 2025-07-17 12:00:07 +08:00
parent d58829a855
commit d3357af944
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/model/push_reload.go
View file

@ -206,9 +206,9 @@ func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTrees
// 1. 更新引用的动态锚文本 // 1. 更新引用的动态锚文本
treeRefNodeIDs := map[string]*hashset.Set{} treeRefNodeIDs := map[string]*hashset.Set{}
var changedParentNodes []*ast.Node var changedNodes []*ast.Node
for _, updateNode := range updatedDefNodes { for _, updateNode := range updatedDefNodes {
refs, parentNodes := getRefsCacheByDefNode(updateNode) refs, parentNodes, childNodes := getRefsCacheByDefNode(updateNode)
for _, ref := range refs { for _, ref := range refs {
if refIDs, ok := treeRefNodeIDs[ref.RootID]; !ok { if refIDs, ok := treeRefNodeIDs[ref.RootID]; !ok {
refIDs = hashset.New() refIDs = hashset.New()
@ -219,13 +219,14 @@ func refreshDynamicRefTexts0(updatedDefNodes map[string]*ast.Node, updatedTrees
} }
} }
if 0 < len(parentNodes) { if 0 < len(parentNodes) {
changedParentNodes = append(changedParentNodes, parentNodes...) changedNodes = append(changedNodes, parentNodes...)
}
if 0 < len(childNodes) {
changedNodes = append(changedNodes, childNodes...)
} }
} }
if 0 < len(changedParentNodes) { for _, n := range changedNodes {
for _, parent := range changedParentNodes { updatedDefNodes[n.ID] = n
updatedDefNodes[parent.ID] = parent
}
} }
changedRefTree := map[string]*parse.Tree{} changedRefTree := map[string]*parse.Tree{}

19
kernel/model/transaction.go
View file

@ -1612,10 +1612,10 @@ func (tx *Transaction) writeTree(tree *parse.Tree) (err error) {
return return
} }
func getRefsCacheByDefNode(updateNode *ast.Node) (ret []*sql.Ref, changedParentNodes []*ast.Node) { func getRefsCacheByDefNode(updateNode *ast.Node) (ret []*sql.Ref, changedParentNodes, changedChildNodes []*ast.Node) {
ret = sql.GetRefsCacheByDefID(updateNode.ID) ret = sql.GetRefsCacheByDefID(updateNode.ID)
if nil != updateNode.Parent && ast.NodeDocument != updateNode.Parent.Type && if nil != updateNode.Parent && ast.NodeDocument != updateNode.Parent.Type &&
updateNode.Parent.IsContainerBlock() && updateNode == treenode.FirstLeafBlock(updateNode.Parent) { // 容器块下第一个叶子块 updateNode.Parent.IsContainerBlock() && updateNode == treenode.FirstLeafBlock(updateNode.Parent) {
// 如果是容器块下第一个叶子块，则需要向上查找引用 // 如果是容器块下第一个叶子块，则需要向上查找引用
for parent := updateNode.Parent; nil != parent; parent = parent.Parent { for parent := updateNode.Parent; nil != parent; parent = parent.Parent {
if ast.NodeDocument == parent.Type { if ast.NodeDocument == parent.Type {
@ -1629,6 +1629,21 @@ func getRefsCacheByDefNode(updateNode *ast.Node) (ret []*sql.Ref, changedParentN
} }
} }
} }
if ast.NodeDocument != updateNode.Type && updateNode.IsContainerBlock() {
// 如果是容器块，则需要向下查找引用
ast.Walk(updateNode, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
childRefs := sql.GetRefsCacheByDefID(n.ID)
if 0 < len(childRefs) {
ret = append(ret, childRefs...)
changedChildNodes = append(changedChildNodes, n)
}
return ast.WalkContinue
})
}
return return
} }