diff --git a/kernel/api/snippet.go b/kernel/api/snippet.go index 60d82edc6..899f9d48a 100644 --- a/kernel/api/snippet.go +++ b/kernel/api/snippet.go @@ -37,7 +37,7 @@ func serveSnippets(c *gin.Context) { name := strings.TrimSuffix(filePath, ext) confSnippets, err := model.LoadSnippets() if nil != err { - logging.LogErrorf("load snippets failed: %s", name, err) + logging.LogErrorf("load snippets failed: %s", err) c.Status(404) return } diff --git a/kernel/conf/snippet.go b/kernel/conf/snippet.go index ff43528e8..71d987e22 100644 --- a/kernel/conf/snippet.go +++ b/kernel/conf/snippet.go @@ -16,6 +16,18 @@ package conf +type Snpt struct { + EnabledCSS bool `json:"enabledCSS"` + EnabledJS bool `json:"enabledJS"` +} + +func NewSnpt() *Snpt { + return &Snpt{ + EnabledCSS: true, + EnabledJS: true, + } +} + type Snippet struct { ID string `json:"id"` Name string `json:"name"` diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 92dbe738c..88287910d 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -450,6 +450,8 @@ func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av v := rowValue.Values[0] if av.KeyTypeNumber == v.Type { dataModel[rowValue.Key.Name] = v.Number.Content + } else if av.KeyTypeDate == v.Type { + dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content) } else { dataModel[rowValue.Key.Name] = v.String() } diff --git a/kernel/model/conf.go b/kernel/model/conf.go index 8962dc17a..c26a7c0fc 100644 --- a/kernel/model/conf.go +++ b/kernel/model/conf.go @@ -80,6 +80,7 @@ type AppConf struct { OpenHelp bool `json:"openHelp"` // 启动后是否需要打开用户指南 ShowChangelog bool `json:"showChangelog"` // 是否显示版本更新日志 CloudRegion int `json:"cloudRegion"` // 云端区域,0:中国大陆,1:北美 + Snippet *conf.Snpt `json:"snippet"` // 代码片段 m *sync.Mutex } @@ -300,6 +301,10 @@ func InitConf() { Conf.System.Name = util.GetDeviceName() } + if nil == Conf.Snippet { + Conf.Snippet = conf.NewSnpt() + } + Conf.System.AppDir = util.WorkingDir Conf.System.ConfDir = util.ConfDir Conf.System.HomeDir = util.HomeDir diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go index e28f209d0..2cf77b6b8 100644 --- a/kernel/treenode/node.go +++ b/kernel/treenode/node.go @@ -863,6 +863,8 @@ func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av v := rowValue.Values[0] if av.KeyTypeNumber == v.Type { dataModel[rowValue.Key.Name] = v.Number.Content + } else if av.KeyTypeDate == v.Type { + dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content) } else { dataModel[rowValue.Key.Name] = v.String() }