github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 05:59:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Liang Ding 2022-06-05 15:16:46 +08:00
parent 872a6f43f0
commit 27c80da76d
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/api/history.go
View File

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

7
kernel/model/assets.go
View File

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