This commit is contained in:
Daniel 2024-12-19 23:08:44 +08:00
parent dbb5bcccb1
commit 0cc98a5fe0
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 236 additions and 200 deletions

View file

@ -875,82 +875,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
}
// 做一些数据兼容和订正处理,保存的时候也会做 av.SaveAttributeView()
currentTimeMillis := util.CurrentTimeMillis()
for _, kv := range attrView.KeyValues {
switch kv.Key.Type {
case av.KeyTypeBlock: // 补全 block 的创建时间和更新时间
for _, v := range kv.Values {
if 0 == v.Block.Created {
if "" == v.Block.ID {
v.Block.ID = v.BlockID
if "" == v.Block.ID {
v.Block.ID = ast.NewNodeID()
v.BlockID = v.Block.ID
}
}
createdStr := v.Block.ID[:len("20060102150405")]
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
if nil == parseErr {
v.Block.Created = created.UnixMilli()
} else {
v.Block.Created = currentTimeMillis
}
}
if 0 == v.Block.Updated {
v.Block.Updated = v.Block.Created
}
}
}
for _, v := range kv.Values {
// 校验日期 IsNotEmpty
if av.KeyTypeDate == kv.Key.Type {
if nil != v.Date && 0 != v.Date.Content && !v.Date.IsNotEmpty {
v.Date.IsNotEmpty = true
}
}
// 校验数字 IsNotEmpty
if av.KeyTypeNumber == kv.Key.Type {
if nil != v.Number && 0 != v.Number.Content && !v.Number.IsNotEmpty {
v.Number.IsNotEmpty = true
}
}
// 补全值的创建时间和更新时间
if "" == v.ID {
v.ID = ast.NewNodeID()
}
if 0 == v.CreatedAt {
createdStr := v.ID[:len("20060102150405")]
created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
if nil == parseErr {
v.CreatedAt = created.UnixMilli()
} else {
v.CreatedAt = currentTimeMillis
}
}
if 0 == v.UpdatedAt {
v.UpdatedAt = v.CreatedAt
}
}
}
// 补全过滤器 Value
if nil != view.Table {
for _, f := range view.Table.Filters {
if nil != f.Value {
continue
}
if k, _ := attrView.GetKey(f.Column); nil != k {
f.Value = &av.Value{Type: k.Type}
}
}
}
upgradeAttributeViewSpec(attrView)
switch view.LayoutType {
case av.LayoutTypeTable: