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

🎨 搜索 指定路径 支持多选 https://github.com/siyuan-note/siyuan/issues/6743

Browse source
This commit is contained in:
Liang Ding 2022-11-29 23:21:19 +08:00
parent 85477cc30a
commit 891f765cfb
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 67 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/api/search.go
View file

@ -194,15 +194,18 @@ func fullTextSearchBlock(c *gin.Context) {
}
query := arg["query"].(string)
pathArg := arg["path"]
var path string
if nil != pathArg {
path = pathArg.(string)
}
var box string
if "" != path {
box = strings.Split(path, "/")[0]
path = strings.TrimPrefix(path, box)
pathsArg := arg["paths"]
var paths, boxes []string
if nil != pathsArg {
for _, p := range pathsArg.([]interface{}) {
path := p.(string)
box := strings.Split(path, "/")[0]
boxes = append(boxes, box)
path = strings.TrimPrefix(path, box)
paths = append(paths, path)
}
paths = gulu.Str.RemoveDuplicatedElem(paths)
boxes = gulu.Str.RemoveDuplicatedElem(boxes)
}
var types map[string]bool
if nil != arg["types"] {
@ -222,7 +225,7 @@ func fullTextSearchBlock(c *gin.Context) {
if nil != groupByArg {
groupBy = int(groupByArg.(float64))
}
blocks, matchedBlockCount, matchedRootCount := model.FullTextSearchBlock(query, box, path, types, method, groupBy)
blocks, matchedBlockCount, matchedRootCount := model.FullTextSearchBlock(query, boxes, paths, types, method, groupBy)
ret.Data = map[string]interface{}{
"blocks": blocks,
"matchedBlockCount": matchedBlockCount,