Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-05 16:28: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 2024-01-01 15:07:02 +08:00
commit 416e50fc37
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/av/av.go
View file

@ -275,8 +275,26 @@ func SaveAttributeView(av *AttributeView) (err error) {
}
for _, v := range kv.Values {
if "" == v.KeyID {
v.KeyID = kv.Key.ID
if "" == kv.Key.ID {
kv.Key.ID = ast.NewNodeID()
for _, val := range kv.Values {
val.KeyID = kv.Key.ID
}
if "" == v.KeyID {
v.KeyID = kv.Key.ID
}
for _, view := range av.Views {
switch view.LayoutType {
case LayoutTypeTable:
for _, column := range view.Table.Columns {
if "" == column.ID {
column.ID = kv.Key.ID
break
}
}
}
}
}
}
}

2
kernel/model/attribute_view.go
View file

@ -49,7 +49,7 @@ func SearchAttributeViewNonRelationKey(avID, keyword string) (ret []*av.Key) {
}
for _, keyValues := range attrView.KeyValues {
if av.KeyTypeRelation != keyValues.Key.Type {
if av.KeyTypeRelation != keyValues.Key.Type && av.KeyTypeRollup != keyValues.Key.Type {
if strings.Contains(strings.ToLower(keyValues.Key.Name), strings.ToLower(keyword)) {
ret = append(ret, keyValues.Key)
}