mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-06 16:58:49 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
55371ed04d
2 changed files with 4 additions and 1 deletions
|
|
@ -128,6 +128,8 @@ func TransferBlockRef(fromID, toID string) (err error) {
|
|||
}
|
||||
toRefText := getNodeRefText(toNode)
|
||||
|
||||
util.PushMsg(Conf.Language(116), 7000)
|
||||
|
||||
refIDs, _ := sql.QueryRefIDsByDefID(fromID, false)
|
||||
for _, refID := range refIDs {
|
||||
tree, _ := loadTreeByBlockID(refID)
|
||||
|
|
@ -150,6 +152,7 @@ func TransferBlockRef(fromID, toID string) (err error) {
|
|||
}
|
||||
}
|
||||
|
||||
sql.WaitForWritingDatabase()
|
||||
util.ReloadUI()
|
||||
return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -506,7 +506,6 @@ func ReloadUI() {
|
|||
|
||||
func FullReindex() {
|
||||
task.PrependTask(task.DatabaseIndexFull, fullReindex)
|
||||
task.AppendTask(task.DatabaseIndexRef, IndexRefs)
|
||||
}
|
||||
|
||||
func fullReindex() {
|
||||
|
|
@ -527,6 +526,7 @@ func fullReindex() {
|
|||
sql.EnableCache()
|
||||
treenode.SaveBlockTree(true)
|
||||
LoadFlashcards()
|
||||
IndexRefs()
|
||||
debug.FreeOSMemory()
|
||||
util.ReloadUI()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue