This commit is contained in:
Daniel 2024-01-01 23:34:15 +08:00
parent da2475deab
commit 6462107872
No known key found for this signature in database
GPG key ID: 86211BA83DF03017

View file

@ -312,7 +312,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
if 0 < len(kv.Values) { if 0 < len(kv.Values) {
ial := map[string]string{} ial := map[string]string{}
block := getRowBlockValue(keyValues) block := getRowBlockValue(keyValues)
if !block.IsDetached { if nil != block && !block.IsDetached {
ial = GetBlockAttrsWithoutWaitWriting(blockID) ial = GetBlockAttrsWithoutWaitWriting(blockID)
} }
kv.Values[0].Template.Content = renderTemplateCol(ial, kv.Key.Template, keyValues) kv.Values[0].Template.Content = renderTemplateCol(ial, kv.Key.Template, keyValues)
@ -592,8 +592,10 @@ func renderAttributeView(attrView *av.AttributeView, viewID string, page, pageSi
func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av.KeyValues) string { func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av.KeyValues) string {
if "" == ial["id"] { if "" == ial["id"] {
block := getRowBlockValue(rowValues) block := getRowBlockValue(rowValues)
if nil != block && nil != block.Block {
ial["id"] = block.Block.ID ial["id"] = block.Block.ID
} }
}
if "" == ial["updated"] { if "" == ial["updated"] {
block := getRowBlockValue(rowValues) block := getRowBlockValue(rowValues)
ial["updated"] = time.UnixMilli(block.Block.Updated).Format("20060102150405") ial["updated"] = time.UnixMilli(block.Block.Updated).Format("20060102150405")