mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-21 12:52:26 +00:00
feat: 新增租户、客户和令牌模块及相关功能
refactor: 重构用户、角色、部门等模块的字段长度和校验逻辑 fix: 修复前端接口类型定义和字段显示问题 style: 优化代码格式和注释 perf: 提升数据库连接性能和查询效率 docs: 更新README和配置文档 test: 添加字段校验和数据库连接测试 chore: 更新依赖包和配置文件
This commit is contained in:
@@ -3,9 +3,8 @@
|
||||
from fastapi import Query
|
||||
from pydantic import BaseModel, ConfigDict, Field, model_validator, field_validator
|
||||
|
||||
from app.core.validator import DateTimeStr
|
||||
from app.core.base_schema import BaseSchema
|
||||
from app.core.validator import role_permission_request_validator
|
||||
from app.core.validator import DateTimeStr, code_validator, role_permission_request_validator
|
||||
|
||||
from ..dept.schema import DeptOutSchema
|
||||
from ..menu.schema import MenuOutSchema
|
||||
@@ -13,8 +12,8 @@ from ..menu.schema import MenuOutSchema
|
||||
|
||||
class RoleCreateSchema(BaseModel):
|
||||
"""角色创建模型"""
|
||||
name: str = Field(..., max_length=40, description="角色名称")
|
||||
code: str | None = Field(default=None, max_length=40, description="角色编码")
|
||||
name: str = Field(..., max_length=64, description="角色名称")
|
||||
code: str | None = Field(default=None, max_length=16, description="角色编码")
|
||||
order: int | None = Field(default=1, ge=1, description='显示排序')
|
||||
data_scope: int | None = Field(default=1, description='数据权限范围(1:仅本人 2:本部门 3:本部门及以下 4:全部 5:自定义)')
|
||||
status: str = Field(default="0", description="是否启用")
|
||||
@@ -23,13 +22,7 @@ class RoleCreateSchema(BaseModel):
|
||||
@field_validator("code")
|
||||
@classmethod
|
||||
def validate_code(cls, value: str | None):
|
||||
if value is None:
|
||||
return value
|
||||
import re
|
||||
v = value.strip()
|
||||
if not re.match(r"^[A-Za-z][A-Za-z0-9_]{1,39}$", v):
|
||||
raise ValueError("角色编码需字母开头,允许字母/数字/下划线,长度2-40")
|
||||
return v
|
||||
return code_validator(value)
|
||||
|
||||
|
||||
class RolePermissionSettingSchema(BaseModel):
|
||||
@@ -64,21 +57,22 @@ class RoleQueryParam:
|
||||
def __init__(
|
||||
self,
|
||||
name: str | None = Query(None, description="角色名称"),
|
||||
status: str | None = Query(None, description="是否可用"),
|
||||
description: str | None = Query(None, description="描述"),
|
||||
status: str | None = Query(None, description="是否启用"),
|
||||
created_time: list[DateTimeStr] | None = Query(None, description="创建时间范围", examples=["2025-01-01 00:00:00", "2025-12-31 23:59:59"]),
|
||||
updated_time: list[DateTimeStr] | None = Query(None, description="更新时间范围", examples=["2025-01-01 00:00:00", "2025-12-31 23:59:59"]),
|
||||
updated_time: list[DateTimeStr] | None = Query(None, description="更新时间范围", examples=["2025-01-01 00:00:00", "2025-12-31 23:59:59"])
|
||||
) -> None:
|
||||
|
||||
# 模糊查询字段
|
||||
self.name = ("like", name)
|
||||
if description:
|
||||
self.description = ("like", description)
|
||||
|
||||
# 精确查询字段
|
||||
self.status = status
|
||||
|
||||
if status:
|
||||
self.status = ("eq", status)
|
||||
|
||||
# 时间范围查询
|
||||
if created_time and len(created_time) == 2:
|
||||
self.created_time = ("between", (created_time[0], created_time[1]))
|
||||
|
||||
if updated_time and len(updated_time) == 2:
|
||||
self.updated_time = ("between", (updated_time[0], updated_time[1]))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user