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

🎨 https://github.com/siyuan-note/siyuan/issues/16030

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-10-10 10:58:32 +08:00
parent 385462e91d
commit 00e6891ea0
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

62
kernel/av/filter.go
View file

@ -146,11 +146,13 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
return true return true
} }
switch filter.Operator { if "" == filter.Qualifier {
case FilterOperatorIsEmpty: switch filter.Operator {
return value.IsEmpty() case FilterOperatorIsEmpty:
case FilterOperatorIsNotEmpty: return value.IsEmpty()
return !value.IsEmpty() case FilterOperatorIsNotEmpty:
return !value.IsEmpty()
}
} }
// 单独处理汇总 // 单独处理汇总
@ -194,12 +196,30 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
switch filter.Qualifier { switch filter.Qualifier {
case FilterQuantifierUndefined, FilterQuantifierAny: case FilterQuantifierUndefined, FilterQuantifierAny:
if len(value.Rollup.Contents) < len(relVal.Relation.Contents) { // 说明汇总的目标字段存在空值
if FilterOperatorIsEmpty == filter.Operator {
return true
} else if FilterOperatorIsNotEmpty == filter.Operator {
return false
}
}
for _, content := range value.Rollup.Contents { for _, content := range value.Rollup.Contents {
if content.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) { if content.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
return true return true
} }
} }
case FilterQuantifierAll: case FilterQuantifierAll:
if len(value.Rollup.Contents) < len(relVal.Relation.Contents) {
if FilterOperatorIsEmpty == filter.Operator {
if 1 > len(value.Rollup.Contents) {
return true
}
} else if FilterOperatorIsNotEmpty == filter.Operator {
return false
}
}
for _, content := range value.Rollup.Contents { for _, content := range value.Rollup.Contents {
if !content.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) { if !content.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
return false return false
@ -207,6 +227,14 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
} }
return true return true
case FilterQuantifierNone: case FilterQuantifierNone:
if len(value.Rollup.Contents) < len(relVal.Relation.Contents) {
if FilterOperatorIsEmpty == filter.Operator {
return false
} else if FilterOperatorIsNotEmpty == filter.Operator {
return true
}
}
for _, content := range value.Rollup.Contents { for _, content := range value.Rollup.Contents {
if content.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) { if content.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
return false return false
@ -265,6 +293,14 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
switch filter.Qualifier { switch filter.Qualifier {
case FilterQuantifierUndefined, FilterQuantifierAny: case FilterQuantifierUndefined, FilterQuantifierAny:
if 1 > len(value.MAsset) { // 说明资源字段为空
if FilterOperatorIsEmpty == filter.Operator {
return true
} else if FilterOperatorIsNotEmpty == filter.Operator {
return false
}
}
for _, asset := range value.MAsset { for _, asset := range value.MAsset {
switch asset.Type { switch asset.Type {
case AssetTypeFile: case AssetTypeFile:
@ -279,6 +315,14 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
} }
} }
case FilterQuantifierAll: case FilterQuantifierAll:
if 1 > len(value.MAsset) {
if FilterOperatorIsEmpty == filter.Operator {
return true
} else if FilterOperatorIsNotEmpty == filter.Operator {
return false
}
}
for _, asset := range value.MAsset { for _, asset := range value.MAsset {
switch asset.Type { switch asset.Type {
case AssetTypeFile: case AssetTypeFile:
@ -294,6 +338,14 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
} }
return true return true
case FilterQuantifierNone: case FilterQuantifierNone:
if 1 > len(value.MAsset) {
if FilterOperatorIsEmpty == filter.Operator {
return false
} else if FilterOperatorIsNotEmpty == filter.Operator {
return true
}
}
for _, asset := range value.MAsset { for _, asset := range value.MAsset {
switch asset.Type { switch asset.Type {
case AssetTypeFile: case AssetTypeFile: