mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-03 08:49:12 +00:00
refactor: 重构查询参数处理逻辑,统一搜索参数处理
- 移除各模块查询schema中的自定义model_validator,统一通过search_to_dict处理搜索参数 - 为需要的字段添加json_schema_extra标记查询操作类型 - 重构base_crud的条件解析逻辑,支持直接处理普通字符串、数字类型参数 - 重构base_schema中的公共查询参数校验逻辑,简化时间范围和创建更新人参数处理 - 修复菜单查询的异步懒加载问题,添加多级预加载 - 调整日志打印配置,关闭uvicorn.access重复日志 - 修复前端路由跳转路径错误 - 调整弹窗宽度适配内容 - 修复测试环境限流器未注册问题 - 清理无用的导入和废弃函数
This commit is contained in:
@@ -11,7 +11,6 @@ from pydantic import (
|
||||
|
||||
from app.api.v1.module_platform.menu.schema import MenuTreeOutSchema
|
||||
from app.api.v1.module_system.role.schema import RoleOutSchema
|
||||
from app.common.enums import QueueEnum
|
||||
from app.core.base_schema import BaseQueryParam, BaseSchema, CommonSchema, CoreUserSchema, TenantByQueryParam, TenantBySchema, UserByQueryParam, UserBySchema
|
||||
from app.core.validator import email_validator, mobile_validator
|
||||
|
||||
@@ -262,29 +261,13 @@ class UserQueryParam(BaseQueryParam, UserByQueryParam, TenantByQueryParam):
|
||||
- 业务字段:用户名、名称、手机号、邮箱、部门、状态
|
||||
"""
|
||||
|
||||
username: str | tuple[str, str] | None = Field(None, description="用户名")
|
||||
name: str | tuple[str, str] | None = Field(None, description="名称")
|
||||
mobile: str | tuple[str, str] | None = Field(None, description="手机号", pattern=r"^1[3-9]\d{9}$")
|
||||
email: str | tuple[str, str] | None = Field(
|
||||
username: str | None = Field(None, description="用户名")
|
||||
name: str | None = Field(None, description="名称")
|
||||
mobile: str | None = Field(None, description="手机号", pattern=r"^1[3-9]\d{9}$")
|
||||
email: str | None = Field(
|
||||
None,
|
||||
description="邮箱",
|
||||
pattern=r"^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$",
|
||||
)
|
||||
dept_id: int | tuple[str, int] | None = Field(None, description="部门ID")
|
||||
status: int | tuple[str, int] | None = Field(None, description="是否可用")
|
||||
|
||||
@model_validator(mode="after")
|
||||
def validate_query_params(self) -> "UserQueryParam":
|
||||
if isinstance(self.username, str):
|
||||
self.username = (QueueEnum.like.value, self.username)
|
||||
if isinstance(self.name, str):
|
||||
self.name = (QueueEnum.like.value, self.name)
|
||||
if isinstance(self.mobile, str):
|
||||
self.mobile = (QueueEnum.like.value, self.mobile)
|
||||
if isinstance(self.email, str):
|
||||
self.email = (QueueEnum.like.value, self.email)
|
||||
if isinstance(self.dept_id, int):
|
||||
self.dept_id = (QueueEnum.eq.value, self.dept_id)
|
||||
if isinstance(self.status, int):
|
||||
self.status = (QueueEnum.eq.value, self.status)
|
||||
return self
|
||||
dept_id: int | None = Field(None, description="部门ID")
|
||||
status: int | None = Field(None, description="是否可用")
|
||||
|
||||
Reference in New Issue
Block a user