完成增删改查所有信息

Author: Chise1

fast_tmp/admin/creator.py

@@ -89,7 +89,7 @@ def __init__(
                         body=Form(
                             name=f"新增{model.__name__}",
                             title=f"新增{model.__name__}",
-                            controls=get_controls_from_model(
+                            body=get_controls_from_model(
                                 model, include=create_include, exclude=create_exclude
                             ),
                             primaryField=model._meta.pk_attr,

fast_tmp/admin/endpoint.py

@@ -1,11 +1,8 @@
-from datetime import datetime
 from typing import Any, List, Optional
 
 from fastapi import APIRouter, Depends
-from fastapi.params import Path
 from pydantic import BaseModel
 from starlette.requests import Request
-from starlette.responses import RedirectResponse
 
 from fast_tmp.depends.auth import get_current_active_user
 from fast_tmp.site import ModelAdmin, get_model_site
@@ -32,7 +29,7 @@ async def list_view(
     page: int = 1,
     user: Optional[User] = Depends(__get_user),
 ):
-    datas = await page_model.list(request, perPage, page - 1)
+    datas = await page_model.list(request, perPage, page)
     return BaseRes(
         data=ListDataWithPage(
             total=datas["total"],
@@ -41,16 +38,37 @@ async def list_view(
     )
 
 
+@router.get("/{resource}/prefetch/{field_name}")
+async def prefetch_view(
+    request: Request,
+    field_name: str,
+    pk: Optional[str] = None,
+    perPage: Optional[int] = None,
+    page: Optional[int] = None,
+    page_model: ModelAdmin = Depends(get_model_site),
+    user: Optional[User] = Depends(__get_user),
+):
+    """
+    对多对多外键进行额外的加载
+    """
+    datas = await page_model.select_options(request, field_name, pk, perPage, page)
+    return BaseRes(data=datas)
+
+
 @router.get("/{resource}/select/{field_name}")
-async def list_view(
+async def select_view(
     request: Request,
     field_name: str,
+    pk: Optional[str] = None,
     perPage: Optional[int] = None,
     page: Optional[int] = None,
     page_model: ModelAdmin = Depends(get_model_site),
     user: Optional[User] = Depends(__get_user),
 ):
-    datas = await page_model.select_options(field_name, request, perPage, page)
+    """
+    枚举字段的额外加载，主要用于外键
+    """
+    datas = await page_model.select_options(request, field_name, pk, perPage, page)
     return BaseRes(data=datas)
 
 
@@ -61,6 +79,9 @@ async def patch_data(
     page_model: ModelAdmin = Depends(get_model_site),
     user: Optional[User] = Depends(__get_user),
 ):
+    """
+    内联模式快速修改需要的接口
+    """
     data = await request.json()
     await page_model.patch(request, pk, data)
     return BaseRes().dict()
@@ -100,24 +121,15 @@ async def create(
     return BaseRes(data=data)
 
 
-#
-#
-# @router.delete("/{resource}/delete")
-# def delete_one(
-#     request: Request,
-#     page_model: ModelAdmin = Depends(get_model_site),
-#     session: Session = Depends(get_db_session),
-#     user: Optional[User] = Depends(decode_access_token_from_data),
-# ):
-#     if not user:
-#         return RedirectResponse(request.url_for("admin:login"))
-#
-#     w = search_pk_list(page_model.model, request)
-#     if isinstance(w, BaseRes):
-#         return w
-#     session.execute(delete(page_model.model).where(*w))
-#     session.commit()
-#     return BaseRes()
+@router.delete("/{resource}/delete/{pk}")
+async def delete_func(
+    request: Request,
+    pk: str,
+    page_model: ModelAdmin = Depends(get_model_site),
+    user: Optional[User] = Depends(__get_user),
+):
+    await page_model.delete(request, pk)
+    return BaseRes()
 
 
 # def clean_param(field_type, param: str):
@@ -176,81 +188,3 @@ async def get_schema(
     user: Optional[User] = Depends(__get_user),
 ):
     return BaseRes(data=await page.get_app_page(request))
-
-
-# @router.get("/{resource}/selects/{field}")
-# def get_selects(
-#     request: Request,
-#     field: str = Path(...),  # type: ignore
-#     page_model: ModelAdmin = Depends(get_model_site),
-#     user: Optional[User] = Depends(decode_access_token_from_data),
-#     session: Session = Depends(get_db_session),
-#     perPage: int = 10,
-#     page: int = 1,
-# ):
-#     items = []
-#     total = 0
-#     for attr in page_model.mapper().attrs:
-#         if attr.key == field:
-#             relation_model = attr.entity.class_
-#             secondary = attr.secondary
-#             for col in secondary.foreign_key_constraints:
-#                 if col.referred_table in page_model.mapper().tables:
-#                     params = dict(request.query_params)
-#                     if len(params) > 1:
-#                         raise single_pk
-#                     col_name = col.column_keys[0]
-#                     for c in secondary.c:
-#                         if c.key == col_name:
-#                             clean_value = clean_param(c.type, list(params.values())[0])
-#                             sql = (
-#                                 select(*list(get_pk(relation_model).values()))
-#                                 .join(secondary)
-#                                 .where(c == clean_value)
-#                                 .limit(perPage)
-#                                 .offset((page - 1) * perPage)
-#                             )
-#                             datas = session.execute(sql)
-#                             total_f = session.execute(
-#                                 select(func.count())
-#                                 .select_from(relation_model)
-#                                 .join(secondary)
-#                                 .where(col == list(params.values())[0])
-#                             ).fetchone()
-#                             if total_f is not None:
-#                                 total = total_f[0]
-#                             for data in datas:
-#                                 items.append(dict(data))
-#     return BaseRes(data={"total": total, "rows": items})
-#
-#
-# @router.get("/{resource}/picks/{field}")
-# def get_picks(
-#     request: Request,
-#     field: str = Path(...),  # type: ignore
-#     page_model: ModelAdmin = Depends(get_model_site),
-#     user: Optional[User] = Depends(decode_access_token_from_data),
-#     session: Session = Depends(get_db_session),
-#     perPage: int = 10,
-#     page: int = 1,
-# ):
-#     """
-#     枚举选择
-#     """
-#     source_field = getattr(page_model.model, field)
-#     if isinstance(source_field.property, RelationshipProperty):
-#         relation_model = source_field.property.mapper.class_
-#
-#     else:
-#         relation_model = source_field.property.mapper.class_
-#     datas = session.execute(
-#         select(list(get_pk(relation_model).values())).limit(perPage).offset((page - 1) * perPage)
-#     )
-#     items = []
-#     for data in datas:
-#         items.append(dict(data))
-#     s = session.execute(select(func.count()).select_from(relation_model))
-#     total = 0
-#     for i in s:
-#         total = i[0]
-#     return BaseRes(data={"total": total, "rows": items})

fast_tmp/admin/middware.py fast_tmp/admin/exception_handlers.pyfast_tmp/admin/middware.py renamed to fast_tmp/admin/exception_handlers.py

@@ -3,15 +3,18 @@
 from starlette.responses import RedirectResponse
 from tortoise.exceptions import BaseORMException
 
-from fast_tmp.responses import BaseRes, NoAuthError
+from fast_tmp.responses import BaseRes, FastTmpError, NoAuthError
 
 
-async def check_error_middle(request: Request, call_next):
-    try:
-        response = await call_next(request)
-    except BaseORMException as e:
-        response = JSONResponse(content=BaseRes(msg=str(e), status=400).dict())
-    return response
+async def fasttmp_exception_handler(request: Request, exc: FastTmpError):
+    return JSONResponse(
+        status_code=200,
+        content=exc.detail,
+    )
+
+
+async def tortoise_exception_handler(request: Request, exc: BaseORMException):
+    return JSONResponse(content=BaseRes(msg=str(exc), status=400).dict(), status_code=200)
 
 
 async def no_auth_middle(request: Request, call_next):

fast_tmp/admin/server.py

@@ -5,35 +5,36 @@
 from fastapi import Depends, FastAPI, Form, Request
 from fastapi.templating import Jinja2Templates
 from starlette import status
-from starlette.responses import RedirectResponse
+from starlette.responses import JSONResponse, RedirectResponse
+from tortoise.exceptions import BaseORMException
 
 from fast_tmp.admin.site import GroupAdmin, UserAdmin
 from fast_tmp.conf import settings
 from fast_tmp.models import User
-from fast_tmp.responses import BaseRes
+from fast_tmp.responses import BaseRes, FastTmpError
 from fast_tmp.site import model_list, register_model_site
 from fast_tmp.utils.token import create_access_token
 
 from ..jinja_extension.tags import register_tags
 from .depends import __get_user_or_none
 from .endpoint import router
-from .middware import check_error_middle, no_auth_middle
+from .exception_handlers import (
+    fasttmp_exception_handler,
+    no_auth_middle,
+    tortoise_exception_handler,
+)
 
 base_path = os.path.dirname(__file__)
 templates = Jinja2Templates(directory=base_path + "/templates")
 register_tags(templates)
 admin = FastAPI(title="fast-tmp")
-register_model_site(
-    {
-        "Auth": [
-            UserAdmin(),
-        ]
-    }
-)
+register_model_site({"Auth": [UserAdmin(), GroupAdmin()]})
 admin.include_router(router)
-# admin.middleware("http")(check_error_middle)
 admin.middleware("http")(no_auth_middle)
 
+admin.exception_handler(FastTmpError)(fasttmp_exception_handler)
+admin.exception_handler(BaseORMException)(tortoise_exception_handler)
+
 
 @admin.post("/", name="index")
 @admin.get("/", name="index")

fast_tmp/admin/site.py

@@ -6,6 +6,12 @@ class UserAdmin(ModelAdmin):
     model = User
     list_display = ("id", "username", "is_active")
     inline = ("is_active",)
+    create_fields = (
+        "username",
+        "password",
+        "groups",
+    )
+    update_fields = ("groups",)
     # create_fields = (User.username, User.password)
     # update_fields = (User.password,)
 
@@ -25,5 +31,6 @@ class UserAdmin(ModelAdmin):
 class GroupAdmin(ModelAdmin):
     model = Group
     list_display = ("id", "name", "users")
+    create_fields = ("name",)
     # create_fields = (Group.name, Group.users)
     # update_fields = (Group.name, Group.users)

fast_tmp/amis/buttons.py

@@ -13,9 +13,11 @@
 
 from fast_tmp.amis.abstract_schema import _Action
 from fast_tmp.amis.enums import TypeEnum
+from fast_tmp.amis.forms import Column
 
 
-class Operation(BaseModel):
+class Operation(Column):
     type = TypeEnum.operation
     label = "操作"
     buttons: List[_Action] = []
+    name: str = ""

fast_tmp/amis/forms/__init__.py

@@ -18,7 +18,7 @@ class Column(BaseModel):
     用于列表等的显示
     """
 
-    type: Optional[ControlEnum]  # 把这个和schema获取的参数进行融合，保证schema获取的值可以使用
+    type: Optional[str]  # 把这个和schema获取的参数进行融合，保证schema获取的值可以使用
     name: str  # type: ignore
     label: str
 

fast_tmp/factory.py

@@ -3,11 +3,11 @@
 # from starlette.middleware.sessions import SessionMiddleware
 from starlette.middleware.cors import CORSMiddleware
 
-from fast_tmp.admin.server import admin
 from fast_tmp.conf import settings  # 放第一个不要变
-from fast_tmp.depends.auth import register_app
 
 settings._init_model()
+from fast_tmp.admin.server import admin
+from fast_tmp.depends.auth import register_app
 
 
 def create_app() -> FastAPI:
@@ -30,4 +30,5 @@ def create_app() -> FastAPI:
     # app.add_middleware(SessionMiddleware, secret_key=settings.CAS_SESSION_SECRET)
 
     app.mount("/admin", admin, name="admin")
+
     return app