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

🐛 Fix unexpected paging of API getAttributeViewPrimaryKeyValues https://github.com/siyuan-note/siyuan/issues/12827

Browse source
This commit is contained in:
Daniel 2024-10-19 12:25:30 +08:00
parent 3830988747
commit 50242026ec
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
kernel/model/attribute_view.go
View file

@ -209,28 +209,17 @@ func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int)
databaseBlockIDs = treenode.GetMirrorAttrViewBlockIDs(avID)
keyValues = attrView.GetBlockKeyValues()
// 过滤掉不在视图中的值
tmp := map[string]*av.Value{}
var values []*av.Value
for _, kv := range keyValues.Values {
for _, view := range attrView.Views {
switch view.LayoutType {
case av.LayoutTypeTable:
if !kv.IsDetached {
if !treenode.ExistBlockTree(kv.BlockID) {
break
}
}
if !kv.IsDetached && !treenode.ExistBlockTree(kv.BlockID) {
continue
}
tmp[kv.Block.ID] = kv
}
}
}
keyValues.Values = []*av.Value{}
for _, v := range tmp {
if strings.Contains(strings.ToLower(v.String(true)), strings.ToLower(keyword)) {
keyValues.Values = append(keyValues.Values, v)
if strings.Contains(strings.ToLower(kv.String(true)), strings.ToLower(keyword)) {
values = append(values, kv)
}
}
keyValues.Values = values
if 1 > pageSize {
pageSize = 16