github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-13 23:52:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Clean code

Browse Source
This commit is contained in:
Daniel 2024-03-09 10:54:37 +08:00
parent cbcc8141a8
commit 42651a23a9
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/treenode/node.go
View File

@ -896,7 +896,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
ial = map[string]string{} 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 cell.Value.Template.Content = content
} }
} }
@ -1028,7 +1028,7 @@ func GetAttributeViewDefaultValue(valueID, keyID, blockID string, typ av.KeyType
return 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"] { if "" == ial["id"] {
block := getRowBlockValue(rowValues) block := getRowBlockValue(rowValues)
ial["id"] = block.Block.ID ial["id"] = block.Block.ID
@ -1073,6 +1073,7 @@ func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av
dataModel["updated"] = time.Now() dataModel["updated"] = time.Now()
} }
} }
for _, rowValue := range rowValues { for _, rowValue := range rowValues {
if 0 < len(rowValue.Values) { if 0 < len(rowValue.Values) {
v := rowValue.Values[0] 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 { if err := tpl.Execute(buf, dataModel); nil != err {
logging.LogWarnf("execute template [%s] failed: %s", tplContent, err) logging.LogWarnf("execute template [%s] failed: %s", tplContent, err)
} }