Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 00:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve av

Browse source
This commit is contained in:
Daniel 2025-08-23 22:15:31 +08:00
parent 161dd7eb2a
commit ef5236e0b1
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

48
kernel/model/attribute_view.go
View file

@ -532,7 +532,7 @@ func SetAttributeViewGroup(avID, blockID string, group *av.ViewGroup) (err error
groupStates := getAttrViewGroupStates(view) groupStates := getAttrViewGroupStates(view)
view.Group = group view.Group = group
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
setAttrViewGroupStates(view, groupStates) setAttrViewGroupStates(view, groupStates)
if view.Group.HideEmpty != oldHideEmpty { if view.Group.HideEmpty != oldHideEmpty {
@ -715,7 +715,7 @@ func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error
} }
} }
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
if err = av.SaveAttributeView(attrView); nil != err { if err = av.SaveAttributeView(attrView); nil != err {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
@ -2292,13 +2292,13 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
} }
} }
regenAttrViewGroups(srcAv, "force") regenAttrViewGroups(srcAv)
err = av.SaveAttributeView(srcAv) err = av.SaveAttributeView(srcAv)
if err != nil { if err != nil {
return return
} }
if !isSameAv { if !isSameAv {
regenAttrViewGroups(destAv, "force") regenAttrViewGroups(destAv)
err = av.SaveAttributeView(destAv) err = av.SaveAttributeView(destAv)
ReloadAttrView(destAv.ID) ReloadAttrView(destAv.ID)
} }
@ -2555,7 +2555,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
} }
view.GroupItemIDs = masterView.GroupItemIDs view.GroupItemIDs = masterView.GroupItemIDs
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
} }
if err = av.SaveAttributeView(attrView); err != nil { if err = av.SaveAttributeView(attrView); err != nil {
@ -3140,7 +3140,7 @@ func addAttributeViewBlock(now int64, avID, dbBlockID, groupID, previousItemID,
} }
} }
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
return return
} }
@ -3277,7 +3277,7 @@ func removeAttributeViewBlock(srcIDs []string, avID string, tx *Transaction) (er
} }
} }
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
if nil != err { if nil != err {
@ -3703,7 +3703,7 @@ func sortAttributeViewRow(operation *Operation) (err error) {
if av.KeyTypeMSelect == groupKey.Type || av.KeyTypeRelation == groupKey.Type { if av.KeyTypeMSelect == groupKey.Type || av.KeyTypeRelation == groupKey.Type {
// 跨多选分组时一个项目可能会同时存在于多个分组中，需要重新生成分组 // 跨多选分组时一个项目可能会同时存在于多个分组中，需要重新生成分组
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
} }
} else { // 同分组内排序 } else { // 同分组内排序
for i, r := range groupView.GroupItemIDs { for i, r := range groupView.GroupItemIDs {
@ -4006,7 +4006,7 @@ func updateAttributeViewColTemplate(operation *Operation) (err error) {
} }
} }
regenAttrViewGroups(attrView, operation.ID) regenAttrViewGroups(attrView)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
return return
} }
@ -4108,7 +4108,7 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
} }
} }
regenAttrViewGroups(destAv, "force") regenAttrViewGroups(destAv)
av.SaveAttributeView(destAv) av.SaveAttributeView(destAv)
ReloadAttrView(destAv.ID) ReloadAttrView(destAv.ID)
} }
@ -4260,7 +4260,7 @@ func RemoveAttributeViewKey(avID, keyID string, removeRelationDest bool) (err er
} }
} }
regenAttrViewGroups(destAv, "force") regenAttrViewGroups(destAv)
av.SaveAttributeView(destAv) av.SaveAttributeView(destAv)
ReloadAttrView(destAv.ID) ReloadAttrView(destAv.ID)
} }
@ -4309,7 +4309,7 @@ func replaceAttributeViewBlock0(attrView *av.AttributeView, oldBlockID, newNodeI
content = util.UnescapeHTML(content) content = util.UnescapeHTML(content)
blockVal.Block.Icon, blockVal.Block.Content = icon, content blockVal.Block.Icon, blockVal.Block.Content = icon, content
blockVal.UpdatedAt = now blockVal.UpdatedAt = now
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
return return
} }
} }
@ -4339,7 +4339,7 @@ func replaceAttributeViewBlock0(attrView *av.AttributeView, oldBlockID, newNodeI
} }
} }
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
return return
} }
@ -4587,7 +4587,7 @@ func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID
updateTwoWayRelationDestAttrView(attrView, key, val, relationChangeMode, oldRelationBlockIDs) updateTwoWayRelationDestAttrView(attrView, key, val, relationChangeMode, oldRelationBlockIDs)
} }
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
if err = av.SaveAttributeView(attrView); nil != err { if err = av.SaveAttributeView(attrView); nil != err {
return return
} }
@ -4604,7 +4604,7 @@ func refreshRelatedSrcAvs(destAvID string) {
continue continue
} }
regenAttrViewGroups(destAv, "force") regenAttrViewGroups(destAv)
av.SaveAttributeView(destAv) av.SaveAttributeView(destAv)
ReloadAttrView(relatedAvID) ReloadAttrView(relatedAvID)
} }
@ -4674,27 +4674,19 @@ func updateTwoWayRelationDestAttrView(attrView *av.AttributeView, relKey *av.Key
} }
if destAv != attrView { if destAv != attrView {
regenAttrViewGroups(destAv, "force") regenAttrViewGroups(destAv)
av.SaveAttributeView(destAv) av.SaveAttributeView(destAv)
} }
} }
// regenAttrViewGroups 重新生成分组视图。 // regenAttrViewGroups 重新生成分组视图。
// keyID: 如果是 "force" 则强制重新生成所有分组视图，否则只生成 keyID 指定的分组字段的分组视图 func regenAttrViewGroups(attrView *av.AttributeView) {
func regenAttrViewGroups(attrView *av.AttributeView, keyID string) {
for _, view := range attrView.Views { for _, view := range attrView.Views {
groupKey := view.GetGroupKey(attrView) groupKey := view.GetGroupKey(attrView)
if nil == groupKey { if nil == groupKey {
continue continue
} }
if "force" != keyID {
if av.KeyTypeTemplate != groupKey.Type && av.KeyTypeRollup != groupKey.Type && av.KeyTypeCreated != groupKey.Type && av.KeyTypeUpdated != groupKey.Type &&
view.Group.Field != keyID {
continue
}
}
genAttrViewGroups(view, attrView) genAttrViewGroups(view, attrView)
} }
} }
@ -4884,7 +4876,7 @@ func updateAttributeViewColumnOptions(operation *Operation) (err error) {
}) })
} }
regenAttrViewGroups(attrView, operation.ID) regenAttrViewGroups(attrView)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
return return
} }
@ -4968,7 +4960,7 @@ func removeAttributeViewColumnOption(operation *Operation) (err error) {
} }
} }
regenAttrViewGroups(attrView, operation.ID) regenAttrViewGroups(attrView)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
return return
} }
@ -5087,7 +5079,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
} }
} }
regenAttrViewGroups(attrView, operation.ID) regenAttrViewGroups(attrView)
err = av.SaveAttributeView(attrView) err = av.SaveAttributeView(attrView)
return return
} }

4
kernel/model/attribute_view_render.go
View file

@ -92,7 +92,7 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
if isGroupByDate(view) { if isGroupByDate(view) {
createdDate := time.UnixMilli(view.GroupCreated).Format("2006-01-02") createdDate := time.UnixMilli(view.GroupCreated).Format("2006-01-02")
if time.Now().Format("2006-01-02") != createdDate { if time.Now().Format("2006-01-02") != createdDate {
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
av.SaveAttributeView(attrView) av.SaveAttributeView(attrView)
} }
} }
@ -108,7 +108,7 @@ func renderAttributeViewGroups(viewable av.Viewable, attrView *av.AttributeView,
for _, groupView := range view.Groups { for _, groupView := range view.Groups {
if (nil == groupView.GroupVal || nil == groupView.GroupKey) && !fixDev { if (nil == groupView.GroupVal || nil == groupView.GroupKey) && !fixDev {
// TODO 分组上线后删除，预计 2025 年 9 月后可以删除 // TODO 分组上线后删除，预计 2025 年 9 月后可以删除
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
av.SaveAttributeView(attrView) av.SaveAttributeView(attrView)
fixDev = true fixDev = true
} }

4
kernel/model/transaction.go
View file

@ -1008,7 +1008,7 @@ func syncDelete2AttributeView(node *ast.Node) (changedAvIDs []string) {
} }
if changedAv { if changedAv {
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
av.SaveAttributeView(attrView) av.SaveAttributeView(attrView)
changedAvIDs = append(changedAvIDs, avID) changedAvIDs = append(changedAvIDs, avID)
} }
@ -1569,7 +1569,7 @@ func upsertAvBlockRel(node *ast.Node) {
for _, avID := range affectedAvIDs { for _, avID := range affectedAvIDs {
attrView, _ := av.ParseAttributeView(avID) attrView, _ := av.ParseAttributeView(avID)
if nil != attrView { if nil != attrView {
regenAttrViewGroups(attrView, "force") regenAttrViewGroups(attrView)
av.SaveAttributeView(attrView) av.SaveAttributeView(attrView)
} }