|
@@ -340,9 +340,13 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
|
|
|
for _, bID := range relVal.Relation.BlockIDs {
|
|
|
destVal := destAv.GetValue(kv.Key.Rollup.KeyID, bID)
|
|
|
if nil == destVal {
|
|
|
- destVal = treenode.GetAttributeViewDefaultValue(ast.NewNodeID(), kv.Key.Rollup.KeyID, blockID, destKey.Type)
|
|
|
+ if destAv.ExistBlock(bID) { // 数据库中存在行但是列值不存在是数据未初始化,这里补一个默认值
|
|
|
+ destVal = treenode.GetAttributeViewDefaultValue(ast.NewNodeID(), kv.Key.Rollup.KeyID, bID, destKey.Type)
|
|
|
+ }
|
|
|
+ if nil == destVal {
|
|
|
+ continue
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
if av.KeyTypeNumber == destKey.Type {
|
|
|
destVal.Number.Format = destKey.NumberFormat
|
|
|
destVal.Number.FormatNumber()
|
|
@@ -1001,7 +1005,12 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
|
|
|
for _, blockID := range relVal.Relation.BlockIDs {
|
|
|
destVal := destAv.GetValue(rollupKey.Rollup.KeyID, blockID)
|
|
|
if nil == destVal {
|
|
|
- continue
|
|
|
+ if destAv.ExistBlock(blockID) { // 数据库中存在行但是列值不存在是数据未初始化,这里补一个默认值
|
|
|
+ destVal = treenode.GetAttributeViewDefaultValue(ast.NewNodeID(), rollupKey.Rollup.KeyID, blockID, destKey.Type)
|
|
|
+ }
|
|
|
+ if nil == destVal {
|
|
|
+ continue
|
|
|
+ }
|
|
|
}
|
|
|
if av.KeyTypeNumber == destKey.Type {
|
|
|
destVal.Number.Format = destKey.NumberFormat
|