🎨 Improve built-in template func

kernel/model/template.go

@@ -20,14 +20,12 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/araddon/dateparse"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
 	"text/template"
-	"time"
 
 	"github.com/88250/gulu"
 	"github.com/88250/lute/ast"
@@ -413,13 +411,4 @@ func SQLTemplateFuncs(templateFuncMap *template.FuncMap) {
 		retSpans = sql.SelectSpansRawStmt(stmt, 512)
 		return
 	}
-	(*templateFuncMap)["parseTime"] = func(dateStr string) time.Time {
-		now := time.Now()
-		retTime, err := dateparse.ParseIn(dateStr, now.Location())
-		if nil != err {
-			logging.LogWarnf("parse date [%s] failed [%s], return current time instead", dateStr, err)
-			return now
-		}
-		return retTime
-	}
 }

kernel/util/template.go

@@ -18,9 +18,12 @@ package util
 
 import (
 	"github.com/Masterminds/sprig/v3"
+	"github.com/araddon/dateparse"
+	"github.com/siyuan-note/logging"
 	"github.com/spf13/cast"
 	"math"
 	"text/template"
+	"time"
 )
 
 func BuiltInTemplateFuncs() (ret template.FuncMap) {
@@ -33,6 +36,7 @@ func BuiltInTemplateFuncs() (ret template.FuncMap) {
 	ret["powf"] = powf
 	ret["log"] = log
 	ret["logf"] = logf
+	ret["parseTime"] = parseTime
 	return
 }
 
@@ -42,3 +46,13 @@ func log(a, b interface{}) int64 {
 	return int64(math.Log(cast.ToFloat64(a)) / math.Log(cast.ToFloat64(b)))
 }
 func logf(a, b interface{}) float64 { return math.Log(cast.ToFloat64(a)) / math.Log(cast.ToFloat64(b)) }
+
+func parseTime(dateStr string) time.Time {
+	now := time.Now()
+	retTime, err := dateparse.ParseIn(dateStr, now.Location())
+	if nil != err {
+		logging.LogWarnf("parse date [%s] failed [%s], return current time instead", dateStr, err)
+		return now
+	}
+	return retTime
+}