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

🎨 Improve av https://github.com/siyuan-note/siyuan/issues/15563#issuecomment-3592191959

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-01 09:48:24 +08:00
parent 323b9345fc
commit a2152fd423
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/av/value.go
View file

@ -682,6 +682,15 @@ type ValueSelect struct {
Color string `json:"color"` // 1-14 Color string `json:"color"` // 1-14
} }
func MSelectRemoveOption(mSelect []*ValueSelect, opt string) (ret []*ValueSelect) {
for _, s := range mSelect {
if s.Content != opt {
ret = append(ret, s)
}
}
return
}
func MSelectExistOption(mSelect []*ValueSelect, opt string) bool { func MSelectExistOption(mSelect []*ValueSelect, opt string) bool {
for _, s := range mSelect { for _, s := range mSelect {
if s.Content == opt { if s.Content == opt {

13
kernel/model/attribute_view.go
View file

@ -231,8 +231,10 @@ func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, group
// 因为单选或多选只能按选项分组，并且可能存在空白分组（找不到临近项），所以单选或多选类型的分组字段使用分组值内容对应的选项 // 因为单选或多选只能按选项分组，并且可能存在空白分组（找不到临近项），所以单选或多选类型的分组字段使用分组值内容对应的选项
if opt := groupKey.GetOption(groupView.GetGroupValue()); nil != opt && groupValueDefault != groupView.GetGroupValue() { if opt := groupKey.GetOption(groupView.GetGroupValue()); nil != opt && groupValueDefault != groupView.GetGroupValue() {
if nil == newValue { if nil == newValue {
// 如果没有临近项，则尝试从过滤结果中获取 newValue = ret[groupKey.ID] // 如果没有临近项，则尝试从过滤结果中获取
newValue = ret[groupKey.ID] }
if nil == newValue {
newValue = keyValues.GetValue(addingItemID) // 尝试从已有值中获取
} }
if nil != newValue { if nil != newValue {
@ -3983,6 +3985,13 @@ func sortAttributeViewRow(operation *Operation) (err error) {
if targetGroupView := view.GetGroupByID(operation.TargetGroupID); nil != targetGroupView && !gulu.Str.Contains(itemID, targetGroupView.GroupItemIDs) { if targetGroupView := view.GetGroupByID(operation.TargetGroupID); nil != targetGroupView && !gulu.Str.Contains(itemID, targetGroupView.GroupItemIDs) {
fillDefaultValue(attrView, view, targetGroupView, operation.PreviousID, itemID, false) fillDefaultValue(attrView, view, targetGroupView, operation.PreviousID, itemID, false)
// 移除旧分组的值
if val := attrView.GetValue(groupKey.ID, itemID); nil != val {
if av.MSelectExistOption(val.MSelect, groupView.GetGroupValue()) {
val.MSelect = av.MSelectRemoveOption(val.MSelect, groupView.GetGroupValue())
}
}
for i, r := range targetGroupView.GroupItemIDs { for i, r := range targetGroupView.GroupItemIDs {
if r == operation.PreviousID { if r == operation.PreviousID {
previousIndex = i + 1 previousIndex = i + 1