修改get_app_page函数返回类型

Author: Chise1

fast_tmp/admin/endpoint.py

@@ -112,7 +112,7 @@ async def get_schema(
     request: Request,
     page: RegisterRouter = Depends(get_model_site),
 ):
-    return BaseRes(data=await page.get_app_page(request))
+    return BaseRes(data=(await page.get_app_page(request)).dict(exclude_none=True))
 
 
 # todo 考虑清除没有被使用的文件 考虑对上传的文件进行校验，判断该字段是否应该上传文件

fast_tmp/contrib/tortoise/fields.py

@@ -95,7 +95,7 @@ class RichTextField(Field[str], str):  # type: ignore
     SQL_TYPE = "TEXT"
 
     def __init__(
-            self, pk: bool = False, unique: bool = False, index: bool = False, **kwargs: Any
+        self, pk: bool = False, unique: bool = False, index: bool = False, **kwargs: Any
     ) -> None:
         if pk:
             warnings.warn(

fast_tmp/site/__init__.py

@@ -198,9 +198,9 @@ def get_list_display_with_pk(self) -> Dict[str, BaseAdminControl]:
         ret["pk"] = self.get_control_field("pk")
         return ret
 
-    async def get_app_page(self, request: Request):
+    async def get_app_page(self, request: Request) -> Page:
         codenames = await self.permission_code(request)
-        return Page(title=self.name, body=self.get_crud(request, codenames)).dict(exclude_none=True)
+        return Page(title=self.name, body=self.get_crud(request, codenames))
 
     async def update(self, request: Request, pk: str, data: Dict[str, Any]) -> Model:
         obj = await self.get_instance(request, pk)

fast_tmp/site/base.py

@@ -7,6 +7,7 @@
 from tortoise.queryset import QuerySet
 
 from fast_tmp.amis.forms import Column, ColumnInline, Control, ControlEnum, QuickEdit
+from fast_tmp.amis.page import Page
 from fast_tmp.amis.response import AmisStructError
 from fast_tmp.exceptions import NotFoundError
 from fast_tmp.responses import BaseRes, ListDataWithPage
@@ -196,7 +197,7 @@ class RegisterRouter:
     _name: str
     _prefix: str
 
-    async def get_app_page(self, request: Request) -> dict:
+    async def get_app_page(self, request: Request) -> Page:
         raise AttributeError("need write")
 
     def __init__(self, prefix: str, name: str):

tests/test_example/test_example/page.py

@@ -17,7 +17,7 @@ class UserSelfInfo(RegisterRouter):
     def __init__(self):
         super().__init__("info", "info")
 
-    async def get_app_page(self, request: Request) -> dict:
+    async def get_app_page(self, request: Request) -> Page:
         return Page(
             title="userselfinfo",
             body=[
@@ -27,4 +27,4 @@ async def get_app_page(self, request: Request) -> dict:
                     api="/form-test",
                 )
             ],
-        ).dict(exclude_none=True)
+        )