0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-11-18 16:01:36 +08:00
commit b31c5eb11d
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/model/attribute_view.go
View file

@ -3464,6 +3464,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
oldName := data["oldName"].(string)
newName := data["newName"].(string)
newColor := data["newColor"].(string)
newDesc := data["newDesc"].(string)
found := false
if oldName != newName {
@ -3471,6 +3472,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
if newName == opt.Name { // 如果选项已经存在则直接使用
found = true
newColor = opt.Color
newDesc = opt.Desc
break
}
}
@ -3481,6 +3483,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
if oldName == opt.Name {
key.Options[i].Name = newName
key.Options[i].Color = newColor
key.Options[i].Desc = newDesc
break
}
}