0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486 https://github.com/siyuan-note/siyuan/issues/11486

Browse source
This commit is contained in:
Daniel 2024-05-23 10:58:14 +08:00
parent d84baabc33
commit 8901bd3abc
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 32 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
kernel/model/export.go
View file

@ -2527,65 +2527,9 @@ type refAsFootnotes struct {
func exportRefTrees(tree *parse.Tree) (ret map[string]*parse.Tree) {
ret = map[string]*parse.Tree{}
exportRefTrees0(tree, &ret)
attrViewDefTrees := map[string]*parse.Tree{}
exportAttributeViewRefTrees0(tree, &attrViewDefTrees)
for _, t := range attrViewDefTrees {
if nil == ret[t.ID] {
ret[t.ID] = t
}
}
return
}
func exportAttributeViewRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
// 导出数据库所在文档时一并导出绑定块所在文档
// Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486
if nil != (*retTrees)[tree.ID] {
return
}
(*retTrees)[tree.ID] = tree
ast.Walk(tree.Root, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
return ast.WalkContinue
}
if ast.NodeAttributeView == n.Type {
avID := n.AttributeViewID
if "" == avID {
return ast.WalkContinue
}
attrView, _ := av.ParseAttributeView(avID)
if nil == attrView {
return ast.WalkContinue
}
blockKeyValues := attrView.GetBlockKeyValues()
if nil == blockKeyValues {
return ast.WalkContinue
}
for _, val := range blockKeyValues.Values {
defBlock := treenode.GetBlockTree(val.BlockID)
if nil == defBlock {
continue
}
defTree, _ := LoadTreeByBlockID(defBlock.RootID)
if nil == defTree {
continue
}
exportAttributeViewRefTrees0(defTree, retTrees)
}
}
return ast.WalkContinue
})
}
func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
if nil != (*retTrees)[tree.ID] {
return
@ -2612,6 +2556,38 @@ func exportRefTrees0(tree *parse.Tree, retTrees *map[string]*parse.Tree) {
}
exportRefTrees0(defTree, retTrees)
} else if ast.NodeAttributeView == n.Type {
// 导出数据库所在文档时一并导出绑定块所在文档
// Export the binding block docs when exporting the doc where the database is located https://github.com/siyuan-note/siyuan/issues/11486
avID := n.AttributeViewID
if "" == avID {
return ast.WalkContinue
}
attrView, _ := av.ParseAttributeView(avID)
if nil == attrView {
return ast.WalkContinue
}
blockKeyValues := attrView.GetBlockKeyValues()
if nil == blockKeyValues {
return ast.WalkContinue
}
for _, val := range blockKeyValues.Values {
defBlock := treenode.GetBlockTree(val.BlockID)
if nil == defBlock {
continue
}
defTree, _ := LoadTreeByBlockID(defBlock.RootID)
if nil == defTree {
continue
}
exportRefTrees0(defTree, retTrees)
}
}
return ast.WalkContinue
})