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

♻️ Refactor av render

Browse source
This commit is contained in:
Daniel 2025-08-06 09:52:53 +08:00
parent 34647490f2
commit f4699c9fad
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 175 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/sql/av_table.go
View file

@ -107,25 +107,10 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
ials := BatchGetBlockAttrs(ialIDs)
// 渲染自动生成的列值，比如关联列、汇总列、创建时间列和更新时间列
avCache := map[string]*av.AttributeView{}
avCache[attrView.ID] = attrView
for _, row := range ret.Rows {
for _, cell := range row.Cells {
fillAttributeViewAutoGeneratedValues(attrView, ials, cell.Value, row, rowsValues, &avCache)
}
}
fillAttributeViewAutoGeneratedValues(attrView, ret, ials, rowsValues)
// 最后单独渲染模板列，这样模板列就可以使用汇总、关联、创建时间和更新时间列的值了
// Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442
var renderTemplateErr error
for _, row := range ret.Rows {
for _, cell := range row.Cells {
err := fillAttributeViewTemplateValue(cell.Value, row, attrView, ials, rowsValues)
if nil != err {
renderTemplateErr = err
}
}
}
renderTemplateErr := fillAttributeViewTemplateValues(attrView, ret, ials, rowsValues)
if nil != renderTemplateErr {
util.PushErrMsg(fmt.Sprintf(util.Langs[util.Lang][44], util.EscapeHTML(renderTemplateErr.Error())), 30000)
}