mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-20 19:10:49 +08:00
🎨 Support database date field relative to today's filtering https://github.com/siyuan-note/siyuan/issues/10451
This commit is contained in:
parent
95e3fbcd98
commit
a28a53315a
@ -410,7 +410,8 @@ func (value *Value) compareOperator(filter *ViewFilter) bool {
|
|||||||
case FilterOperatorIsLessOrEqual:
|
case FilterOperatorIsLessOrEqual:
|
||||||
return valueTime.Before(relativeTimeStart) || valueTime.Equal(relativeTimeStart)
|
return valueTime.Before(relativeTimeStart) || valueTime.Equal(relativeTimeStart)
|
||||||
case FilterOperatorIsBetween:
|
case FilterOperatorIsBetween:
|
||||||
return (valueTime.After(relativeTimeStart) || valueTime.Equal(relativeTimeStart)) && (valueTime.Before(relativeTimeEnd) || valueTime.Equal(relativeTimeEnd))
|
_, relativeTime2End := calcRelativeTimeRegion(filter.RelativeDate2.Count, filter.RelativeDate2.Unit, filter.RelativeDate2.Direction)
|
||||||
|
return (valueTime.After(relativeTimeStart) || valueTime.Equal(relativeTimeStart)) && (valueTime.Before(relativeTime2End) || valueTime.Equal(relativeTime2End))
|
||||||
}
|
}
|
||||||
} else { // 使用具体时间比较
|
} else { // 使用具体时间比较
|
||||||
if nil != filter.Value.Date {
|
if nil != filter.Value.Date {
|
||||||
|
Loading…
Reference in New Issue
Block a user