mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-13 04:39:41 +00:00
refactor: 重构查询参数处理逻辑,统一搜索参数处理
- 移除各模块查询schema中的自定义model_validator,统一通过search_to_dict处理搜索参数 - 为需要的字段添加json_schema_extra标记查询操作类型 - 重构base_crud的条件解析逻辑,支持直接处理普通字符串、数字类型参数 - 重构base_schema中的公共查询参数校验逻辑,简化时间范围和创建更新人参数处理 - 修复菜单查询的异步懒加载问题,添加多级预加载 - 调整日志打印配置,关闭uvicorn.access重复日志 - 修复前端路由跳转路径错误 - 调整弹窗宽度适配内容 - 修复测试环境限流器未注册问题 - 清理无用的导入和废弃函数
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||
|
||||
from app.common.enums import QueueEnum, TicketTypeEnum
|
||||
from app.common.enums import TicketTypeEnum
|
||||
from app.core.base_schema import (
|
||||
BaseQueryParam,
|
||||
BaseSchema,
|
||||
@@ -86,22 +86,10 @@ class TicketBatchSchema(BaseModel):
|
||||
class TicketQueryParam(BaseQueryParam, UserByQueryParam, TenantByQueryParam):
|
||||
"""工单查询参数"""
|
||||
|
||||
title: str | tuple[str, str] | None = Field(None, description="工单标题")
|
||||
ticket_type: str | tuple[str, str] | None = Field(None, description="工单类型")
|
||||
assigned_id: int | tuple[str, int] | None = Field(None, description="处理人ID")
|
||||
status: int | tuple[str, int] | None = Field(None, ge=0, le=3, description="状态(0:待处理 1:处理中 2:已完成 3:已关闭)")
|
||||
|
||||
@model_validator(mode="after")
|
||||
def validate_query_params(self) -> "TicketQueryParam":
|
||||
if isinstance(self.title, str):
|
||||
self.title = (QueueEnum.like.value, self.title)
|
||||
if isinstance(self.ticket_type, str):
|
||||
self.ticket_type = (QueueEnum.like.value, self.ticket_type)
|
||||
if isinstance(self.assigned_id, int):
|
||||
self.assigned_id = (QueueEnum.eq.value, self.assigned_id)
|
||||
if isinstance(self.status, int):
|
||||
self.status = (QueueEnum.eq.value, self.status)
|
||||
return self
|
||||
title: str | None = Field(None, description="工单标题")
|
||||
ticket_type: str | None = Field(None, description="工单类型", json_schema_extra={"q": "eq"})
|
||||
assigned_id: int | None = Field(None, description="处理人ID")
|
||||
status: int | None = Field(None, ge=0, le=3, description="状态(0:待处理 1:处理中 2:已完成 3:已关闭)")
|
||||
|
||||
|
||||
class TicketCommentCreateSchema(BaseModel):
|
||||
|
||||
Reference in New Issue
Block a user