perf: 固定常用的PageAdmin的unique_id值

Author: amisadmin

fastapi_user_auth/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.6.0a7"
+__version__ = "0.6.1a1"
 __url__ = "https://github.com/amisadmin/fastapi_user_auth"
 
 import gettext

fastapi_user_auth/admin/actions.py

@@ -133,7 +133,8 @@ async def get_form_item(self, request: Request, modelfield: ModelField) -> Union
         item = await super().get_form_item(request, modelfield)
         from fastapi_user_auth.admin import RoleAdmin  # 防止循环导入
 
-        role_admin = self.admin.app.get_admin_or_create(RoleAdmin)
+        # role_admin = self.admin.app.get_admin_or_create(RoleAdmin)
+        role_admin, _ = self.admin.app.get_page_schema_child(unique_id=RoleAdmin.unique_id)
         if item.name == "role_keys":  # 为角色树形选择器数据指定API源
             # value
             item.source = f"post:{role_admin.router_path}/list?page=1&perPage=100"

fastapi_user_auth/admin/admin.py

@@ -72,6 +72,7 @@ def attach_page_head(page: Page) -> Page:
 
 
 class UserLoginFormAdmin(FormAdmin):
+    unique_id = "Auth>UserLoginFormAdmin"
     page = Page(title=_("User Login"))
     page_path = "/login"
     page_parser_mode = "html"
@@ -135,6 +136,7 @@ async def has_page_permission(self, request: Request, obj: PageSchemaAdmin = Non
 
 
 class UserRegFormAdmin(FormAdmin):
+    unique_id = "Auth>UserRegFormAdmin"
     user_model: Type[BaseUser] = User
     page = Page(title=_("User Register"))
     page_path = "/reg"
@@ -215,6 +217,7 @@ async def has_page_permission(self, request: Request, obj: PageSchemaAdmin = Non
 
 
 class UserInfoFormAdmin(FormAdmin):
+    unique_id = "Auth>UserInfoFormAdmin"
     page_schema = None
     user_model: Type[BaseUser] = User
     page = Page(title=_("User Profile"))
@@ -233,7 +236,7 @@ async def get_form(self, request: Request) -> Form:
         formitems = [
             await self.get_form_item(request, modelfield)
             for k, modelfield in self.user_model.__fields__.items()
-            if k not in self.schema.__fields__
+            if k not in self.schema.__fields__.keys() | {"delete_time"}
         ]
         form.body.extend(formitem.update_from_kwargs(disabled=True) for formitem in formitems if formitem)
         return form
@@ -253,6 +256,7 @@ async def has_page_permission(self, request: Request, obj: PageSchemaAdmin = Non
 
 
 class UserAdmin(AuthFieldModelAdmin, AuthSelectModelAdmin, SoftDeleteModelAdmin, FootableModelAdmin):
+    unique_id = "Auth>UserAdmin"
     page_schema = PageSchema(label=_("User"), icon="fa fa-user")
     model: Type[BaseUser] = None
     exclude = ["password"]
@@ -312,6 +316,7 @@ async def on_update_pre(self, request: Request, obj, item_id: List[int], **kwarg
 
 
 class RoleAdmin(AutoTimeModelAdmin, FootableModelAdmin):
+    unique_id = "Auth>RoleAdmin"
     page_schema = PageSchema(label=_("Role"), icon="fa fa-group")
     model = Role
     ordering = [Role.id.desc()]
@@ -349,6 +354,7 @@ async def get_select(self, request: Request) -> Select:
 
 
 class CasbinRuleAdmin(ReadOnlyModelAdmin):
+    unique_id = "Auth>CasbinRuleAdmin"
     page_schema = PageSchema(label="CasbinRule", icon="fa fa-lock")
     model = CasbinRule
     list_filter = [CasbinRule.ptype, CasbinRule.v0, CasbinRule.v1, CasbinRule.v2, CasbinRule.v3, CasbinRule.v4, CasbinRule.v5]
@@ -389,6 +395,7 @@ async def _load_policy():
 
 
 class LoginHistoryAdmin(ReadOnlyModelAdmin):
+    unique_id = "Auth>LoginHistoryAdmin"
     page_schema = PageSchema(label="登录历史", icon="fa fa-history")
     model = LoginHistory
     search_fields = [LoginHistory.login_name, LoginHistory.ip, LoginHistory.login_status, LoginHistory.user_agent]

fastapi_user_auth/admin/app.py

@@ -7,7 +7,8 @@
 from fastapi_amis_admin.utils.translation import i18n as _
 from starlette.requests import Request
 
-from fastapi_user_auth.admin import CasbinRuleAdmin, LoginHistoryAdmin
+from fastapi_user_auth.admin import CasbinRuleAdmin
+from fastapi_user_auth.admin import LoginHistoryAdmin as DefaultLoginHistoryAdmin
 from fastapi_user_auth.admin import RoleAdmin as DefaultRoleAdmin
 from fastapi_user_auth.admin import UserAdmin as DefaultUserAdmin
 from fastapi_user_auth.admin import UserInfoFormAdmin as DefaultUserInfoFormAdmin
@@ -19,6 +20,7 @@
 
 
 class UserAuthApp(AdminApp, AuthRouter):
+    unique_id = "Auth>UserAuthApp"
     page_schema = PageSchema(label=_("User Authentication"), icon="fa fa-lock", sort=99)
     router_prefix = "/auth"
     # default admin
@@ -27,6 +29,7 @@ class UserAuthApp(AdminApp, AuthRouter):
     UserInfoFormAdmin: Type[DefaultUserInfoFormAdmin] = DefaultUserInfoFormAdmin
     UserAdmin: Type[DefaultUserAdmin] = DefaultUserAdmin
     RoleAdmin: Type[ModelAdmin] = DefaultRoleAdmin
+    LoginHistoryAdmin: Type[ModelAdmin] = DefaultLoginHistoryAdmin
 
     def __init__(self, app: "AdminApp"):
         AdminApp.__init__(self, app)
@@ -56,7 +59,7 @@ def __init__(self, app: "AdminApp"):
             self.UserInfoFormAdmin,
             self.UserAdmin,
             self.RoleAdmin,
-            LoginHistoryAdmin,
+            self.LoginHistoryAdmin,
             CasbinRuleAdmin,
         )
 

fastapi_user_auth/admin/site.py

@@ -22,6 +22,7 @@
 
 
 class AuthAdminSite(AdminSite):
+    unique_id = "AuthAdminSite"
     auth: Auth = None
     UserAuthApp: Type[DefaultUserAuthApp] = DefaultUserAuthApp