From 42651a23a9438c9938715c9f9051f38dfcef8d24 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sat, 9 Mar 2024 10:54:37 +0800 Subject: [PATCH] :art: Clean code --- kernel/treenode/node.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/treenode/node.go b/kernel/treenode/node.go index 8f2bb6377..8be45db60 100644 --- a/kernel/treenode/node.go +++ b/kernel/treenode/node.go @@ -896,7 +896,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a ial = map[string]string{} } } - content := renderTemplateCol(ial, cell.Value.Template.Content, keyValues) + content := renderTemplateCol(ial, keyValues, cell.Value.Template.Content) cell.Value.Template.Content = content } } @@ -1028,7 +1028,7 @@ func GetAttributeViewDefaultValue(valueID, keyID, blockID string, typ av.KeyType return } -func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av.KeyValues) string { +func renderTemplateCol(ial map[string]string, rowValues []*av.KeyValues, tplContent string) string { if "" == ial["id"] { block := getRowBlockValue(rowValues) ial["id"] = block.Block.ID @@ -1073,6 +1073,7 @@ func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av dataModel["updated"] = time.Now() } } + for _, rowValue := range rowValues { if 0 < len(rowValue.Values) { v := rowValue.Values[0] @@ -1085,6 +1086,7 @@ func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av } } } + if err := tpl.Execute(buf, dataModel); nil != err { logging.LogWarnf("execute template [%s] failed: %s", tplContent, err) }