github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 19:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa 2023-10-26 11:50:20 +08:00
commit cc1f8fa15a
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/model/heading.go
View File

@ -50,6 +50,10 @@ func (tx *Transaction) doFoldHeading(operation *Operation) (ret *TxErr) {
for _, child := range children { for _, child := range children {
childrenIDs = append(childrenIDs, child.ID) childrenIDs = append(childrenIDs, child.ID)
ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus { ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
n.SetIALAttr("fold", "1") n.SetIALAttr("fold", "1")
n.SetIALAttr("heading-fold", "1") n.SetIALAttr("heading-fold", "1")
return ast.WalkContinue return ast.WalkContinue
@ -86,6 +90,10 @@ func (tx *Transaction) doUnfoldHeading(operation *Operation) (ret *TxErr) {
children := treenode.HeadingChildren(heading) children := treenode.HeadingChildren(heading)
for _, child := range children { for _, child := range children {
ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus { ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering {
return ast.WalkContinue
}
n.RemoveIALAttr("heading-fold") n.RemoveIALAttr("heading-fold")
n.RemoveIALAttr("fold") n.RemoveIALAttr("fold")
return ast.WalkContinue return ast.WalkContinue
@ -104,7 +112,6 @@ func (tx *Transaction) doUnfoldHeading(operation *Operation) (ret *TxErr) {
} }
sql.UpsertTreeQueue(tree) sql.UpsertTreeQueue(tree)
children = treenode.HeadingChildren(heading)
luteEngine := NewLute() luteEngine := NewLute()
operation.RetData = renderBlockDOMByNodes(children, luteEngine) operation.RetData = renderBlockDOMByNodes(children, luteEngine)
return return
@ -307,14 +314,21 @@ func Heading2Doc(srcHeadingID, targetBoxID, targetPath string) (srcRootBlockID,
// 折叠标题转换为文档时需要自动展开下方块 https://github.com/siyuan-note/siyuan/issues/2947 // 折叠标题转换为文档时需要自动展开下方块 https://github.com/siyuan-note/siyuan/issues/2947
children := treenode.HeadingChildren(headingNode) children := treenode.HeadingChildren(headingNode)
for _, child := range children { for _, child := range children {
child.RemoveIALAttr("heading-fold") ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus {
child.RemoveIALAttr("fold") if !entering {
return ast.WalkContinue
}
n.RemoveIALAttr("heading-fold")
n.RemoveIALAttr("fold")
return ast.WalkContinue
})
} }
headingNode.RemoveIALAttr("fold") headingNode.RemoveIALAttr("fold")
headingNode.RemoveIALAttr("heading-fold")
luteEngine := util.NewLute() luteEngine := util.NewLute()
newTree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument, ID: srcHeadingID}, Context: &parse.Context{ParseOption: luteEngine.ParseOptions}} newTree := &parse.Tree{Root: &ast.Node{Type: ast.NodeDocument, ID: srcHeadingID}, Context: &parse.Context{ParseOption: luteEngine.ParseOptions}}
children = treenode.HeadingChildren(headingNode)
for _, c := range children { for _, c := range children {
newTree.Root.AppendChild(c) newTree.Root.AppendChild(c)
} }