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

🐛 当块引用与所引用内容位于同一个文档时，块引用与所引用的内容块进行交换功能异常 Fix https://github.com/siyuan-note/insider/issues/1085

Browse source
This commit is contained in:
Liang Ding 2022-10-04 12:26:44 +08:00
parent e59167912e
commit 63de0c79f9
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/model/block.go
View file

@ -106,7 +106,13 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
if nil != err { if nil != err {
return return
} }
defNode := treenode.GetNodeInTree(defTree, defID) sameTree := defTree.ID == refTree.ID
var defNode *ast.Node
if !sameTree {
defNode = treenode.GetNodeInTree(defTree, defID)
} else {
defNode = treenode.GetNodeInTree(refTree, defID)
}
if nil == defNode { if nil == defNode {
return return
} }
@ -185,9 +191,11 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
if err = writeJSONQueue(refTree); nil != err { if err = writeJSONQueue(refTree); nil != err {
return return
} }
treenode.ReindexBlockTree(defTree) if !sameTree {
if err = writeJSONQueue(defTree); nil != err { treenode.ReindexBlockTree(defTree)
return if err = writeJSONQueue(defTree); nil != err {
return
}
} }
WaitForWritingFiles() WaitForWritingFiles()
util.ReloadUI() util.ReloadUI()