From 176308d7d2bd4e7ec8add5b37c6d079e8aa8425a Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 14 Aug 2025 00:00:57 +0800 Subject: [PATCH] :art: Improve av https://github.com/siyuan-note/siyuan/issues/15521 --- kernel/model/export.go | 2 +- kernel/sql/av.go | 30 ++++++++++++++++++++---------- kernel/sql/av_gallery.go | 4 ++-- kernel/sql/av_table.go | 4 ++-- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/kernel/model/export.go b/kernel/model/export.go index 17745bb4f..dd1b7cd1d 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -3442,7 +3442,7 @@ func getAttrViewTable(attrView *av.AttributeView, view *av.View, query string) ( } depth := 1 - ret = sql.RenderAttributeViewTable(attrView, view, query, &depth, map[string]*av.AttributeView{}) + ret = sql.RenderAttributeViewTable(attrView, view, query, &depth, map[string]*av.AttributeView{}, map[string]av.Collection{}) return } diff --git a/kernel/sql/av.go b/kernel/sql/av.go index 366841b70..398d38c02 100644 --- a/kernel/sql/av.go +++ b/kernel/sql/av.go @@ -73,13 +73,14 @@ func RenderGroupView(attrView *av.AttributeView, view, groupView *av.View, query func RenderView(attrView *av.AttributeView, view *av.View, query string) (ret av.Viewable) { depth := 1 renderedAttrViews := map[string]*av.AttributeView{} + renderedTemplateKeyCollections := map[string]av.Collection{} renderedAttrViews[attrView.ID] = attrView - ret = renderView(attrView, view, query, &depth, renderedAttrViews) + ret = renderView(attrView, view, query, &depth, renderedAttrViews, renderedTemplateKeyCollections) return } func renderView(attrView *av.AttributeView, view *av.View, query string, - depth *int, renderedAttrViews map[string]*av.AttributeView) (ret av.Viewable) { + depth *int, renderedAttrViews map[string]*av.AttributeView, renderedTemplateKeyCollections map[string]av.Collection) (ret av.Viewable) { if 7 < *depth { return } @@ -87,9 +88,9 @@ func renderView(attrView *av.AttributeView, view *av.View, query string, *depth++ switch view.LayoutType { case av.LayoutTypeTable: - ret = RenderAttributeViewTable(attrView, view, query, depth, renderedAttrViews) + ret = RenderAttributeViewTable(attrView, view, query, depth, renderedAttrViews, renderedTemplateKeyCollections) case av.LayoutTypeGallery: - ret = RenderAttributeViewGallery(attrView, view, query, depth, renderedAttrViews) + ret = RenderAttributeViewGallery(attrView, view, query, depth, renderedAttrViews, renderedTemplateKeyCollections) } return } @@ -326,7 +327,7 @@ func fillAttributeViewBaseValue(baseValue *av.BaseValue, fieldID, itemID string, } func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, collection av.Collection, ials map[string]map[string]string, items map[string][]*av.KeyValues, - depth *int, renderedAttrViews map[string]*av.AttributeView) { + depth *int, renderedAttrViews map[string]*av.AttributeView, renderedTemplateKeyCollections map[string]av.Collection) { for _, item := range collection.GetItems() { for _, value := range item.GetValues() { itemID := item.GetID() @@ -373,16 +374,25 @@ func fillAttributeViewAutoGeneratedValues(attrView *av.AttributeView, collection return } - var viewable av.Viewable + var furtherCollection av.Collection + var ok bool if av.KeyTypeTemplate == destKey.Type { - // 渲染目标视图，这样才能汇总渲染后的模板字段值 - viewable = renderView(destAv, destAv.Views[0], "", depth, renderedAttrViews) + if furtherCollection, ok = renderedTemplateKeyCollections[destKey.ID]; !ok { + renderedTemplateKeyCollections[destKey.ID] = collection + + // 渲染目标视图，这样才能汇总渲染后的模板字段值 + viewable := renderView(destAv, destAv.Views[0], "", depth, renderedAttrViews, renderedTemplateKeyCollections) + if nil != viewable { + furtherCollection = viewable.(av.Collection) + renderedTemplateKeyCollections[destKey.ID] = furtherCollection + } + } } for _, blockID := range relVal.Relation.BlockIDs { destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID) - if nil != viewable && av.KeyTypeTemplate == destKey.Type { - destVal = viewable.(av.Collection).GetValue(blockID, destKey.ID) + if nil != furtherCollection && av.KeyTypeTemplate == destKey.Type { + destVal = furtherCollection.GetValue(blockID, destKey.ID) } if nil == destVal { diff --git a/kernel/sql/av_gallery.go b/kernel/sql/av_gallery.go index 5d4a709dc..f2ac61929 100644 --- a/kernel/sql/av_gallery.go +++ b/kernel/sql/av_gallery.go @@ -19,7 +19,7 @@ import ( ) func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query string, - depth *int, renderedAttrViews map[string]*av.AttributeView) (ret *av.Gallery) { + depth *int, renderedAttrViews map[string]*av.AttributeView, renderedTemplateKeyCollections map[string]av.Collection) (ret *av.Gallery) { ret = &av.Gallery{ BaseInstance: av.NewViewBaseInstance(view), CoverFrom: view.Gallery.CoverFrom, @@ -115,7 +115,7 @@ func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query ials := BatchGetBlockAttrsWitTrees(ialIDs, boundTrees) // 渲染自动生成的字段值，比如关联、汇总、创建时间和更新时间 - fillAttributeViewAutoGeneratedValues(attrView, ret, ials, cardsValues, depth, renderedAttrViews) + fillAttributeViewAutoGeneratedValues(attrView, ret, ials, cardsValues, depth, renderedAttrViews, renderedTemplateKeyCollections) // 最后单独渲染模板字段，这样模板就可以使用汇总、关联、创建时间和更新时间的值了 renderTemplateErr := fillAttributeViewTemplateValues(attrView, ret, ials, cardsValues) diff --git a/kernel/sql/av_table.go b/kernel/sql/av_table.go index 0f2fecc08..b7cbcddc9 100644 --- a/kernel/sql/av_table.go +++ b/kernel/sql/av_table.go @@ -23,7 +23,7 @@ import ( ) func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query string, - depth *int, renderedAttrViews map[string]*av.AttributeView) (ret *av.Table) { + depth *int, renderedAttrViews map[string]*av.AttributeView, renderedTemplateKeyCollections map[string]av.Collection) (ret *av.Table) { ret = &av.Table{ BaseInstance: av.NewViewBaseInstance(view), Columns: []*av.TableColumn{}, @@ -108,7 +108,7 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s ials := BatchGetBlockAttrs(ialIDs) // 渲染自动生成的字段值，比如关联、汇总、创建时间和更新时间 - fillAttributeViewAutoGeneratedValues(attrView, ret, ials, rowsValues, depth, renderedAttrViews) + fillAttributeViewAutoGeneratedValues(attrView, ret, ials, rowsValues, depth, renderedAttrViews, renderedTemplateKeyCollections) // 最后单独渲染模板字段，这样模板就可以使用汇总、关联、创建时间和更新时间的值了 renderTemplateErr := fillAttributeViewTemplateValues(attrView, ret, ials, rowsValues)