Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58:49 +01:00
Code Issues 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 11:19:11 +08:00
commit 801b06117a
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
kernel/model/attribute_view.go
View file

@ -325,11 +325,9 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
colID := operation.ID
data := operation.Data.(map[string]interface{})
var oldName, newName string
if nil == data["newName"] {
oldName = data["oldName"].(string)
newName = data["newName"].(string)
}
oldName := data["oldName"].(string)
newName := data["newName"].(string)
newColor := data["newColor"].(string)
var colIndex int
for i, col := range attrView.Columns {
@ -345,6 +343,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
}
opt.Name = newName
opt.Color = newColor
break
}
break
@ -352,23 +351,23 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
for _, row := range attrView.Rows {
for k, cell := range row.Cells {
if colIndex != k {
if colIndex != k || nil == cell.Value {
continue
}
if nil != cell.Value {
if nil != cell.Value.Select {
if oldName == cell.Value.Select.Content {
cell.Value.Select.Content = newName
if nil != cell.Value.Select {
if oldName == cell.Value.Select.Content {
cell.Value.Select.Content = newName
cell.Value.Select.Color = newColor
break
}
} else if nil != cell.Value.MSelect {
for j, opt := range cell.Value.MSelect {
if oldName == opt.Content {
cell.Value.MSelect[j].Content = newName
cell.Value.MSelect[j].Color = newColor
break
}
} else if nil != cell.Value.MSelect {
for j, opt := range cell.Value.MSelect {
if oldName == opt.Content {
cell.Value.MSelect[j].Content = newName
break
}
}
}
}
break