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

🎨 Improve database table view

Browse source
This commit is contained in:
Daniel 2023-12-18 22:29:17 +08:00
parent fcd134ad2d
commit 2843350737
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kernel/model/attribute_view.go
View file

@ -589,7 +589,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
keyValues := rows[row.ID]
ial := map[string]string{}
block := row.GetBlockValue()
if !block.IsDetached {
if nil != block && !block.IsDetached {
ial = GetBlockAttrsWithoutWaitWriting(row.ID)
}
content := renderTemplateCol(ial, cell.Value.Template.Content, keyValues)
@ -606,12 +606,11 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
case av.KeyTypeUpdated: // 渲染更新时间
ial := map[string]string{}
block := row.GetBlockValue()
if !block.IsDetached {
if nil != block && !block.IsDetached {
ial = GetBlockAttrsWithoutWaitWriting(row.ID)
}
updatedStr := ial["updated"]
if "" == updatedStr {
block := row.GetBlockValue()
if "" == updatedStr && nil != block {
cell.Value.Updated = av.NewFormattedValueUpdated(block.Block.Updated, 0, av.UpdatedFormatNone)
cell.Value.Updated.IsNotEmpty = true
} else {
@ -1184,7 +1183,7 @@ func GetLastSortRow(rows []*av.TableRow) *av.TableRow {
for i := len(rows) - 1; i >= 0; i-- {
row := rows[i]
block := row.GetBlockValue()
if !block.NotAffectFilter() {
if nil != block && !block.NotAffectFilter() {
return row
}
}