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 fold heading editing https://github.com/siyuan-note/siyuan/issues/15848

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-09-29 18:20:39 +08:00
parent 896d4c595b
commit 36a31c0503
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
kernel/model/transaction.go
View file

@ -906,6 +906,23 @@ func (tx *Transaction) doDelete(operation *Operation) (ret *TxErr) {
task.AppendAsyncTaskWithDelay(task.SetDefRefCount, util.SQLFlushInterval, refreshRefCount, defID) task.AppendAsyncTaskWithDelay(task.SetDefRefCount, util.SQLFlushInterval, refreshRefCount, defID)
} }
if parentFoldedHeading := treenode.GetParentFoldedHeading(node); nil != parentFoldedHeading {
children := treenode.HeadingChildren(parentFoldedHeading)
for _, child := range children {
ast.Walk(child, func(n *ast.Node, entering bool) ast.WalkStatus {
if !entering || !n.IsBlock() {
return ast.WalkContinue
}
n.RemoveIALAttr("fold")
n.RemoveIALAttr("heading-fold")
return ast.WalkContinue
})
}
parentFoldedHeading.RemoveIALAttr("fold")
parentFoldedHeading.RemoveIALAttr("heading-fold")
}
parent := node.Parent parent := node.Parent
if nil != node.Next && ast.NodeKramdownBlockIAL == node.Next.Type && bytes.Contains(node.Next.Tokens, []byte(node.ID)) { if nil != node.Next && ast.NodeKramdownBlockIAL == node.Next.Type && bytes.Contains(node.Next.Tokens, []byte(node.ID)) {
// 列表块撤销状态异常 https://github.com/siyuan-note/siyuan/issues/3985 // 列表块撤销状态异常 https://github.com/siyuan-note/siyuan/issues/3985
@ -1282,10 +1299,12 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
return ast.WalkContinue return ast.WalkContinue
} }
n.SetIALAttr("fold", "1") n.RemoveIALAttr("fold")
n.SetIALAttr("heading-fold", "1") n.RemoveIALAttr("heading-fold")
return ast.WalkContinue return ast.WalkContinue
}) })
parentFoldedHeading.RemoveIALAttr("fold")
parentFoldedHeading.RemoveIALAttr("heading-fold")
} }
} else { } else {
node = treenode.GetNodeInTree(tree, operation.ParentID) node = treenode.GetNodeInTree(tree, operation.ParentID)
@ -1537,8 +1556,7 @@ func (tx *Transaction) doUpdate(operation *Operation) (ret *TxErr) {
oldNode.InsertAfter(updatedNode) oldNode.InsertAfter(updatedNode)
oldNode.Unlink() oldNode.Unlink()
parentFoldedHeading := treenode.GetParentFoldedHeading(updatedNode) if parentFoldedHeading := treenode.GetParentFoldedHeading(updatedNode); nil != parentFoldedHeading {
if nil != parentFoldedHeading {
children := treenode.HeadingChildren(parentFoldedHeading) children := treenode.HeadingChildren(parentFoldedHeading)
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 {
@ -1546,11 +1564,13 @@ func (tx *Transaction) doUpdate(operation *Operation) (ret *TxErr) {
return ast.WalkContinue return ast.WalkContinue
} }
n.SetIALAttr("fold", "1") n.RemoveIALAttr("fold")
n.SetIALAttr("heading-fold", "1") n.RemoveIALAttr("heading-fold")
return ast.WalkContinue return ast.WalkContinue
}) })
} }
parentFoldedHeading.RemoveIALAttr("fold")
parentFoldedHeading.RemoveIALAttr("heading-fold")
} }
createdUpdated(updatedNode) createdUpdated(updatedNode)