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

♻️ Refactor av

Browse source
This commit is contained in:
Daniel 2025-06-08 22:41:03 +08:00
parent 8a9d0136a7
commit 6ba4058a13
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
kernel/sql/av_table.go
View file

@ -73,23 +73,23 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
} }
// 生成行 // 生成行
rows := map[string][]*av.KeyValues{} rowsValues := map[string][]*av.KeyValues{}
for _, keyValues := range attrView.KeyValues { for _, keyValues := range attrView.KeyValues {
for _, val := range keyValues.Values { for _, val := range keyValues.Values {
values := rows[val.BlockID] values := rowsValues[val.BlockID]
if nil == values { if nil == values {
values = []*av.KeyValues{{Key: keyValues.Key, Values: []*av.Value{val}}} values = []*av.KeyValues{{Key: keyValues.Key, Values: []*av.Value{val}}}
} else { } else {
values = append(values, &av.KeyValues{Key: keyValues.Key, Values: []*av.Value{val}}) values = append(values, &av.KeyValues{Key: keyValues.Key, Values: []*av.Value{val}})
} }
rows[val.BlockID] = values rowsValues[val.BlockID] = values
} }
} }
// 过滤掉不存在的行 // 过滤掉不存在的行
var notFound []string var notFound []string
var toCheckBlockIDs []string var toCheckBlockIDs []string
for blockID, keyValues := range rows { for blockID, keyValues := range rowsValues {
blockValue := getBlockValue(keyValues) blockValue := getBlockValue(keyValues)
if nil == blockValue { if nil == blockValue {
notFound = append(notFound, blockID) notFound = append(notFound, blockID)
@ -114,15 +114,15 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
} }
} }
for _, blockID := range notFound { for _, blockID := range notFound {
delete(rows, blockID) delete(rowsValues, blockID)
} }
// 生成行单元格 // 生成行单元格
for rowID, row := range rows { for rowID, rowValues := range rowsValues {
var tableRow av.TableRow var tableRow av.TableRow
for _, col := range ret.Columns { for _, col := range ret.Columns {
var tableCell *av.TableCell var tableCell *av.TableCell
for _, keyValues := range row { for _, keyValues := range rowValues {
if keyValues.Key.ID == col.ID { if keyValues.Key.ID == col.ID {
tableCell = &av.TableCell{ tableCell = &av.TableCell{
BaseValue: &av.BaseValue{ BaseValue: &av.BaseValue{
@ -250,11 +250,11 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
cell.Value.Rollup.RenderContents(rollupKey.Rollup.Calc, destKey) cell.Value.Rollup.RenderContents(rollupKey.Rollup.Calc, destKey)
// 将汇总列的值保存到 rows 中，后续渲染模板列的时候会用到，下同 // 将汇总列的值保存到 rowsValues 中，后续渲染模板列的时候会用到，下同
// Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442 // Database table view template columns support reading relation, rollup, created and updated columns https://github.com/siyuan-note/siyuan/issues/10442
keyValues := rows[row.ID] keyValues := rowsValues[row.ID]
keyValues = append(keyValues, &av.KeyValues{Key: rollupKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: rollupKey.ID, BlockID: row.ID, Type: av.KeyTypeRollup, Rollup: cell.Value.Rollup}}}) keyValues = append(keyValues, &av.KeyValues{Key: rollupKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: rollupKey.ID, BlockID: row.ID, Type: av.KeyTypeRollup, Rollup: cell.Value.Rollup}}})
rows[row.ID] = keyValues rowsValues[row.ID] = keyValues
case av.KeyTypeRelation: // 渲染关联列 case av.KeyTypeRelation: // 渲染关联列
relKey, _ := attrView.GetKey(cell.Value.KeyID) relKey, _ := attrView.GetKey(cell.Value.KeyID)
if nil != relKey && nil != relKey.Relation { if nil != relKey && nil != relKey.Relation {
@ -281,9 +281,9 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
} }
} }
keyValues := rows[row.ID] keyValues := rowsValues[row.ID]
keyValues = append(keyValues, &av.KeyValues{Key: relKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: relKey.ID, BlockID: row.ID, Type: av.KeyTypeRelation, Relation: cell.Value.Relation}}}) keyValues = append(keyValues, &av.KeyValues{Key: relKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: relKey.ID, BlockID: row.ID, Type: av.KeyTypeRelation, Relation: cell.Value.Relation}}})
rows[row.ID] = keyValues rowsValues[row.ID] = keyValues
case av.KeyTypeCreated: // 渲染创建时间 case av.KeyTypeCreated: // 渲染创建时间
createdStr := row.ID[:len("20060102150405")] createdStr := row.ID[:len("20060102150405")]
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local) created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
@ -294,10 +294,10 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone) cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone)
} }
keyValues := rows[row.ID] keyValues := rowsValues[row.ID]
createdKey, _ := attrView.GetKey(cell.Value.KeyID) createdKey, _ := attrView.GetKey(cell.Value.KeyID)
keyValues = append(keyValues, &av.KeyValues{Key: createdKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: createdKey.ID, BlockID: row.ID, Type: av.KeyTypeCreated, Created: cell.Value.Created}}}) keyValues = append(keyValues, &av.KeyValues{Key: createdKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: createdKey.ID, BlockID: row.ID, Type: av.KeyTypeCreated, Created: cell.Value.Created}}})
rows[row.ID] = keyValues rowsValues[row.ID] = keyValues
case av.KeyTypeUpdated: // 渲染更新时间 case av.KeyTypeUpdated: // 渲染更新时间
ial := ials[row.ID] ial := ials[row.ID]
if nil == ial { if nil == ial {
@ -318,10 +318,10 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
} }
} }
keyValues := rows[row.ID] keyValues := rowsValues[row.ID]
updatedKey, _ := attrView.GetKey(cell.Value.KeyID) updatedKey, _ := attrView.GetKey(cell.Value.KeyID)
keyValues = append(keyValues, &av.KeyValues{Key: updatedKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: updatedKey.ID, BlockID: row.ID, Type: av.KeyTypeUpdated, Updated: cell.Value.Updated}}}) keyValues = append(keyValues, &av.KeyValues{Key: updatedKey, Values: []*av.Value{{ID: cell.Value.ID, KeyID: updatedKey.ID, BlockID: row.ID, Type: av.KeyTypeUpdated, Updated: cell.Value.Updated}}})
rows[row.ID] = keyValues rowsValues[row.ID] = keyValues
} }
} }
} }
@ -334,7 +334,7 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
for _, cell := range row.Cells { for _, cell := range row.Cells {
switch cell.ValueType { switch cell.ValueType {
case av.KeyTypeTemplate: // 渲染模板列 case av.KeyTypeTemplate: // 渲染模板列
keyValues := rows[row.ID] keyValues := rowsValues[row.ID]
ial := ials[row.ID] ial := ials[row.ID]
if nil == ial { if nil == ial {
ial = map[string]string{} ial = map[string]string{}