mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-18 15:40:12 +01:00
🐛 After the document is transferred to the heading, occurs two copies of the reference block Fix https://github.com/siyuan-note/siyuan/issues/7819
This commit is contained in:
parent
c804ce77fc
commit
ee7ab26fcd
3 changed files with 31 additions and 1 deletions
|
|
@ -134,6 +134,10 @@ func Doc2Heading(srcID, targetID string, after bool) (srcTreeBox, srcTreePath st
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 移动前先删除引用 https://github.com/siyuan-note/siyuan/issues/7819
|
||||||
|
sql.DeleteRefsTreeQueue(srcTree)
|
||||||
|
sql.DeleteRefsTreeQueue(targetTree)
|
||||||
|
|
||||||
if ast.NodeListItem == pivot.Type {
|
if ast.NodeListItem == pivot.Type {
|
||||||
pivot = pivot.LastChild
|
pivot = pivot.LastChild
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,3 +47,13 @@ func upsertRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
|
||||||
err = insertRefs(tx, tree)
|
err = insertRefs(tx, tree)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func deleteRefs(tx *sql.Tx, tree *parse.Tree) (err error) {
|
||||||
|
if err = deleteRefsByPath(tx, tree.Box, tree.Path); nil != err {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = deleteFileAnnotationRefsByPath(tx, tree.Box, tree.Path); nil != err {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ type dbQueueOperation struct {
|
||||||
action string // upsert/delete/delete_id/rename/rename_sub_tree/delete_box/delete_box_refs/insert_refs/index/delete_ids/update_block_content/delete_assets
|
action string // upsert/delete/delete_id/rename/rename_sub_tree/delete_box/delete_box_refs/insert_refs/index/delete_ids/update_block_content/delete_assets
|
||||||
|
|
||||||
indexPath string // index
|
indexPath string // index
|
||||||
upsertTree *parse.Tree // upsert/insert_refs
|
upsertTree *parse.Tree // upsert/insert_refs/update_refs/delete_refs
|
||||||
removeTreeBox, removeTreePath string // delete
|
removeTreeBox, removeTreePath string // delete
|
||||||
removeTreeIDBox, removeTreeID string // delete_id
|
removeTreeIDBox, removeTreeID string // delete_id
|
||||||
removeTreeIDs []string // delete_ids
|
removeTreeIDs []string // delete_ids
|
||||||
|
|
@ -182,6 +182,8 @@ func execOp(op *dbQueueOperation, tx *sql.Tx, context map[string]interface{}) (e
|
||||||
err = insertRefs(tx, op.upsertTree)
|
err = insertRefs(tx, op.upsertTree)
|
||||||
case "update_refs":
|
case "update_refs":
|
||||||
err = upsertRefs(tx, op.upsertTree)
|
err = upsertRefs(tx, op.upsertTree)
|
||||||
|
case "delete_refs":
|
||||||
|
err = deleteRefs(tx, op.upsertTree)
|
||||||
case "update_block_content":
|
case "update_block_content":
|
||||||
err = updateBlockContent(tx, op.block)
|
err = updateBlockContent(tx, op.block)
|
||||||
case "delete_assets":
|
case "delete_assets":
|
||||||
|
|
@ -220,6 +222,20 @@ func UpdateBlockContentQueue(block *Block) {
|
||||||
operationQueue = append(operationQueue, newOp)
|
operationQueue = append(operationQueue, newOp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func DeleteRefsTreeQueue(tree *parse.Tree) {
|
||||||
|
dbQueueLock.Lock()
|
||||||
|
defer dbQueueLock.Unlock()
|
||||||
|
|
||||||
|
newOp := &dbQueueOperation{upsertTree: tree, inQueueTime: time.Now(), action: "delete_refs"}
|
||||||
|
for i, op := range operationQueue {
|
||||||
|
if "delete_refs" == op.action && op.upsertTree.ID == tree.ID {
|
||||||
|
operationQueue[i] = newOp
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
operationQueue = append(operationQueue, newOp)
|
||||||
|
}
|
||||||
|
|
||||||
func UpdateRefsTreeQueue(tree *parse.Tree) {
|
func UpdateRefsTreeQueue(tree *parse.Tree) {
|
||||||
dbQueueLock.Lock()
|
dbQueueLock.Lock()
|
||||||
defer dbQueueLock.Unlock()
|
defer dbQueueLock.Unlock()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue