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

🎨 Attribute View number column format https://github.com/siyuan-note/siyuan/issues/8764

Browse source
This commit is contained in:
Daniel 2023-08-03 22:47:37 +08:00
parent 760598d943
commit 9a5e9f1a14
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/model/attribute_view.go
View file

@ -149,6 +149,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
Sorts: view.Table.Sorts,
}
// 组装列
for _, col := range view.Table.Columns {
key, getErr := attrView.GetKey(col.ID)
if nil != getErr {
@ -169,6 +170,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
})
}
// 生成行
rows := map[string][]*av.Value{}
for _, keyValues := range attrView.KeyValues {
for _, val := range keyValues.Values {
@ -176,6 +178,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
}
}
// 过滤掉不存在的行
notFound := []string{}
for blockID, _ := range rows {
if treenode.GetBlockTree(blockID) == nil {
@ -186,6 +189,7 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
delete(rows, blockID)
}
// 生成行单元格
for rowID, row := range rows {
var tableRow av.TableRow
for _, col := range ret.Columns {
@ -207,11 +211,17 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
}
}
tableRow.ID = rowID
if av.KeyTypeNumber == tableCell.ValueType {
tableCell.Value.Number.FormatNumber()
}
tableRow.Cells = append(tableRow.Cells, tableCell)
}
ret.Rows = append(ret.Rows, &tableRow)
}
// 自定义排序
sortRowIDs := map[string]int{}
if 0 < len(view.Table.RowIDs) {
for i, rowID := range view.Table.RowIDs {