Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Database gallery view https://github.com/siyuan-note/siyuan/issues/10414

Browse source
This commit is contained in:
Daniel 2025-06-12 10:30:43 +08:00
parent 4a2c6ac5a0
commit eee166e901
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 31 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
kernel/sql/av.go
View file

@ -18,6 +18,7 @@ package sql
import ( import (
"bytes" "bytes"
"fmt"
"strings" "strings"
"text/template" "text/template"
"time" "time"
@ -389,6 +390,30 @@ func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, ials map[s
} }
} }
func fillAttributeViewTemplateValue(value *av.Value, item av.Item, attrView *av.AttributeView, ials map[string]map[string]string, items map[string][]*av.KeyValues) (err error) {
itemID := item.GetID()
switch value.Type {
case av.KeyTypeTemplate: // 渲染模板字段
keyValues := items[itemID]
ial := ials[itemID]
if nil == ial {
ial = map[string]string{}
}
content, renderErr := RenderTemplateField(ial, keyValues, value.Template.Content)
value.Template.Content = content
if nil != renderErr {
key, _ := attrView.GetKey(value.KeyID)
keyName := ""
if nil != key {
keyName = key.Name
}
err = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), keyName, renderErr)
}
}
return
}
func fillAttributeViewNilValue(value *av.Value, typ av.KeyType) { func fillAttributeViewNilValue(value *av.Value, typ av.KeyType) {
value.Type = typ value.Type = typ
switch typ { switch typ {

21
kernel/sql/av_gallery.go
View file

@ -121,27 +121,12 @@ func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query
} }
// 最后单独渲染模板字段，这样模板字段就可以使用汇总、关联、创建时间和更新时间字段的值了 // 最后单独渲染模板字段，这样模板字段就可以使用汇总、关联、创建时间和更新时间字段的值了
var renderTemplateErr error var renderTemplateErr error
for _, card := range ret.Cards { for _, card := range ret.Cards {
for _, value := range card.Values { for _, value := range card.Values {
switch value.ValueType { err := fillAttributeViewTemplateValue(value.Value, card, attrView, ials, cardsValues)
case av.KeyTypeTemplate: // 渲染模板字段 if nil != err {
keyValues := cardsValues[card.ID] renderTemplateErr = err
ial := ials[card.ID]
if nil == ial {
ial = map[string]string{}
}
content, renderErr := RenderTemplateField(ial, keyValues, value.Value.Template.Content)
value.Value.Template.Content = content
if nil != renderErr {
key, _ := attrView.GetKey(value.Value.KeyID)
keyName := ""
if nil != key {
keyName = key.Name
}
renderTemplateErr = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), keyName, renderErr)
}
} }
} }
} }

21
kernel/sql/av_table.go
View file

@ -127,27 +127,12 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
// 最后单独渲染模板列，这样模板列就可以使用汇总、关联、创建时间和更新时间列的值了 // 最后单独渲染模板列，这样模板列就可以使用汇总、关联、创建时间和更新时间列的值了
// Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442 // Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442
var renderTemplateErr error var renderTemplateErr error
for _, row := range ret.Rows { for _, row := range ret.Rows {
for _, cell := range row.Cells { for _, cell := range row.Cells {
switch cell.ValueType { err := fillAttributeViewTemplateValue(cell.Value, row, attrView, ials, rowsValues)
case av.KeyTypeTemplate: // 渲染模板列 if nil != err {
keyValues := rowsValues[row.ID] renderTemplateErr = err
ial := ials[row.ID]
if nil == ial {
ial = map[string]string{}
}
content, renderErr := RenderTemplateField(ial, keyValues, cell.Value.Template.Content)
cell.Value.Template.Content = content
if nil != renderErr {
key, _ := attrView.GetKey(cell.Value.KeyID)
keyName := ""
if nil != key {
keyName = key.Name
}
renderTemplateErr = fmt.Errorf("database [%s] template field [%s] rendering failed: %s", getAttrViewName(attrView), keyName, renderErr)
}
} }
} }
} }