修复timefield的字段错误

Author: Chise1

fast_tmp/amis/formitem.py

@@ -73,6 +73,7 @@ class FormItemEnum(str, Enum):
     input_image = "input-image"
     input_file = "input-file"
     picker = "picker"
+    input_time = "input-time"
 
 
 class FormItem(AbstractControl):

fast_tmp/amis/frame.py

@@ -17,6 +17,7 @@ class Dialog(BaseModel):
 
 # 参考 https://baidu.gitee.io/amis/docs/components/dialog?page=1
 
+
 # 抽屉
 class Drawer(BaseModel):
     title: str

fast_tmp/site/__init__.py

@@ -15,7 +15,7 @@
 from fast_tmp.amis.forms import FilterModel, Form
 from fast_tmp.amis.frame import Dialog
 from fast_tmp.amis.page import Page
-from fast_tmp.exceptions import FieldsError, NotFoundError, PermError
+from fast_tmp.exceptions import FieldsError, NotFoundError, PermError, TmpValueError
 from fast_tmp.models import Permission
 from fast_tmp.responses import ListDataWithPage
 from fast_tmp.site.base import ModelFilter, ModelSession, PageRouter
@@ -220,6 +220,8 @@ async def update(self, request: Request, pk: str, data: Dict[str, Any]) -> Model
                 await control.set_value(request, obj, data[field_name])
             except ValidationError as e:
                 err_fields[field_name] = str(e)
+            except TmpValueError as e:
+                err_fields[field_name] = str(e)
         if err_fields:
             raise FieldsError(err_fields)
         await obj.save()
@@ -241,6 +243,8 @@ async def patch(self, request: Request, pk: str, data: Dict[str, Any]) -> Model:
                 await control.set_value(request, obj, data[field_name])
             except ValidationError as e:
                 err_fields[field_name] = str(e)
+            except TmpValueError as e:
+                err_fields[field_name] = str(e)
         if err_fields:
             raise FieldsError(err_fields)
         await obj.save()
@@ -257,6 +261,8 @@ async def create(self, request: Request, data: Dict[str, Any]) -> Model:
                     cors.append(cor)
             except ValidationError as e:
                 field_errors[field_name] = str(e)
+            except TmpValueError as e:
+                field_errors[field_name] = str(e)
         if field_errors:
             raise FieldsError(field_errors)
 

fast_tmp/site/field.py

@@ -158,8 +158,11 @@ def get_column_inline(self, request: Request) -> Column:
         return self._column_inline
 
     def amis_2_orm(self, value: Any) -> Any:
-        if (value == "None" or not value) and self._field.null:  # type: ignore
-            return None
+        if value == "None" or not value:  # type: ignore
+            if self._field.null:
+                return None
+            else:
+                raise TmpValueError(f"{self.label} 不能为 {value}")
         return datetime.datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
 
     def orm_2_amis(self, value: datetime.datetime) -> Any:
@@ -184,8 +187,11 @@ def get_column_inline(self, request: Request) -> Column:
         return self._column_inline
 
     def amis_2_orm(self, value: Any) -> Any:
-        if (value == "None" or not value) and self._field.null:  # type: ignore
-            return None
+        if value == "None" or not value:  # type: ignore
+            if self._field.null:
+                return None
+            else:
+                raise TmpValueError(f"{self.label} 不能为 {value}")
         year, month, day = value.split("-")
         return datetime.date(int(year), int(month), int(day))
 
@@ -196,7 +202,7 @@ def orm_2_amis(self, value: datetime.date) -> Any:
 
 
 class TimeControl(BaseAdminControl):
-    _control_type = FormItemEnum.time
+    _control_type = FormItemEnum.input_time
 
     def get_formitem(self, request: Request, codenames: Iterable[str]) -> FormItem:
         if not self._control:
@@ -238,6 +244,7 @@ def get_formitem(self, request: Request, codenames: Iterable[str]) -> FormItem:
         if not self._control:
             super().get_formitem(request, codenames)
             self._control.validations = "isJson"
+            self._control.value = "{}"  # fixme jsonfield不能为空
         return self._control
 
     def get_column_inline(self, request: Request) -> Column:

tests/admin.py

@@ -71,7 +71,7 @@ class DecModel(ModelAdmin):
 
 class IntEnumAdmin(ModelAdmin):
     model = IntEnumField
-    list_display = ("e1", "e2")
+    list_display = ("int_enum_1", "int_enum_2", "bool_1", "bool_2")
     create_fields = list_display
     update_fields = list_display
     inline = list_display

tests/test_example/test_example/models.py

@@ -156,8 +156,8 @@ class FieldTesting(Model):
     money = fields.DecimalField(max_digits=10, decimal_places=2, null=True)
     height = fields.FloatField(null=True)
     married = fields.BooleanField(default=False)
-    gender = fields.CharEnumField(Gender)
-    degree = fields.IntEnumField(Degree, default=Degree.unknow)
+    gender = fields.CharEnumField(Gender, description="gender")
+    degree = fields.IntEnumField(Degree, default=Degree.unknow, description="degree")
     game_length = fields.BigIntField(default=0)  # 游戏时长，按秒计算
     avator = fields.BinaryField(null=True)  # 头像
     config = fields.JSONField(null=True)
@@ -173,7 +173,7 @@ class FieldTesting(Model):
     height_inline = fields.FloatField(null=True)
     married_inline = fields.BooleanField(null=True, default=False)
     gender_inline = fields.CharEnumField(Gender, null=True)
-    degree_inline = fields.IntEnumField(Degree, null=True)
+    degree_inline = fields.IntEnumField(Degree, null=True, description="degree")
     game_length_inline = fields.BigIntField(null=True, default=0)  # 游戏时长，按秒计算
     avator_inline = fields.BinaryField(null=True)  # 头像
     config_inline = fields.JSONField(null=True)

tests/test_field.py

@@ -35,7 +35,7 @@ async def test_intenum(self):
         data = response.json()
         assert data["status"] == 0
         # 测试写入数据
-        role_data = {"e2": "two"}
+        role_data = {"int_enum_2": "two", "bool_2": "False"}
         response = await self.client.post("/admin/intenumfield/create", json=role_data)
         assert response.status_code == 200
         data = response.json()
@@ -46,9 +46,11 @@ async def test_intenum(self):
         data = response.json()
         assert data["status"] == 0
         assert data["data"]["total"] == 1
-        self.assertEqual(data["data"]["items"][0]["e1"], None)
-        assert data["data"]["items"][0]["e2"] == "two"
-        role_data = {"e2": "three"}
+        self.assertEqual(data["data"]["items"][0]["int_enum_1"], None)
+        assert data["data"]["items"][0]["int_enum_2"] == "two"
+        assert data["data"]["items"][0]["bool_2"] == "False"
+        assert data["data"]["items"][0]["bool_1"] == "None"
+        role_data = {"int_enum_2": "three", "bool_1": "xx"}
         response = await self.client.post("/admin/intenumfield/create", json=role_data)
         assert response.status_code == 200
         data = response.json()

tests/testmodels.py

@@ -177,5 +177,7 @@ class I1(IntEnum):
 
 
 class IntEnumField(Model):
-    e1 = fields.IntEnumField(I1, null=True)
-    e2 = fields.IntEnumField(I1, default=I1.one)
+    int_enum_1 = fields.IntEnumField(I1, null=True)
+    int_enum_2 = fields.IntEnumField(I1, default=I1.one)
+    bool_1 = fields.BooleanField(null=True)
+    bool_2 = fields.BooleanField(default=True)