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

🎨 搜索支持排序 https://github.com/siyuan-note/siyuan/issues/6766

Browse source
This commit is contained in:
Liang Ding 2022-12-02 17:48:52 +08:00
parent 89b0fe579c
commit 49e9b4147f
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
kernel/model/search.go
View file

@ -319,21 +319,7 @@ func FullTextSearchBlock(query string, boxes, paths []string, types map[string]b
query = strings.TrimSpace(query) query = strings.TrimSpace(query)
beforeLen := 36 beforeLen := 36
var blocks []*Block var blocks []*Block
orderByClause := buildOrderBy(orderBy)
var orderByClause string
switch orderBy {
case 1:
orderByClause = "ORDER BY created ASC"
case 2:
orderByClause = "ORDER BY created DESC"
case 3:
orderByClause = "ORDER BY updated ASC"
case 4:
orderByClause = "ORDER BY updated DESC"
default:
orderByClause = "ORDER BY sort ASC"
}
switch method { switch method {
case 1: // 查询语法 case 1: // 查询语法
filter := buildTypeFilter(types) filter := buildTypeFilter(types)
@ -436,6 +422,21 @@ func buildPathsFilter(paths []string) string {
return builder.String() return builder.String()
} }
func buildOrderBy(orderBy int) string {
switch orderBy {
case 1:
return "ORDER BY created ASC"
case 2:
return "ORDER BY created DESC"
case 3:
return "ORDER BY updated ASC"
case 4:
return "ORDER BY updated DESC"
default:
return "ORDER BY sort ASC"
}
}
func buildTypeFilter(types map[string]bool) string { func buildTypeFilter(types map[string]bool) string {
s := conf.NewSearch() s := conf.NewSearch()
if err := copier.Copy(s, Conf.Search); nil != err { if err := copier.Copy(s, Conf.Search); nil != err {