github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 09:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Database template column support using values from other columns https://github.com/siyuan-note/siyuan/issues/9327

Browse Source
This commit is contained in:
Daniel 2023-10-03 13:01:11 +08:00
parent 29f34fe8b8
commit cc3b4e320e
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/model/attribute_view.go
View File

@ -55,7 +55,9 @@ func renderTemplateCol(blockID, tplContent string, rowValues []*av.KeyValues) st
dataModel[strings.ReplaceAll(k, "custom-", "custom_")] = v dataModel[strings.ReplaceAll(k, "custom-", "custom_")] = v
} }
for _, rowValue := range rowValues { for _, rowValue := range rowValues {
dataModel[rowValue.Key.Name] = rowValue.Values[0].String() if 0 < len(rowValue.Values) {
dataModel[rowValue.Key.Name] = rowValue.Values[0].String()
}
} }
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)
@ -111,8 +113,9 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
// 渲染模板列 // 渲染模板列
for _, kv := range keyValues { for _, kv := range keyValues {
if av.KeyTypeTemplate == kv.Key.Type { if av.KeyTypeTemplate == kv.Key.Type {
content := renderTemplateCol(blockID, kv.Key.Template, keyValues) if 0 < len(kv.Values) {
kv.Values[0].Template.Content = content kv.Values[0].Template.Content = renderTemplateCol(blockID, kv.Key.Template, keyValues)
}
} }
} }
@ -222,7 +225,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
for _, val := range keyValues.Values { for _, val := range keyValues.Values {
values := rows[val.BlockID] values := rows[val.BlockID]
if nil == values { if nil == values {
values = []*av.KeyValues{&av.KeyValues{Key: keyValues.Key, Values: []*av.Value{val}}} values = []*av.KeyValues{{Key: keyValues.Key, Values: []*av.Value{val}}}
} else { } else {
values = append(values, &av.KeyValues{Key: keyValues.Key, Values: []*av.Value{val}}) values = append(values, &av.KeyValues{Key: keyValues.Key, Values: []*av.Value{val}})
} }
@ -327,7 +330,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
func getRowBlockValue(keyValues []*av.KeyValues) (ret *av.Value) { func getRowBlockValue(keyValues []*av.KeyValues) (ret *av.Value) {
for _, kv := range keyValues { for _, kv := range keyValues {
if av.KeyTypeBlock == kv.Key.Type { if av.KeyTypeBlock == kv.Key.Type && 0 < len(kv.Values) {
ret = kv.Values[0] ret = kv.Values[0]
break break
} }