瀏覽代碼

:art: Database block supports export as CSV https://github.com/siyuan-note/siyuan/issues/10072

Daniel 1 年之前
父節點
當前提交
9b6cb211ab
共有 1 個文件被更改,包括 21 次插入5 次删除
  1. 21 5
      kernel/av/value.go

+ 21 - 5
kernel/av/value.go

@@ -303,19 +303,35 @@ const (
 
 func NewFormattedValueDate(content, content2 int64, format DateFormat, isNotTime bool) (ret *ValueDate) {
 	var formatted string
+	contentTime := time.UnixMilli(content)
+	if 0 == content || contentTime.IsZero() {
+		ret = &ValueDate{
+			Content:          content,
+			Content2:         content2,
+			HasEndDate:       false,
+			IsNotTime:        true,
+			FormattedContent: formatted,
+		}
+		return
+	}
+
 	if isNotTime {
-		formatted = time.UnixMilli(content).Format("2006-01-02")
+		formatted = contentTime.Format("2006-01-02")
 	} else {
-		formatted = time.UnixMilli(content).Format("2006-01-02 15:04")
+		formatted = contentTime.Format("2006-01-02 15:04")
 	}
+
 	if 0 < content2 {
 		var formattedContent2 string
+		content2Time := time.UnixMilli(content2)
 		if isNotTime {
-			formattedContent2 = time.UnixMilli(content2).Format("2006-01-02")
+			formattedContent2 = content2Time.Format("2006-01-02")
 		} else {
-			formattedContent2 = time.UnixMilli(content2).Format("2006-01-02 15:04")
+			formattedContent2 = content2Time.Format("2006-01-02 15:04")
+		}
+		if !content2Time.IsZero() {
+			formatted += " → " + formattedContent2
 		}
-		formatted += " → " + formattedContent2
 	}
 	switch format {
 	case DateFormatNone: