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

🎨 Database grouping by field https://github.com/siyuan-note/siyuan/issues/10964

Browse source
This commit is contained in:
Daniel 2025-07-24 11:05:29 +08:00
parent 54f2d8599e
commit 684286fc8a
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/av/av.go
View file

@ -199,7 +199,6 @@ type View struct {
GroupName string `json:"groupName,omitempty"` // 分组名称 GroupName string `json:"groupName,omitempty"` // 分组名称
GroupFolded bool `json:"groupFolded,omitempty"` // 分组是否折叠 GroupFolded bool `json:"groupFolded,omitempty"` // 分组是否折叠
GroupHidden bool `json:"groupHidden,omitempty"` // 分组是否隐藏 GroupHidden bool `json:"groupHidden,omitempty"` // 分组是否隐藏
GroupHideEmpty bool `json:"groupHideEmpty,omitempty"` // 分组是否隐藏空分组
} }
// GroupCalc 描述了分组计算规则和结果的结构。 // GroupCalc 描述了分组计算规则和结果的结构。

1
kernel/av/group.go
View file

@ -22,6 +22,7 @@ type ViewGroup struct {
Method GroupMethod `json:"method"` // 分组方式 Method GroupMethod `json:"method"` // 分组方式
Range *GroupRange `json:"range,omitempty"` // 分组范围 Range *GroupRange `json:"range,omitempty"` // 分组范围
Order GroupOrder `json:"order"` // 分组排序规则 Order GroupOrder `json:"order"` // 分组排序规则
HideEmpty bool `json:"hideEmpty,omitempty"` // 是否隐藏空分组
} }
// GroupMethod 描述了分组方式。 // GroupMethod 描述了分组方式。

15
kernel/model/attribute_view.go
View file

@ -93,14 +93,14 @@ func syncAttrViewTableColWidth(operation *Operation) (err error) {
return return
} }
func (tx *Transaction) doSetGroupHideEmpty(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewHideEmptyGroup(operation *Operation) (ret *TxErr) {
if err := SetGroupHideEmpty(operation.AvID, operation.BlockID, operation.Data.(bool)); nil != err { if err := setAttrViewHideEmptyGroup(operation.AvID, operation.BlockID, operation.Data.(bool)); nil != err {
return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
func SetGroupHideEmpty(avID, blockID string, hidden bool) (err error) { func setAttrViewHideEmptyGroup(avID, blockID string, hidden bool) (err error) {
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
if err != nil { if err != nil {
return err return err
@ -115,7 +115,14 @@ func SetGroupHideEmpty(avID, blockID string, hidden bool) (err error) {
return return
} }
view.GroupHideEmpty = hidden view.Group.HideEmpty = hidden
for _, group := range view.Groups {
if hidden {
group.GroupHidden = true
} else {
group.GroupHidden = false
}
}
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
if err != nil { if err != nil {

4
kernel/model/transaction.go
View file

@ -301,8 +301,8 @@ func performTx(tx *Transaction) (ret *TxErr) {
ret = tx.doSetAttrViewGroup(op) ret = tx.doSetAttrViewGroup(op)
case "hideAttrViewGroup": case "hideAttrViewGroup":
ret = tx.doHideAttrViewGroup(op) ret = tx.doHideAttrViewGroup(op)
case "setGroupHideEmpty": case "setAttrViewHideEmptyGroup":
ret = tx.doSetGroupHideEmpty(op) ret = tx.doSetAttrViewHideEmptyGroup(op)
case "syncAttrViewTableColWidth": case "syncAttrViewTableColWidth":
ret = tx.doSyncAttrViewTableColWidth(op) ret = tx.doSyncAttrViewTableColWidth(op)
} }