public/FastapiAdmin
1
0
Fork 0
mirror of https://github.com/fastapiadmin/FastapiAdmin.git synced 2026-09-21 12:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 移除多租户和客户相关代码及功能

Browse Source 
refactor: 统一状态字段为字符串类型并更新相关组件
refactor: 更新模型基类移除租户和客户相关字段
refactor: 简化数据权限控制逻辑
refactor: 优化类型注解使用Python 3.10+语法
refactor: 清理无用导入和注释
docs: 更新文档移除多租户相关内容
This commit is contained in:
zhangtao
2025-12-01 00:36:05 +08:00
parent 463e2fca23
commit 3c12fa56eb
173 changed files with 3143 additions and 7672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/api/v1/module_system/role/schema.py
+24 -18
View File
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
from typing import List, Optional
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, UserBySchema, TenantSchema
from app.core.base_schema import BaseSchema, UserBySchema
from app.core.validator import role_permission_request_validator
from ..dept.schema import DeptOutSchema
@@ -15,15 +14,15 @@ from ..menu.schema import MenuOutSchema
class RoleCreateSchema(BaseModel):
"""角色创建模型"""
name: str = Field(..., max_length=40, description="角色名称")
code: Optional[str] = Field(default=None, max_length=40, description="角色编码")
order: Optional[int] = Field(default=1, ge=1, description='显示排序')
data_scope: Optional[int] = Field(default=1, ge=1, le=5, description='数据权限范围')
code: str | None = Field(default=None, max_length=40, 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="是否启用")
description: Optional[str] = Field(default=None, max_length=255, description="描述")
description: str | None = Field(default=None, max_length=255, description="描述")
@field_validator("code")
@classmethod
def validate_code(cls, value: Optional[str]):
def validate_code(cls, value: str | None):
if value is None:
return value
import re
@@ -35,10 +34,10 @@ class RoleCreateSchema(BaseModel):
class RolePermissionSettingSchema(BaseModel):
"""角色权限配置模型"""
data_scope: int = Field(default=1, ge=1, le=5, description='数据权限范围')
role_ids: List[int] = Field(default_factory=list, description='角色ID列表')
menu_ids: List[int] = Field(default_factory=list, description='菜单ID列表')
dept_ids: List[int] = Field(default_factory=list, description='部门ID列表')
data_scope: int = Field(default=1, description='数据权限范围(1:仅本人 2:本部门 3:本部门及以下 4:全部 5:自定义)')
role_ids: list[int] = Field(default_factory=list, description='角色ID列表')
menu_ids: list[int] = Field(default_factory=list, description='菜单ID列表')
dept_ids: list[int] = Field(default_factory=list, description='部门ID列表')
@model_validator(mode='after')
def validate_fields(self):
@@ -51,12 +50,12 @@ class RoleUpdateSchema(RoleCreateSchema):
...
class RoleOutSchema(RoleCreateSchema, BaseSchema, UserBySchema, TenantSchema):
class RoleOutSchema(RoleCreateSchema, BaseSchema, UserBySchema):
"""角色信息响应模型"""
model_config = ConfigDict(from_attributes=True)
menus: List[MenuOutSchema] = Field(default_factory=list, description='角色菜单列表')
depts: List[DeptOutSchema] = Field(default_factory=list, description='角色部门列表')
menus: list[MenuOutSchema] = Field(default_factory=list, description='角色菜单列表')
depts: list[DeptOutSchema] = Field(default_factory=list, description='角色部门列表')
class RoleQueryParam:
@@ -64,10 +63,12 @@ class RoleQueryParam:
def __init__(
self,
name: Optional[str] = Query(None, description="角色名称"),
status: Optional[str] = Query(None, description="是否可用"),
created_id: Optional[int] = Query(None, description="创建人"),
created_time: Optional[list[DateTimeStr]] = Query(None, description="创建时间范围", example=["2025-01-01 00:00:00", "2025-12-31 23:59:59"]),
name: str | None = Query(None, description="角色名称"),
status: str | None = Query(None, description="是否可用"),
created_time: list[DateTimeStr] | None = Query(None, description="创建时间范围", example=["2025-01-01 00:00:00", "2025-12-31 23:59:59"]),
updated_time: list[DateTimeStr] | None = Query(None, description="更新时间范围", example=["2025-01-01 00:00:00", "2025-12-31 23:59:59"]),
created_id: int | None = Query(None, description="创建人"),
updated_id: int | None = Query(None, description="更新人"),
) -> None:
# 模糊查询字段
@@ -75,8 +76,13 @@ class RoleQueryParam:
# 精确查询字段
self.created_id = created_id
self.updated_id = updated_id
self.status = 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]))