🎨 Support database date field relative to today's filtering https://github.com/siyuan-note/siyuan/issues/10451

This commit is contained in:
Daniel 2024-03-03 23:40:24 +08:00
parent 95e3fbcd98
commit a28a53315a
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017

View File

@ -410,7 +410,8 @@ func (value *Value) compareOperator(filter *ViewFilter) bool {
case FilterOperatorIsLessOrEqual:
return valueTime.Before(relativeTimeStart) || valueTime.Equal(relativeTimeStart)
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 { // 使用具体时间比较
if nil != filter.Value.Date {