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

♻️ Refactor av

Browse source
This commit is contained in:
Daniel 2025-06-08 16:39:45 +08:00
parent d4864d01e4
commit 1dcc635f4d
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

38
kernel/sql/av.go
View file

@ -28,15 +28,15 @@ import (
"github.com/siyuan-note/siyuan/kernel/util" "github.com/siyuan-note/siyuan/kernel/util"
) )
func RenderTemplateField(ial map[string]string, rowValues []*av.KeyValues, tplContent string) (ret string, err error) { func RenderTemplateField(ial map[string]string, keyValues []*av.KeyValues, tplContent string) (ret string, err error) {
if "" == ial["id"] { if "" == ial["id"] {
block := getBlockValue(rowValues) block := getBlockValue(keyValues)
if nil != block && nil != block.Block { if nil != block && nil != block.Block {
ial["id"] = block.Block.ID ial["id"] = block.Block.ID
} }
} }
if "" == ial["updated"] { if "" == ial["updated"] {
block := getBlockValue(rowValues) block := getBlockValue(keyValues)
if nil != block && nil != block.Block { if nil != block && nil != block.Block {
ial["updated"] = time.UnixMilli(block.Block.Updated).Format("20060102150405") ial["updated"] = time.UnixMilli(block.Block.Updated).Format("20060102150405")
} }
@ -94,23 +94,23 @@ func RenderTemplateField(ial map[string]string, rowValues []*av.KeyValues, tplCo
dataModel["id_mod"] = map[string]any{} dataModel["id_mod"] = map[string]any{}
dataModel["id_mod_raw"] = map[string]any{} dataModel["id_mod_raw"] = map[string]any{}
for _, rowValue := range rowValues { for _, keyValue := range keyValues {
if 1 > len(rowValue.Values) { if 1 > len(keyValue.Values) {
continue continue
} }
v := rowValue.Values[0] v := keyValue.Values[0]
if av.KeyTypeNumber == v.Type { if av.KeyTypeNumber == v.Type {
if nil != v.Number && v.Number.IsNotEmpty { if nil != v.Number && v.Number.IsNotEmpty {
dataModel[rowValue.Key.Name] = v.Number.Content dataModel[keyValue.Key.Name] = v.Number.Content
} }
} else if av.KeyTypeDate == v.Type { } else if av.KeyTypeDate == v.Type {
if nil != v.Date { if nil != v.Date {
if v.Date.IsNotEmpty { if v.Date.IsNotEmpty {
dataModel[rowValue.Key.Name] = time.UnixMilli(v.Date.Content) dataModel[keyValue.Key.Name] = time.UnixMilli(v.Date.Content)
} }
if v.Date.IsNotEmpty2 { if v.Date.IsNotEmpty2 {
dataModel[rowValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2) dataModel[keyValue.Key.Name+"_end"] = time.UnixMilli(v.Date.Content2)
} }
} }
} else if av.KeyTypeRollup == v.Type { } else if av.KeyTypeRollup == v.Type {
@ -130,9 +130,9 @@ func RenderTemplateField(ial map[string]string, rowValues []*av.KeyValues, tplCo
} }
if 0 < len(numbers) { if 0 < len(numbers) {
dataModel[rowValue.Key.Name] = numbers dataModel[keyValue.Key.Name] = numbers
} else { } else {
dataModel[rowValue.Key.Name] = contents dataModel[keyValue.Key.Name] = contents
} }
} }
} else if av.KeyTypeRelation == v.Type { } else if av.KeyTypeRelation == v.Type {
@ -141,10 +141,10 @@ func RenderTemplateField(ial map[string]string, rowValues []*av.KeyValues, tplCo
for _, content := range v.Relation.Contents { for _, content := range v.Relation.Contents {
contents = append(contents, content.String(true)) contents = append(contents, content.String(true))
} }
dataModel[rowValue.Key.Name] = contents dataModel[keyValue.Key.Name] = contents
} }
} else if av.KeyTypeBlock == v.Type { } else if av.KeyTypeBlock == v.Type {
dataModel[rowValue.Key.Name+"_created"] = time.Now() dataModel[keyValue.Key.Name+"_created"] = time.Now()
if nil != v.Block { if nil != v.Block {
dataModel["entryCreated"] = time.UnixMilli(v.Block.Created) dataModel["entryCreated"] = time.UnixMilli(v.Block.Created)
} }
@ -152,17 +152,17 @@ func RenderTemplateField(ial map[string]string, rowValues []*av.KeyValues, tplCo
if nil != v.Block { if nil != v.Block {
dataModel["entryUpdated"] = time.UnixMilli(v.Block.Updated) dataModel["entryUpdated"] = time.UnixMilli(v.Block.Updated)
} }
dataModel[rowValue.Key.Name] = v.String(true) dataModel[keyValue.Key.Name] = v.String(true)
} else { } else {
dataModel[rowValue.Key.Name] = v.String(true) dataModel[keyValue.Key.Name] = v.String(true)
} }
// Database template fields support access to the raw value https://github.com/siyuan-note/siyuan/issues/14903 // Database template fields support access to the raw value https://github.com/siyuan-note/siyuan/issues/14903
dataModel[rowValue.Key.Name+"_raw"] = v dataModel[keyValue.Key.Name+"_raw"] = v
// Database template fields support access by ID https://github.com/siyuan-note/siyuan/issues/11237 // Database template fields support access by ID https://github.com/siyuan-note/siyuan/issues/11237
dataModel["id_mod"].(map[string]any)[rowValue.Key.ID] = dataModel[rowValue.Key.Name] dataModel["id_mod"].(map[string]any)[keyValue.Key.ID] = dataModel[keyValue.Key.Name]
dataModel["id_mod_raw"].(map[string]any)[rowValue.Key.ID] = v dataModel["id_mod_raw"].(map[string]any)[keyValue.Key.ID] = v
} }
if err = tpl.Execute(buf, dataModel); err != nil { if err = tpl.Execute(buf, dataModel); err != nil {
@ -173,7 +173,7 @@ func RenderTemplateField(ial map[string]string, rowValues []*av.KeyValues, tplCo
return return
} }
func fillAttributeViewNilValue(value *av.Value, rowID, colID string, typ av.KeyType) { func fillAttributeViewNilValue(value *av.Value, typ av.KeyType) {
value.Type = typ value.Type = typ
switch typ { switch typ {
case av.KeyTypeText: case av.KeyTypeText:

2
kernel/sql/av_gallery.go
View file

@ -139,7 +139,7 @@ func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query
if nil == fieldValue.Value { if nil == fieldValue.Value {
fieldValue.Value = av.GetAttributeViewDefaultValue(fieldValue.ID, field.ID, cardID, fieldValue.ValueType) fieldValue.Value = av.GetAttributeViewDefaultValue(fieldValue.ID, field.ID, cardID, fieldValue.ValueType)
} else { } else {
fillAttributeViewNilValue(fieldValue.Value, cardID, field.ID, fieldValue.ValueType) fillAttributeViewNilValue(fieldValue.Value, fieldValue.ValueType)
} }
galleryCard.Values = append(galleryCard.Values, fieldValue) galleryCard.Values = append(galleryCard.Values, fieldValue)

2
kernel/sql/av_table.go
View file

@ -157,7 +157,7 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
if nil == tableCell.Value { if nil == tableCell.Value {
tableCell.Value = av.GetAttributeViewDefaultValue(tableCell.ID, col.ID, rowID, tableCell.ValueType) tableCell.Value = av.GetAttributeViewDefaultValue(tableCell.ID, col.ID, rowID, tableCell.ValueType)
} else { } else {
fillAttributeViewNilValue(tableCell.Value, rowID, col.ID, tableCell.ValueType) fillAttributeViewNilValue(tableCell.Value, tableCell.ValueType)
} }
tableRow.Cells = append(tableRow.Cells, tableCell) tableRow.Cells = append(tableRow.Cells, tableCell)