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

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

Browse source
This commit is contained in:
Daniel 2025-06-13 11:09:28 +08:00
parent 407ceb2e6d
commit e8a592e4e7
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/model/attribute_view.go
View file

@ -1180,8 +1180,6 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
} }
} }
view.Table.Sorts = tmpSorts view.Table.Sorts = tmpSorts
viewable = sql.RenderAttributeViewTable(attrView, view, query)
case av.LayoutTypeGallery: case av.LayoutTypeGallery:
// 字段删除以后需要删除设置的过滤和排序 // 字段删除以后需要删除设置的过滤和排序
tmpFilters := []*av.ViewFilter{} tmpFilters := []*av.ViewFilter{}
@ -1199,10 +1197,9 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
} }
} }
view.Gallery.Sorts = tmpSorts view.Gallery.Sorts = tmpSorts
viewable = sql.RenderAttributeViewGallery(attrView, view, query)
} }
viewable = sql.RenderView(view, attrView, query)
if nil == viewable { if nil == viewable {
err = av.ErrViewNotFound err = av.ErrViewNotFound
logging.LogErrorf("render attribute view [%s] failed", attrView.ID) logging.LogErrorf("render attribute view [%s] failed", attrView.ID)
@ -2424,13 +2421,7 @@ func addAttributeViewBlock(now int64, avID, blockID, previousBlockID, addingBloc
} }
if nil != view && 0 < len(filters) && !ignoreFillFilter { if nil != view && 0 < len(filters) && !ignoreFillFilter {
var viewable av.Viewable viewable := sql.RenderView(view, attrView, "")
switch view.LayoutType {
case av.LayoutTypeTable:
viewable = sql.RenderAttributeViewTable(attrView, view, "")
case av.LayoutTypeGallery:
viewable = sql.RenderAttributeViewGallery(attrView, view, "")
}
viewable.Filter(attrView) viewable.Filter(attrView)
viewable.Sort(attrView) viewable.Sort(attrView)

10
kernel/sql/av.go
View file

@ -32,6 +32,16 @@ import (
"github.com/siyuan-note/siyuan/kernel/util" "github.com/siyuan-note/siyuan/kernel/util"
) )
func RenderView(view *av.View, attrView *av.AttributeView, query string) (ret av.Viewable) {
switch view.LayoutType {
case av.LayoutTypeTable:
ret = RenderAttributeViewTable(attrView, view, query)
case av.LayoutTypeGallery:
ret = RenderAttributeViewGallery(attrView, view, query)
}
return
}
func RenderTemplateField(ial map[string]string, keyValues []*av.KeyValues, tplContent string) (ret string, err error) { func RenderTemplateField(ial map[string]string, keyValues []*av.KeyValues, tplContent string) (ret string, err error) {
if "" == ial["id"] { if "" == ial["id"] {
block := getBlockValue(keyValues) block := getBlockValue(keyValues)