Fix form constraints, take 3

Author: ischaojie

src/npm-fastui/src/components/FormField.tsx

@@ -34,8 +34,11 @@ interface FormFieldInputProps extends BaseFormFieldProps {
   maxLength?: number
   /** @TJS-type integer */
   minLength?: number
+  /** @TJS-type ["integer", "number"] */
   ge?: number
+  /** @TJS-type ["integer", "number"] */
   le?: number
+  /** @TJS-type ["integer", "number"] */
   multipleOf?: number
   placeholder?: string
 }

src/python-fastui/fastui/components/forms.py

@@ -34,9 +34,9 @@ class FormFieldInput(BaseFormField):
     placeholder: _t.Union[str, None] = None
     max_length: _t.Union[int, None] = pydantic.Field(default=None, serialization_alias='maxLength')
     min_length: _t.Union[int, None] = pydantic.Field(default=None, serialization_alias='minLength')
-    ge: _t.Union[float, None] = None
-    le: _t.Union[float, None] = None
-    multiple_of: _t.Union[float, None] = pydantic.Field(default=None, serialization_alias='multipleOf')
+    ge: _t.Union[int, float, None] = None
+    le: _t.Union[int, float, None] = None
+    multiple_of: _t.Union[int, float, None] = pydantic.Field(default=None, serialization_alias='multipleOf')
     type: _t.Literal['FormFieldInput'] = 'FormFieldInput'
 
 

src/python-fastui/tests/react-fastui-json-schema.json

@@ -474,7 +474,7 @@
           "type": "string"
         },
         "ge": {
-          "type": "number"
+          "type": ["integer", "number"]
         },
         "htmlType": {
           "enum": ["date", "datetime-local", "email", "number", "password", "text", "time", "url"],
@@ -484,7 +484,7 @@
           "type": ["string", "number"]
         },
         "le": {
-          "type": "number"
+          "type": ["integer", "number"]
         },
         "locked": {
           "type": "boolean"
@@ -496,7 +496,7 @@
           "type": "integer"
         },
         "multipleOf": {
-          "type": "number"
+          "type": ["integer", "number"]
         },
         "name": {
           "type": "string"