go/contracts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[feat] 移除 ResFieldByMap, ResFieldByAnys 类型

Browse Source
This commit is contained in:
what
2023-06-23 00:10:24 +08:00
parent 88ed380018
commit 6ccef0fbb8
25 changed files with 416 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/res_field.go
+3 -9
View File
@@ -40,7 +40,7 @@ func (this ResField) ToStructField(tags ...string) reflect.StructField {
switch this.DataType {
case contracts.ResDataType_String, contracts.ResDataType_Text, contracts.ResDataType_Enum,
contracts.ResDataType_Timestamp, contracts.ResDataType_Date, contracts.ResDataType_Datetime:
typ = reflect.TypeOf(res_type.ResFieldByString(""))
typ = reflect.TypeOf(string(""))
case contracts.ResDataType_Integer, contracts.ResDataType_SmallInteger:
typ = reflect.TypeOf(res_type.ResFieldByInteger(0))
case contracts.ResDataType_Decimal:
@@ -51,7 +51,7 @@ func (this ResField) ToStructField(tags ...string) reflect.StructField {
if this.Default != "" && this.Default[0:1] == "[" {
typ = reflect.TypeOf(res_type.ResFieldByAnys{})
} else {
typ = reflect.TypeOf(res_type.ResFieldByMap{})
typ = reflect.TypeOf(map[string]any{})
}
}
@@ -109,7 +109,7 @@ func (this ResField) ToValue(v any) any {
v = float64(data)
case res_type.ResFieldByNumber:
v = float64(data)
case res_type.ResFieldByString:
case string:
v = strings.Trim(string(data), " ")
case res_type.ResFieldByAnys:
if v != nil {
@@ -117,12 +117,6 @@ func (this ResField) ToValue(v any) any {
return string(b)
}
v = []any(data)
case res_type.ResFieldByMap:
if v != nil {
b, _ := json.Marshal(v)
return string(b)
}
v = map[string]any(data)
case []any, []string, []int, []float64, []float32, []int64:
if v != nil {
b, _ := json.Marshal(v)