github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-04 07:51:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Add Relation column to database table view https://github.com/siyuan-note/siyuan/issues/9888

Browse Source
This commit is contained in:
Daniel 2023-12-25 12:06:53 +08:00
parent 0f96b8e469
commit 8b12b51c52
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/model/attribute_view.go
View File

@ -878,6 +878,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
// operation.IsTwoWay 是否双向关联 // operation.IsTwoWay 是否双向关联
// operation.BackRelationKeyID 双向关联的目标关联列 ID // operation.BackRelationKeyID 双向关联的目标关联列 ID
// operation.Name 双向关联的目标关联列名称 // operation.Name 双向关联的目标关联列名称
// operation.Format 源 av 关联列名称
srcAv, err := av.ParseAttributeView(operation.AvID) srcAv, err := av.ParseAttributeView(operation.AvID)
if nil != err { if nil != err {
@ -934,6 +935,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
srcRel.BackKeyID = "" srcRel.BackKeyID = ""
} }
keyValues.Key.Relation = srcRel keyValues.Key.Relation = srcRel
keyValues.Key.Name = operation.Format
break break
} }
@ -950,9 +952,9 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
if operation.IsTwoWay { if operation.IsTwoWay {
name := strings.TrimSpace(operation.Name) name := strings.TrimSpace(operation.Name)
if "" == name { if "" == name {
name = srcAv.Name name = srcAv.Name + " " + operation.Format
} }
backRelKey.Name = name backRelKey.Name = strings.TrimSpace(name)
} }
} }
@ -960,7 +962,7 @@ func updateAttributeViewColRelation(operation *Operation) (err error) {
if operation.IsTwoWay { if operation.IsTwoWay {
name := strings.TrimSpace(operation.Name) name := strings.TrimSpace(operation.Name)
if "" == name { if "" == name {
name = srcAv.Name name = srcAv.Name + " " + operation.Format
} }
destAv.KeyValues = append(destAv.KeyValues, &av.KeyValues{ destAv.KeyValues = append(destAv.KeyValues, &av.KeyValues{