infra/ii/bootable: 增加处理 DateTime 类型

infra/ii/bootable/common.go

@@ -23,15 +23,9 @@ func ResolveFilterFrom(b []byte) (Filter, error) {
 
 // HandleRows 展开 itemInfo 字段数据类型为 mo.TypeObject 和 mo.TypeArray 的数据
 // {"name": "123", "submap": {"name":111,"age":222}}
-func HandleRows(info ii.ItemInfo, rows []mo.M) {
-	objName := info.FieldType(mo.TypeObject)
-	floatName := info.FieldType(mo.TypeDouble)
-	lookupName := info.LookupField()
-
+func HandleRows(info *ii.ItemInfo, rows []mo.M) {
 	for i := 0; i < len(rows); i++ {
-		handleTypeFloat(floatName, rows[i])
-		handleTypeObject(objName, rows[i])
-		handleFieldLookup(lookupName, rows[i])
+		handleRow(info, rows[i])
 	}
 }
 
@@ -54,7 +48,7 @@ func Find(user ii.User, itemName string, filter Filter) (*Response, error) {
 		return nil, err
 	}
 
-	HandleRows(itemInfo, resp.Rows)
+	HandleRows(&itemInfo, resp.Rows)
 
 	if len(filter.lookASName) > 0 {
 		getLookupResult(filter.lookASName, resp)

infra/ii/bootable/utils.go

@@ -15,11 +15,27 @@ func objectToStr(row mo.M) string {
 	return string(b)
 }
 
-func handleTypeFloat(fields []ii.FieldInfo, row mo.M) {
-	for _, field := range fields {
-		if field.Type != mo.TypeDouble {
+func handleRow(info *ii.ItemInfo, row mo.M) {
+	handleTypeDateTime(info, row)
+	handleTypeFloat(info, row)
+	handleFieldLookup(info, row)
+	handleTypeObject(info, row)
+}
+
+func handleTypeDateTime(info *ii.ItemInfo, row mo.M) {
+	for _, field := range info.FieldType(mo.TypeDate) {
+		oldValue, ok := row[field.Name].(mo.DateTime)
+		if !ok {
 			continue
 		}
+		if oldValue == 0 {
+			row[field.Name] = ""
+		}
+	}
+}
+
+func handleTypeFloat(info *ii.ItemInfo, row mo.M) {
+	for _, field := range info.FieldType(mo.TypeDouble) {
 		if field.Decimal <= 0 {
 			continue
 		}
@@ -34,11 +50,8 @@ func handleTypeFloat(fields []ii.FieldInfo, row mo.M) {
 	}
 }
 
-func handleTypeObject(fields []ii.FieldInfo, row mo.M) {
-	for _, field := range fields {
-		if field.Type != mo.TypeObject {
-			continue
-		}
+func handleTypeObject(info *ii.ItemInfo, row mo.M) {
+	for _, field := range info.FieldType(mo.TypeObject) {
 		oldMap, ok := row[field.Name].(mo.M)
 		if !ok {
 			continue
@@ -50,11 +63,8 @@ func handleTypeObject(fields []ii.FieldInfo, row mo.M) {
 	}
 }
 
-func handleFieldLookup(fields []ii.FieldInfo, row mo.M) {
-	for _, field := range fields {
-		if !field.HasLookup() {
-			continue
-		}
+func handleFieldLookup(info *ii.ItemInfo, row mo.M) {
+	for _, field := range info.LookupField() {
 		oldList, ok := row[field.Lookup.AS].(mo.A)
 		if !ok {
 			continue