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

🎨 Improve av

Browse source
This commit is contained in:
Daniel 2025-08-26 10:38:26 +08:00
parent 3182f7abb8
commit b332574217
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 15 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

62
kernel/av/filter.go
View file

@ -138,18 +138,17 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
return true return true
} }
switch filter.Operator {
case FilterOperatorIsEmpty:
return value.IsEmpty()
case FilterOperatorIsNotEmpty:
return !value.IsEmpty()
}
if nil != value.Rollup && KeyTypeRollup == value.Type && nil != filter.Value && KeyTypeRollup == filter.Value.Type && if nil != value.Rollup && KeyTypeRollup == value.Type && nil != filter.Value && KeyTypeRollup == filter.Value.Type &&
nil != filter.Value.Rollup && 0 < len(filter.Value.Rollup.Contents) { nil != filter.Value.Rollup && 0 < len(filter.Value.Rollup.Contents) {
// 单独处理汇总类型的比较 // 单独处理汇总类型的比较
// 处理为空和不为空
switch filter.Operator {
case FilterOperatorIsEmpty:
return 0 == len(value.Rollup.Contents)
case FilterOperatorIsNotEmpty:
return 0 != len(value.Rollup.Contents)
}
// 处理值比较 // 处理值比较
key, _ := attrView.GetKey(value.KeyID) key, _ := attrView.GetKey(value.KeyID)
if nil == key { if nil == key {
@ -215,14 +214,6 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
nil != filter.Value.Relation && 0 < len(filter.Value.Relation.BlockIDs) { nil != filter.Value.Relation && 0 < len(filter.Value.Relation.BlockIDs) {
// 单独处理关联类型的比较 // 单独处理关联类型的比较
// 处理为空和不为空
switch filter.Operator {
case FilterOperatorIsEmpty:
return 0 == len(value.Relation.Contents)
case FilterOperatorIsNotEmpty:
return 0 != len(value.Relation.Contents)
}
for _, relationValue := range value.Relation.Contents { for _, relationValue := range value.Relation.Contents {
filterValue := &Value{Type: KeyTypeBlock, Block: &ValueBlock{Content: filter.Value.Relation.BlockIDs[0]}} filterValue := &Value{Type: KeyTypeBlock, Block: &ValueBlock{Content: filter.Value.Relation.BlockIDs[0]}}
@ -256,6 +247,13 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
} }
func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDate, operator FilterOperator) bool { func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDate, operator FilterOperator) bool {
switch operator {
case FilterOperatorIsEmpty:
return value.IsEmpty()
case FilterOperatorIsNotEmpty:
return !value.IsEmpty()
}
switch value.Type { switch value.Type {
case KeyTypeBlock: case KeyTypeBlock:
if nil != value.Block && nil != other && nil != other.Block { if nil != value.Block && nil != other && nil != other.Block {
@ -284,10 +282,6 @@ func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDa
return value.Number.Content < other.Number.Content return value.Number.Content < other.Number.Content
case FilterOperatorIsLessOrEqual: case FilterOperatorIsLessOrEqual:
return value.Number.Content <= other.Number.Content return value.Number.Content <= other.Number.Content
case FilterOperatorIsEmpty:
return !value.Number.IsNotEmpty
case FilterOperatorIsNotEmpty:
return value.Number.IsNotEmpty
} }
} }
case KeyTypeDate: case KeyTypeDate:
@ -298,13 +292,6 @@ func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDa
} }
if nil != value.Date { if nil != value.Date {
switch operator {
case FilterOperatorIsEmpty:
return !value.Date.IsNotEmpty
case FilterOperatorIsNotEmpty:
return value.Date.IsNotEmpty
}
if !value.Date.IsNotEmpty { if !value.Date.IsNotEmpty {
// 空值不进行比较，直接排除 // 空值不进行比较，直接排除
// Database date filter excludes empty values https://github.com/siyuan-note/siyuan/issues/11061 // Database date filter excludes empty values https://github.com/siyuan-note/siyuan/issues/11061
@ -352,12 +339,6 @@ func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDa
case KeyTypeSelect, KeyTypeMSelect: case KeyTypeSelect, KeyTypeMSelect:
if nil != value.MSelect { if nil != value.MSelect {
if 1 > len(other.MSelect) { if 1 > len(other.MSelect) {
switch operator {
case FilterOperatorIsEmpty:
return value.IsEmpty()
case FilterOperatorIsNotEmpty:
return !value.IsEmpty()
}
return true return true
} }
@ -423,10 +404,6 @@ func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDa
} }
} }
return !contains return !contains
case FilterOperatorIsEmpty:
return 0 == len(value.MAsset) || 1 == len(value.MAsset) && "" == value.MAsset[0].Content
case FilterOperatorIsNotEmpty:
return 0 != len(value.MAsset) && !(1 == len(value.MAsset) && "" == value.MAsset[0].Content)
} }
} }
case KeyTypeTemplate: case KeyTypeTemplate:
@ -482,10 +459,6 @@ func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDa
return true return true
} }
return strings.HasSuffix(value.Template.Content, other.Template.Content) return strings.HasSuffix(value.Template.Content, other.Template.Content)
case FilterOperatorIsEmpty:
return "" == strings.TrimSpace(value.Template.Content)
case FilterOperatorIsNotEmpty:
return "" != strings.TrimSpace(value.Template.Content)
} }
} }
case KeyTypeCheckbox: case KeyTypeCheckbox:
@ -498,13 +471,6 @@ func (value *Value) filter(other *Value, relativeDate, relativeDate2 *RelativeDa
} }
} }
} }
switch operator {
case FilterOperatorIsEmpty:
return value.IsEmpty()
case FilterOperatorIsNotEmpty:
return !value.IsEmpty()
}
return false return false
} }

2
kernel/av/value.go
View file

@ -355,7 +355,7 @@ func (value *Value) IsEmpty() bool {
if nil == value.Template { if nil == value.Template {
return true return true
} }
return "" == value.Template.Content return "" == strings.TrimSpace(value.Template.Content)
case KeyTypeCreated: case KeyTypeCreated:
if nil == value.Created { if nil == value.Created {
return true return true