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

🎨 Improve default value filling https://github.com/siyuan-note/siyuan/issues/10038

Browse source
This commit is contained in:
Daniel 2024-01-01 14:32:32 +08:00
parent a12f3f5c42
commit d7e5411e55
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 63 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
kernel/model/attribute_view.go
View file

@ -246,15 +246,21 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
if nil != destAv { if nil != destAv {
for _, bID := range relVal.Relation.BlockIDs { for _, bID := range relVal.Relation.BlockIDs {
destVal := destAv.GetValue(kv.Key.Rollup.KeyID, bID) destVal := destAv.GetValue(kv.Key.Rollup.KeyID, bID)
if nil != destVal { if nil == destVal {
if av.KeyTypeNumber == destVal.Type { destKey, _ := destAv.GetKey(kv.Key.Rollup.KeyID)
destVal.Number.Format = kv.Key.NumberFormat if nil == destKey {
destVal.Number.FormatNumber() continue
} }
kv.Values[0].Rollup.Contents = append(kv.Values[0].Rollup.Contents, destVal.String()) destVal = treenode.GetAttributeViewDefaultValue(ast.NewNodeID(), kv.Key.Rollup.KeyID, blockID, destKey.Type)
} }
if av.KeyTypeNumber == destVal.Type {
destVal.Number.Format = kv.Key.NumberFormat
destVal.Number.FormatNumber()
}
kv.Values[0].Rollup.Contents = append(kv.Values[0].Rollup.Contents, destVal.String())
kv.Values[0].Rollup.RenderContents(kv.Key.Rollup.Calc) kv.Values[0].Rollup.RenderContents(kv.Key.Rollup.Calc)
} }
} }
@ -814,7 +820,12 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
for _, blockID := range relVal.Relation.BlockIDs { for _, blockID := range relVal.Relation.BlockIDs {
destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID) destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID)
if nil == destVal { if nil == destVal {
continue destKey, _ := destAv.GetKey(rollupKey.Rollup.KeyID)
if nil == destKey {
continue
}
destVal = treenode.GetAttributeViewDefaultValue(ast.NewNodeID(), rollupKey.Rollup.KeyID, blockID, destKey.Type)
} }
if av.KeyTypeNumber == destVal.Type { if av.KeyTypeNumber == destVal.Type {
destVal.Number.Format = rollupKey.NumberFormat destVal.Number.Format = rollupKey.NumberFormat

48
kernel/treenode/node.go
View file

@ -777,7 +777,12 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
for _, blockID := range relVal.Relation.BlockIDs { for _, blockID := range relVal.Relation.BlockIDs {
destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID) destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID)
if nil == destVal { if nil == destVal {
continue destKey, _ := destAv.GetKey(rollupKey.Rollup.KeyID)
if nil == destKey {
continue
}
destVal = GetAttributeViewDefaultValue(ast.NewNodeID(), rollupKey.Rollup.KeyID, blockID, destKey.Type)
} }
if av.KeyTypeNumber == destVal.Type { if av.KeyTypeNumber == destVal.Type {
destVal.Number.Format = rollupKey.NumberFormat destVal.Number.Format = rollupKey.NumberFormat
@ -841,8 +846,10 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
func FillAttributeViewTableCellNilValue(tableCell *av.TableCell, rowID, colID string) { func FillAttributeViewTableCellNilValue(tableCell *av.TableCell, rowID, colID string) {
if nil == tableCell.Value { if nil == tableCell.Value {
tableCell.Value = &av.Value{ID: tableCell.ID, KeyID: colID, BlockID: rowID, Type: tableCell.ValueType} tableCell.Value = GetAttributeViewDefaultValue(tableCell.ID, colID, rowID, tableCell.ValueType)
return
} }
tableCell.Value.Type = tableCell.ValueType tableCell.Value.Type = tableCell.ValueType
switch tableCell.ValueType { switch tableCell.ValueType {
case av.KeyTypeText: case av.KeyTypeText:
@ -908,6 +915,43 @@ func FillAttributeViewTableCellNilValue(tableCell *av.TableCell, rowID, colID st
} }
} }
func GetAttributeViewDefaultValue(valueID, keyID, blockID string, typ av.KeyType) (ret *av.Value) {
ret = &av.Value{ID: valueID, KeyID: keyID, BlockID: blockID, Type: typ}
switch typ {
case av.KeyTypeText:
ret.Text = &av.ValueText{}
case av.KeyTypeNumber:
ret.Number = &av.ValueNumber{}
case av.KeyTypeDate:
ret.Date = &av.ValueDate{}
case av.KeyTypeSelect:
ret.MSelect = []*av.ValueSelect{}
case av.KeyTypeMSelect:
ret.MSelect = []*av.ValueSelect{}
case av.KeyTypeURL:
ret.URL = &av.ValueURL{}
case av.KeyTypeEmail:
ret.Email = &av.ValueEmail{}
case av.KeyTypePhone:
ret.Phone = &av.ValuePhone{}
case av.KeyTypeMAsset:
ret.MAsset = []*av.ValueAsset{}
case av.KeyTypeTemplate:
ret.Template = &av.ValueTemplate{}
case av.KeyTypeCreated:
ret.Created = &av.ValueCreated{}
case av.KeyTypeUpdated:
ret.Updated = &av.ValueUpdated{}
case av.KeyTypeCheckbox:
ret.Checkbox = &av.ValueCheckbox{}
case av.KeyTypeRelation:
ret.Relation = &av.ValueRelation{}
case av.KeyTypeRollup:
ret.Rollup = &av.ValueRollup{}
}
return
}
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)