diff --git a/kernel/api/ui.go b/kernel/api/ui.go index a125ce20e..48707c688 100644 --- a/kernel/api/ui.go +++ b/kernel/api/ui.go @@ -29,14 +29,14 @@ func reloadTag(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) - util.PushReloadTag() + model.ReloadTag() } func reloadFiletree(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) - util.PushReloadFiletree() + model.ReloadFiletree() } func reloadProtyle(c *gin.Context) { diff --git a/kernel/model/format.go b/kernel/model/format.go index 031d849cd..2a324f47c 100644 --- a/kernel/model/format.go +++ b/kernel/model/format.go @@ -31,7 +31,7 @@ func AutoSpace(rootID string) (err error) { logging.LogInfof("formatting tree [%s]...", rootID) util.PushProtyleLoading(rootID, Conf.Language(116)) - defer util.PushReloadProtyle(rootID) + defer ReloadProtyle(rootID) FlushTxQueue() diff --git a/kernel/model/history.go b/kernel/model/history.go index 9afa8372b..5bbb6f564 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -318,8 +318,8 @@ func RollbackDocHistory(boxID, historyPath string) (err error) { if writeErr := indexWriteTreeIndexQueue(tree); nil != writeErr { return } - util.PushReloadFiletree() - util.PushReloadProtyle(rootID) + ReloadFiletree() + ReloadProtyle(rootID) util.PushMsg(Conf.Language(102), 3000) IncSync() diff --git a/kernel/model/push_reload.go b/kernel/model/push_reload.go index 71bb09992..086644384 100644 --- a/kernel/model/push_reload.go +++ b/kernel/model/push_reload.go @@ -104,6 +104,14 @@ func refreshDocInfo0(tree *parse.Tree, size uint64) { task.AppendAsyncTaskWithDelay(task.ReloadProtyle, 500*time.Millisecond, util.PushReloadDocInfo, docInfo) } +func ReloadFiletree() { + task.AppendAsyncTaskWithDelay(task.ReloadFiletree, 200*time.Millisecond, util.PushReloadFiletree) +} + +func ReloadTag() { + task.AppendAsyncTaskWithDelay(task.ReloadTag, 200*time.Millisecond, util.PushReloadTag) +} + func ReloadProtyle(rootID string) { // 刷新关联的引用 defTree, _ := LoadTreeByBlockID(rootID) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 47c9dac70..d0c01eb79 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1692,7 +1692,7 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult, upsertRootIDs, removeRootIDs := incReindex(upserts, removes) needReloadFiletree = !needReloadUI && (needReloadFiletree || 0 < len(upsertRootIDs) || 0 < len(removeRootIDs)) if needReloadFiletree { - util.PushReloadFiletree() + ReloadFiletree() } go func() { diff --git a/kernel/model/search.go b/kernel/model/search.go index 4875d7cfd..7f73554c9 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -800,7 +800,7 @@ func FindReplace(keyword, replacement string, replaceTypes map[string]bool, ids unlinks = append(unlinks, n) } - util.PushReloadTag() + ReloadTag() } else if n.IsTextMarkType("u") { if !replaceTypes["u"] { return ast.WalkContinue diff --git a/kernel/task/queue.go b/kernel/task/queue.go index 184275b9d..d1e07d846 100644 --- a/kernel/task/queue.go +++ b/kernel/task/queue.go @@ -136,6 +136,8 @@ const ( CacheVirtualBlockRef = "task.cache.virtualBlockRef" // 缓存虚拟块引用 ReloadAttributeView = "task.reload.attributeView" // 重新加载属性视图 ReloadProtyle = "task.reload.protyle" // 重新加载编辑器 + ReloadTag = "task.reload.tag" // 重新加载标签面板 + ReloadFiletree = "task.reload.filetree" // 重新加载文档树面板 SetRefDynamicText = "task.ref.setDynamicText" // 设置引用的动态锚文本 SetDefRefCount = "task.def.setRefCount" // 设置定义的引用计数 UpdateIDs = "task.update.ids" // 更新 ID @@ -156,6 +158,8 @@ var uniqueActions = []string{ AssetContentDatabaseIndexCommit, ReloadAttributeView, ReloadProtyle, + ReloadTag, + ReloadFiletree, SetRefDynamicText, SetDefRefCount, UpdateIDs,