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

🎨 Improve adding rows of the filtered database table view https://github.com/siyuan-note/siyuan/issues/10025

Browse source
This commit is contained in:
Daniel 2023-12-30 17:13:53 +08:00
parent 76dd5a2d28
commit 456feff45a
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/av/av.go
View file

@ -267,6 +267,12 @@ func SaveAttributeView(av *AttributeView) (err error) {
} }
} }
} }
for _, v := range kv.Values {
if "" == v.KeyID {
v.KeyID = kv.Key.ID
}
}
} }
// 数据订正 // 数据订正

4
kernel/av/filter.go
View file

@ -141,11 +141,11 @@ func (filter *ViewFilter) GetAffectValue(key *Key) (ret *Value) {
switch filter.Operator { switch filter.Operator {
case FilterOperatorIsEqual, FilterOperatorContains: case FilterOperatorIsEqual, FilterOperatorContains:
if 0 < len(filter.Value.MSelect) { if 0 < len(filter.Value.MSelect) {
ret.MSelect = []*ValueSelect{{Content: filter.Value.MSelect[0].Content}} ret.MSelect = []*ValueSelect{{Content: filter.Value.MSelect[0].Content, Color: filter.Value.MSelect[0].Color}}
} }
case FilterOperatorIsNotEqual, FilterOperatorDoesNotContain: case FilterOperatorIsNotEqual, FilterOperatorDoesNotContain:
if 0 < len(filter.Value.MSelect) { if 0 < len(filter.Value.MSelect) {
ret.MSelect = []*ValueSelect{{Content: filter.Value.MSelect[0].Content + " Untitled"}} ret.MSelect = []*ValueSelect{{Content: filter.Value.MSelect[0].Content + " Untitled", Color: "1"}}
} }
case FilterOperatorIsEmpty: case FilterOperatorIsEmpty:
ret.MSelect = []*ValueSelect{} ret.MSelect = []*ValueSelect{}

6
kernel/model/attribute_view.go
View file

@ -1520,6 +1520,7 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
newValue.IsDetached = operation.IsDetached newValue.IsDetached = operation.IsDetached
values, _ := attrView.GetKeyValues(filter.Column) values, _ := attrView.GetKeyValues(filter.Column)
values.Values = append(values.Values, newValue) values.Values = append(values.Values, newValue)
break
} }
} }
} }
@ -1533,10 +1534,11 @@ func addAttributeViewBlock(blockID string, operation *Operation, tree *parse.Tre
if keyValues.Key.ID == filter.Column { if keyValues.Key.ID == filter.Column {
newValue := filter.GetAffectValue(keyValues.Key) newValue := filter.GetAffectValue(keyValues.Key)
newValue.ID = ast.NewNodeID() newValue.ID = ast.NewNodeID()
newValue.KeyID = keyValues.Key.ID
newValue.BlockID = blockID newValue.BlockID = blockID
newValue.IsDetached = operation.IsDetached newValue.IsDetached = operation.IsDetached
values, _ := attrView.GetKeyValues(filter.Column) keyValues.Values = append(keyValues.Values, newValue)
values.Values = append(values.Values, newValue) break
} }
} }
} }