0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-04-20 23:40:46 +08:00
commit 6581d96dda
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/api/av.go
View file

@ -318,7 +318,13 @@ func searchAttributeView(c *gin.Context) {
}
keyword := arg["keyword"].(string)
results := model.SearchAttributeView(keyword)
var excludes []string
if nil != arg["excludes"] {
for _, e := range arg["excludes"].([]interface{}) {
excludes = append(excludes, e.(string))
}
}
results := model.SearchAttributeView(keyword, excludes)
ret.Data = map[string]interface{}{
"results": results,
}

5
kernel/model/attribute_view.go
View file

@ -186,8 +186,9 @@ type SearchAttributeViewResult struct {
HPath string `json:"hPath"`
}
func SearchAttributeView(keyword string) (ret []*SearchAttributeViewResult) {
func SearchAttributeView(keyword string, excludes []string) (ret []*SearchAttributeViewResult) {
waitForSyncingStorages()
ret = []*SearchAttributeViewResult{}
keyword = strings.TrimSpace(keyword)
@ -321,7 +322,7 @@ func SearchAttributeView(keyword string) (ret []*SearchAttributeViewResult) {
hPath = box.Name + hPath
}
if !exist {
if !exist && !gulu.Str.Contains(avID, excludes) {
ret = append(ret, &SearchAttributeViewResult{
AvID: avID,
AvName: existAv.AvName,