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

🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15588

Browse source
This commit is contained in:
Daniel 2025-08-21 14:10:23 +08:00
parent bf3023ec48
commit 8c3837deaa
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/model/attribute_view.go
View file

@ -2418,6 +2418,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
view.HideAttrViewName = masterView.HideAttrViewName view.HideAttrViewName = masterView.HideAttrViewName
view.Desc = masterView.Desc view.Desc = masterView.Desc
view.LayoutType = masterView.LayoutType view.LayoutType = masterView.LayoutType
view.PageSize = masterView.PageSize
for _, filter := range masterView.Filters { for _, filter := range masterView.Filters {
view.Filters = append(view.Filters, &av.ViewFilter{ view.Filters = append(view.Filters, &av.ViewFilter{
@ -2436,16 +2437,6 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
}) })
} }
if nil != masterView.Group {
view.Group = &av.ViewGroup{}
if copyErr := copier.Copy(view.Group, masterView.Group); nil != copyErr {
logging.LogErrorf("copy group failed: %s", copyErr)
return &TxErr{code: TxErrHandleAttributeView, id: avID, msg: copyErr.Error()}
}
}
view.PageSize = masterView.PageSize
switch masterView.LayoutType { switch masterView.LayoutType {
case av.LayoutTypeTable: case av.LayoutTypeTable:
for _, col := range masterView.Table.Columns { for _, col := range masterView.Table.Columns {
@ -2487,6 +2478,17 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
view.ItemIDs = masterView.ItemIDs view.ItemIDs = masterView.ItemIDs
if nil != masterView.Group {
view.Group = &av.ViewGroup{}
if copyErr := copier.Copy(view.Group, masterView.Group); nil != copyErr {
logging.LogErrorf("copy group failed: %s", copyErr)
return &TxErr{code: TxErrHandleAttributeView, id: avID, msg: copyErr.Error()}
}
view.GroupItemIDs = masterView.GroupItemIDs
regenAttrViewGroups(attrView, "force")
}
if err = av.SaveAttributeView(attrView); err != nil { if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrHandleAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrHandleAttributeView, msg: err.Error(), id: avID}