修复:date的control的input字段错误

增加测试脚本

Author: Chise1

fast_tmp/site/field.py

@@ -167,7 +167,7 @@ def orm_2_amis(self, value: datetime.datetime) -> Any:
 
 
 class DateControl(BaseAdminControl):
-    _control_type = FormItemEnum.date
+    _control_type = FormItemEnum.input_date
 
     def get_formitem(self, request: Request, codenames: Iterable[str]) -> FormItem:
         if not self._control:
@@ -492,7 +492,7 @@ def get_formitem(self, request: Request, codenames: Iterable[str]) -> FormItem:
             self._control = ImageItem(
                 name=self.name,
                 label=self.label,
-                receiver=f"{self._field.model.__name__}/file/{self.name}",  # type: ignore
+                receiver=f"{self._field.model.__name__.lower()}/file/{self.name}",  # type: ignore
             )
             if not self._field.null:  # type: ignore
                 self._control.required = True

fast_tmp/site/filter.py

@@ -14,7 +14,8 @@ def make_filter_by_str(request: Request, name: str, field: BaseAdminControl) ->
     filter_info = control.dict(exclude_none=True)
     filter_info["name"] = name
     filter_info["label"] = name
-    filter_info.pop("required")
+    if filter_info.get("required") is not None:
+        filter_info.pop("required")
     return CommonFilter(field=field, **filter_info)
 
 

tests/admin.py

@@ -71,7 +71,7 @@ class DecModel(ModelAdmin):
 
 class IntEnumAdmin(ModelAdmin):
     model = IntEnumField
-    list_display = (
+    inline = (
         "int_enum_1",
         "int_enum_2",
         "bool_1",
@@ -81,9 +81,9 @@ class IntEnumAdmin(ModelAdmin):
         "datetime_3",
         "datetime_4",
     )
+    list_display = inline + ("foreignkey_1",)
     create_fields = list_display
     update_fields = list_display
-    inline = list_display
 
 
 register_model_site({"fieldtesting": [IntEnumAdmin()]})

tests/test_example/test_example/admin.py

@@ -66,4 +66,4 @@ class AuthorModel(ModelAdmin):
     create_fields = ("name", "birthday")
     inline = ("name",)
     update_fields = ("name", "birthday")
-    filters = ["birthday", "birthday__gte", "birthday__lte"]
+    filters = ("birthday", "birthday__gte", "birthday__lte")

tests/test_example/test_example/models.py

@@ -19,7 +19,7 @@ def generate_token():
 
 class Author(Model):
     name = fields.CharField(max_length=255)
-    birthday = fields.DateField()
+    birthday = fields.DateField(default=datetime.date.today)
 
     def __str__(self):
         return self.name

tests/test_field.py

@@ -4,6 +4,7 @@
 import datetime
 
 from tests.base import BaseSite
+from tests.testmodels import For
 
 
 class TestDecimalControl(BaseSite):
@@ -36,6 +37,15 @@ async def test_intenum(self):
         assert response.status_code == 200
         data = response.json()
         assert data["status"] == 0
+        # 写入一个测试用的外键
+        await For(name="xx").save()
+        foreign_data = (await self.client.get("/admin/intenumfield/select/foreignkey_1")).json()
+        self.assertEqual(
+            {"status": 0, "msg": "", "data": {"options": [{"value": 1, "label": "xx"}]}},
+            foreign_data,
+        )
+        # self.assertEqual()
+
         # 测试写入数据
         role_data = {
             "int_enum_2": "two",

tests/test_perm.py

@@ -28,6 +28,10 @@
     "event_delete",
     "event_list",
     "event_update",
+    "for_create",
+    "for_delete",
+    "for_list",
+    "for_update",
     "group_create",
     "group_delete",
     "group_list",

tests/testmodels.py

@@ -176,6 +176,13 @@ class I1(IntEnum):
     two = 2
 
 
+class For(Model):
+    name = fields.CharField(max_length=32)
+
+    def __str__(self):
+        return self.name
+
+
 class IntEnumField(Model):
     int_enum_1 = fields.IntEnumField(I1, null=True)
     int_enum_2 = fields.IntEnumField(I1, default=I1.one)
@@ -185,3 +192,4 @@ class IntEnumField(Model):
     datetime_2 = fields.DatetimeField(default=datetime.datetime.now)
     datetime_3 = fields.DatetimeField(default=datetime.datetime.fromtimestamp(0))
     datetime_4 = fields.DatetimeField()
+    foreignkey_1 = fields.ForeignKeyField("fast_tmp.For", null=True, related_name="foreignkey_1s")