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 database field default filling https://github.com/siyuan-note/siyuan/issues/15550

Browse source
This commit is contained in:
Daniel 2025-08-12 22:28:52 +08:00
parent 8ba02f517c
commit 7f004877ca
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
kernel/model/attribute_view.go
View file

@ -1769,10 +1769,11 @@ func genAttrViewGroups(view *av.View, attrView *av.AttributeView) {
// GroupState 用于临时记录每个分组视图的状态，以便后面重新生成分组后可以恢复这些状态。 // GroupState 用于临时记录每个分组视图的状态，以便后面重新生成分组后可以恢复这些状态。
type GroupState struct { type GroupState struct {
ID string ID string
Folded bool Folded bool
Hidden int Hidden int
Sort int Sort int
ItemIDs []string
} }
func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState) { func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState) {
@ -1783,10 +1784,11 @@ func getAttrViewGroupStates(view *av.View) (groupStates map[string]*GroupState)
for _, groupView := range view.Groups { for _, groupView := range view.Groups {
groupStates[groupView.GetGroupValue()] = &GroupState{ groupStates[groupView.GetGroupValue()] = &GroupState{
ID: groupView.ID, ID: groupView.ID,
Folded: groupView.GroupFolded, Folded: groupView.GroupFolded,
Hidden: groupView.GroupHidden, Hidden: groupView.GroupHidden,
Sort: groupView.GroupSort, Sort: groupView.GroupSort,
ItemIDs: groupView.GroupItemIDs,
} }
} }
return return
@ -1799,6 +1801,15 @@ func setAttrViewGroupStates(view *av.View, groupStates map[string]*GroupState) {
groupView.GroupFolded = state.Folded groupView.GroupFolded = state.Folded
groupView.GroupHidden = state.Hidden groupView.GroupHidden = state.Hidden
groupView.GroupSort = state.Sort groupView.GroupSort = state.Sort
itemIDsSort := map[string]int{}
for i, itemID := range state.ItemIDs {
itemIDsSort[itemID] = i
}
sort.SliceStable(groupView.GroupItemIDs, func(i, j int) bool {
return itemIDsSort[groupView.GroupItemIDs[i]] < itemIDsSort[groupView.GroupItemIDs[j]]
})
} }
} }
@ -3494,6 +3505,11 @@ func sortAttributeViewRow(operation *Operation) (err error) {
} }
} }
targetGroupView.GroupItemIDs = util.InsertElem(targetGroupView.GroupItemIDs, previousIndex, itemID) targetGroupView.GroupItemIDs = util.InsertElem(targetGroupView.GroupItemIDs, previousIndex, itemID)
if groupKey := view.GetGroupKey(attrView); av.KeyTypeMSelect == groupKey.Type {
// 跨多选分组时一个项目可能会同时存在于多个分组中，需要重新生成分组
regenAttrViewGroups(attrView, "force")
}
} }
} else { // 同分组内排序 } else { // 同分组内排序
for i, r := range groupView.GroupItemIDs { for i, r := range groupView.GroupItemIDs {