Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-29 03:36:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2026-01-17 18:25:47 +08:00
commit 375224d96b
5 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/api/block.go
View file

@ -667,7 +667,7 @@ func getBlockInfo(c *gin.Context) {
return
} else if errors.Is(err, model.ErrBoxUnindexed) {
ret.Code = -1
ret.Msg = ""
ret.Msg = "" // 加载的时候已经推送过提示了，这里不需要再提示
return
}

30
kernel/av/filter.go
View file

@ -749,32 +749,50 @@ func filterTextContent(operator FilterOperator, valueContent, otherValueContent
if "" == strings.TrimSpace(otherValueContent) {
return true
}
return valueContent == otherValueContent
if util.SearchCaseSensitive {
return valueContent == otherValueContent
}
return strings.EqualFold(valueContent, otherValueContent)
case FilterOperatorIsNotEqual:
if "" == strings.TrimSpace(otherValueContent) {
return true
}
return valueContent != otherValueContent
if util.SearchCaseSensitive {
return valueContent != otherValueContent
}
return !strings.EqualFold(valueContent, otherValueContent)
case FilterOperatorContains:
if "" == strings.TrimSpace(otherValueContent) {
return true
}
return strings.Contains(valueContent, otherValueContent)
if util.SearchCaseSensitive {
return strings.Contains(valueContent, otherValueContent)
}
return strings.Contains(strings.ToLower(valueContent), strings.ToLower(otherValueContent))
case FilterOperatorDoesNotContain:
if "" == strings.TrimSpace(otherValueContent) {
return true
}
return !strings.Contains(valueContent, otherValueContent)
if util.SearchCaseSensitive {
return !strings.Contains(valueContent, otherValueContent)
}
return !strings.Contains(strings.ToLower(valueContent), strings.ToLower(otherValueContent))
case FilterOperatorStartsWith:
if "" == strings.TrimSpace(otherValueContent) {
return true
}
return strings.HasPrefix(valueContent, otherValueContent)
if util.SearchCaseSensitive {
return strings.HasPrefix(valueContent, otherValueContent)
}
return strings.HasPrefix(strings.ToLower(valueContent), strings.ToLower(otherValueContent))
case FilterOperatorEndsWith:
if "" == strings.TrimSpace(otherValueContent) {
return true
}
return strings.HasSuffix(valueContent, otherValueContent)
if util.SearchCaseSensitive {
return strings.HasSuffix(valueContent, otherValueContent)
}
return strings.HasSuffix(strings.ToLower(valueContent), strings.ToLower(otherValueContent))
case FilterOperatorIsEmpty:
return "" == strings.TrimSpace(valueContent)
case FilterOperatorIsNotEmpty:

13
kernel/sql/av.go
View file

@ -846,9 +846,16 @@ func filterByQuery(query string, collection av.Collection) {
for _, cell := range item.GetValues() {
allKeywordsHit := true
for _, keyword := range keywords {
if !strings.Contains(strings.ToLower(cell.String(true)), strings.ToLower(keyword)) {
allKeywordsHit = false
break
if !util.SearchCaseSensitive {
if !strings.Contains(strings.ToLower(cell.String(true)), strings.ToLower(keyword)) {
allKeywordsHit = false
break
}
} else {
if !strings.Contains(cell.String(true), keyword) {
allKeywordsHit = false
break
}
}
}
if allKeywordsHit {

2
kernel/sql/database.go
View file

@ -376,6 +376,8 @@ func SetCaseSensitive(b bool) {
} else {
db.Exec("PRAGMA case_sensitive_like = OFF;")
}
util.SearchCaseSensitive = b
}
func SetIndexAssetPath(b bool) {

2
kernel/util/runtime.go
View file

@ -479,3 +479,5 @@ const (
EvtSQLHistoryRebuild = "sql.history.rebuild"
EvtSQLAssetContentRebuild = "sql.assetContent.rebuild"
)
var SearchCaseSensitive bool