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 2023-07-10 19:03:11 +08:00
commit b33ef1389d
1 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
kernel/model/attribute_view.go
View file

@ -336,22 +336,31 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
}
colIndex = i
for _, opt := range col.Options {
if opt.Name != oldName {
continue
existOpt := false
for j, opt := range col.Options {
if opt.Name == newName {
existOpt = true
col.Options = append(col.Options[:j], col.Options[j+1:]...)
break
}
}
if !existOpt {
for _, opt := range col.Options {
if opt.Name != oldName {
continue
}
opt.Name = newName
opt.Color = newColor
break
opt.Name = newName
opt.Color = newColor
break
}
}
break
}
for _, row := range attrView.Rows {
for k, cell := range row.Cells {
if colIndex != k || nil == cell.Value {
for i, cell := range row.Cells {
if colIndex != i || nil == cell.Value {
continue
}
@ -362,13 +371,23 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
break
}
} else if nil != cell.Value.MSelect {
existInMSelect := false
for j, opt := range cell.Value.MSelect {
if oldName == opt.Content {
cell.Value.MSelect[j].Content = newName
cell.Value.MSelect[j].Color = newColor
if opt.Content == newName {
existInMSelect = true
cell.Value.MSelect = append(cell.Value.MSelect[:j], cell.Value.MSelect[j+1:]...)
break
}
}
if !existInMSelect {
for j, opt := range cell.Value.MSelect {
if oldName == opt.Content {
cell.Value.MSelect[j].Content = newName
cell.Value.MSelect[j].Color = newColor
break
}
}
}
}
break
}