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

🎨 改进全局搜索多个关键字命中时高亮片段 https://github.com/siyuan-note/siyuan/issues/5124

Browse source
This commit is contained in:
Liang Ding 2022-06-08 10:14:13 +08:00
parent 66ff043eff
commit 23a963cb7a
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/model/search.go
View file

@ -182,10 +182,10 @@ func FindReplace(keyword, replacement string, ids []string) (err error) {
func FullTextSearchBlock(query, box, path string, types map[string]bool, querySyntax bool) (ret []*Block) {
query = strings.TrimSpace(query)
if queryStrLower := strings.ToLower(query); strings.Contains(queryStrLower, "select ") && strings.Contains(queryStrLower, " * ") && strings.Contains(queryStrLower, " from ") {
ret = searchBySQL(query, 12)
ret = searchBySQL(query, 36)
} else {
filter := searchFilter(types)
ret = fullTextSearch(query, box, path, filter, 12, querySyntax)
ret = fullTextSearch(query, box, path, filter, 36, querySyntax)
}
return
}
@ -237,7 +237,7 @@ func fullTextSearchRefBlock(keyword string, beforeLen int) (ret []*Block) {
keyword = util.RemoveInvisible(keyword)
if util.IsIDPattern(keyword) {
ret = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+keyword+"'", 12)
ret = searchBySQL("SELECT * FROM `blocks` WHERE `id` = '"+keyword+"'", 36)
return
}