瀏覽代碼

:art: 消息提示支持显示多条 https://github.com/siyuan-note/siyuan/issues/4875

Liang Ding 3 年之前
父節點
當前提交
27c80da76d
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 2 1
      kernel/api/history.go
  2. 5 2
      kernel/model/assets.go

+ 2 - 1
kernel/api/history.go

@@ -62,7 +62,7 @@ func clearWorkspaceHistory(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)
 
-	util.PushMsg(model.Conf.Language(100), 1000*60*15)
+	msgId := util.PushMsg(model.Conf.Language(100), 1000*60*15)
 	time.Sleep(3 * time.Second)
 	err := model.ClearWorkspaceHistory()
 	if nil != err {
@@ -70,6 +70,7 @@ func clearWorkspaceHistory(c *gin.Context) {
 		ret.Msg = err.Error()
 		return
 	}
+	util.PushClearMsg(msgId)
 	util.PushMsg(model.Conf.Language(99), 1000*5)
 }
 

+ 5 - 2
kernel/model/assets.go

@@ -370,8 +370,11 @@ func saveWorkspaceAssets(assets []string) {
 }
 
 func RemoveUnusedAssets() (ret []string) {
-	util.PushMsg(Conf.Language(100), 30*1000)
-	defer util.PushMsg(Conf.Language(99), 3000)
+	msgId := util.PushMsg(Conf.Language(100), 30*1000)
+	defer func() {
+		util.PushClearMsg(msgId)
+		util.PushMsg(Conf.Language(99), 3000)
+	}()
 
 	ret = []string{}
 	unusedAssets := UnusedAssets()