Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-22 17:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 数据历史文档中支持操作类型过滤 https://github.com/siyuan-note/siyuan/issues/5754

Browse source
This commit is contained in:
Liang Ding 2022-08-29 23:46:46 +08:00
parent 5be606ad3c
commit 05c0de4922
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 25 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

63
kernel/api/history.go
View file

@ -35,6 +35,15 @@ func searchHistory(c *gin.Context) {
return
}
notebook := ""
if nil != arg["notebook"] {
notebook = arg["notebook"].(string)
}
typ := model.HistoryTypeDoc
if nil != arg["type"] {
typ = int(arg["type"].(float64))
}
query := arg["query"].(string)
page := 1
if nil != arg["page"] {
@ -44,7 +53,7 @@ func searchHistory(c *gin.Context) {
if nil != arg["op"] {
op = arg["op"].(string)
}
histories, pageCount, totalCount := model.FullTextSearchHistory(query, op, page)
histories, pageCount, totalCount := model.FullTextSearchHistory(query, notebook, op, typ, page)
ret.Data = map[string]interface{}{
"histories": histories,
"pageCount": pageCount,
@ -80,31 +89,6 @@ func getNotebookHistory(c *gin.Context) {
}
}
func getAssetsHistory(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
page := 1
if nil != arg["page"] {
page = int(arg["page"].(float64))
}
histories, err := model.GetAssetsHistory(page)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
ret.Data = map[string]interface{}{
"histories": histories,
}
}
func clearWorkspaceHistory(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
@ -122,33 +106,6 @@ func clearWorkspaceHistory(c *gin.Context) {
util.PushMsg(model.Conf.Language(99), 1000*5)
}
func getDocHistory(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
notebook := arg["notebook"].(string)
page := 1
if nil != arg["page"] {
page = int(arg["page"].(float64))
}
histories, err := model.GetDocHistory(notebook, page)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
ret.Data = map[string]interface{}{
"box": notebook,
"histories": histories,
}
}
func getDocHistoryContent(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)