Merge pull request #208 from wanyaoqi/fix/convert-compound-column-from-string-value

swordqiu · web-flow · commit ce9f71063b3a · 2025-05-13T11:18:56.000+08:00
fix: convert compound column check is string value
diff --git a/column.go b/column.go
@@ -423,5 +423,8 @@ func (c *SBaseCompoundColumn) ConvertFromValue(val interface{}) interface{} {
 	if ok && bVal != nil {
 		return bVal.String()
 	}
+	if _, ok := val.(string); ok {
+		return val
+	}
 	return jsonutils.Marshal(val).String()
 }

Original file line number	Diff line number	Diff line change
`@@ -423,5 +423,8 @@ func (c *SBaseCompoundColumn) ConvertFromValue(val interface{}) interface{} {`
`423`	`423`	`if ok && bVal != nil {`
`424`	`424`	`return bVal.String()`
`425`	`425`	`}`
	`426`	`+ if _, ok := val.(string); ok {`
	`427`	`+ return val`
	`428`	`+ }`
`426`	`429`	`return jsonutils.Marshal(val).String()`
`427`	`430`	`}`