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

🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15593

Browse source
This commit is contained in:
Daniel 2025-08-21 22:25:41 +08:00
parent 35de72f64d
commit 4598e3237b
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/av/filter.go
View file

@ -874,15 +874,27 @@ func (filter *ViewFilter) GetAffectValue(key *Key, addingBlockID string) (ret *V
case FilterOperatorIsNotEqual: case FilterOperatorIsNotEqual:
ret.Date = &ValueDate{Content: util.CurrentTimeMillis(), IsNotEmpty: true} ret.Date = &ValueDate{Content: util.CurrentTimeMillis(), IsNotEmpty: true}
case FilterOperatorIsGreater: case FilterOperatorIsGreater:
ret.Date = &ValueDate{Content: filter.Value.Date.Content + 1000*60, IsNotEmpty: true} ret.Date = &ValueDate{Content: filter.Value.Date.Content + 1000*60*60*24, IsNotEmpty: true}
case FilterOperatorIsGreaterOrEqual: case FilterOperatorIsGreaterOrEqual:
ret.Date = &ValueDate{Content: filter.Value.Date.Content, IsNotEmpty: true} ret.Date = &ValueDate{Content: filter.Value.Date.Content, IsNotEmpty: true}
case FilterOperatorIsLess: case FilterOperatorIsLess:
ret.Date = &ValueDate{Content: filter.Value.Date.Content - 1000*60, IsNotEmpty: true} ret.Date = &ValueDate{Content: filter.Value.Date.Content - 1000*60*60*24, IsNotEmpty: true}
case FilterOperatorIsLessOrEqual: case FilterOperatorIsLessOrEqual:
ret.Date = &ValueDate{Content: filter.Value.Date.Content, IsNotEmpty: true} ret.Date = &ValueDate{Content: filter.Value.Date.Content, IsNotEmpty: true}
case FilterOperatorIsBetween: case FilterOperatorIsBetween:
ret.Date = &ValueDate{Content: filter.Value.Date.Content - 1000*60, IsNotEmpty: true} start := filter.Value.Date.Content
end := filter.Value.Date.Content2
if start > end {
tmp := end
end = start
start = tmp
}
now := util.CurrentTimeMillis()
if start <= now && now <= end {
ret.Date = &ValueDate{Content: now, IsNotEmpty: true}
return
}
ret.Date = &ValueDate{Content: start, IsNotEmpty: true}
case FilterOperatorIsEmpty: case FilterOperatorIsEmpty:
ret.Date = &ValueDate{Content: 0, IsNotEmpty: false} ret.Date = &ValueDate{Content: 0, IsNotEmpty: false}
case FilterOperatorIsNotEmpty: case FilterOperatorIsNotEmpty:

7
kernel/model/attribute_view.go
View file

@ -148,6 +148,13 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID) newValue = getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
} }
if nil != newValue { if nil != newValue {
if av.KeyTypeDate == keyValues.Key.Type {
if nil != nearItem {
nearValue := getNewValueByNearItem(nearItem, keyValues.Key, addingItemID)
newValue.Date.IsNotTime = nearValue.Date.IsNotTime
}
}
ret[keyValues.Key.ID] = newValue ret[keyValues.Key.ID] = newValue
} }
} }