浏览代码

:art: Attribute View date column filter https://github.com/siyuan-note/siyuan/issues/8756

Daniel 1 年之前
父节点
当前提交
1276dd8f9a
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      kernel/av/table.go

+ 4 - 2
kernel/av/table.go

@@ -192,10 +192,12 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
 		case FilterOperatorIsLessOrEqual:
 		case FilterOperatorIsLessOrEqual:
 			return value.Date.Content <= other.Date.Content
 			return value.Date.Content <= other.Date.Content
 		case FilterOperatorIsBetween:
 		case FilterOperatorIsBetween:
+			start := value.Date.Content <= other.Date.Content
+			end := true
 			if value.Date.HasEndDate {
 			if value.Date.HasEndDate {
-				// TODO: date filter (between)
+				end = value.Date.Content2 >= other.Date.Content2
 			}
 			}
-			return value.Date.Content >= other.Date.Content && value.Date.Content <= other.Date.Content2
+			return start && end
 		case FilterOperatorIsEmpty:
 		case FilterOperatorIsEmpty:
 			return 0 == value.Date.Content
 			return 0 == value.Date.Content
 		case FilterOperatorIsNotEmpty:
 		case FilterOperatorIsNotEmpty: