From fd4a24243cf12ba4d7104dbe336f1bd8e0ae7fe8 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 9 Jun 2025 22:33:25 +0800 Subject: [PATCH] :art: Database gallery view https://github.com/siyuan-note/siyuan/issues/10414 --- kernel/av/layout_gallery.go | 6 +++--- kernel/model/attribute_view.go | 30 ++++++++++++++++++++++++++++++ kernel/model/transaction.go | 2 ++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/kernel/av/layout_gallery.go b/kernel/av/layout_gallery.go index b3e09e68f..959b58ddf 100644 --- a/kernel/av/layout_gallery.go +++ b/kernel/av/layout_gallery.go @@ -25,9 +25,9 @@ type LayoutGallery struct { CoverFrom CoverFrom `json:"coverFrom"` // 封面来源,0:无,1:内容图,2:资源字段 CoverFromAssetKeyID string `json:"coverFromAssetKeyId,omitempty"` // 资源字段 ID,CoverFrom 为 2 时有效 CardSize CardSize `json:"cardSize"` // 卡片大小,0:小卡片,1:中卡片,2:大卡片 - FitImage bool `json:"fitImage"` // 是否适应图片大小 - ShowIcon bool `json:"showIcon"` // 是否显示图标 - WrapField bool `json:"wrapField"` // 是否换行字段 + FitImage bool `json:"fitImage"` // 是否适应封面图片大小 + ShowIcon bool `json:"showIcon"` // 是否显示字段图标 + WrapField bool `json:"wrapField"` // 是否换行字段内容 CardFields []*ViewGalleryCardField `json:"fields"` // 画廊卡片字段 CardIDs []string `json:"cardIds"` // 卡片 ID,用于自定义排序 diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index e3b4a728f..5ec8815d5 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -44,6 +44,36 @@ import ( "github.com/xrash/smetrics" ) +func (tx *Transaction) doSetAttrViewShowIcon(operation *Operation) (ret *TxErr) { + err := setAttrViewShowIcon(operation) + if err != nil { + return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} + } + return +} + +func setAttrViewShowIcon(operation *Operation) (err error) { + attrView, err := av.ParseAttributeView(operation.AvID) + if err != nil { + return + } + + view, err := getAttrViewViewByBlockID(attrView, operation.BlockID) + if err != nil { + return + } + + switch view.LayoutType { + case av.LayoutTypeTable: + return + case av.LayoutTypeGallery: + view.Gallery.ShowIcon = operation.Data.(bool) + } + + err = av.SaveAttributeView(attrView) + return +} + func (tx *Transaction) doSetAttrViewFitImage(operation *Operation) (ret *TxErr) { err := setAttrViewFitImage(operation) if err != nil { diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 9d2ee4ba0..a3f141393 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -286,6 +286,8 @@ func performTx(tx *Transaction) (ret *TxErr) { ret = tx.doSetAttrViewCardSize(op) case "setAttrViewFitImage": ret = tx.doSetAttrViewFitImage(op) + case "setAttrViewShowIcon": + ret = tx.doSetAttrViewShowIcon(op) } if nil != ret {