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

🎨 Improve database rollup filtering https://github.com/siyuan-note/siyuan/issues/11059

Browse source
This commit is contained in:
Daniel 2024-04-17 19:39:33 +08:00
parent 25a75982c9
commit 043e953dac
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/av/filter.go
View file

@ -20,6 +20,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/88250/lute/ast"
"github.com/siyuan-note/siyuan/kernel/util" "github.com/siyuan-note/siyuan/kernel/util"
) )
@ -121,10 +122,20 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
return false return false
} }
destKey, _ := destAv.GetKey(key.Rollup.KeyID)
if nil == destKey {
return false
}
for _, blockID := range relVal.Relation.BlockIDs { for _, blockID := range relVal.Relation.BlockIDs {
destVal := destAv.GetValue(key.Rollup.KeyID, blockID) destVal := destAv.GetValue(key.Rollup.KeyID, blockID)
if nil == destVal { if nil == destVal {
continue if destAv.ExistBlock(blockID) { // 数据库中存在行但是列值不存在是数据未初始化，这里补一个默认值
destVal = GetAttributeViewDefaultValue(ast.NewNodeID(), key.Rollup.KeyID, blockID, destKey.Type)
}
if nil == destVal {
continue
}
} }
if destVal.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) { if destVal.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {