mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-09-23 13:13:09 +00:00
chore: 完成多批次代码优化与重构
- 重构工作流模块目录结构,迁移代码文件 - 修复类型断言空值安全问题,添加 ! 操作符 - 优化样式类名,替换 flex-cc 为标准 flex 工具类 - 更新路由标签简化文案,移除冗余注释 - 调整 ruff 配置,放宽行长度限制 - 更新 README 与多语言文案,优化项目描述 - 修复表单、图表组件的类型与样式问题 - 简化搜索表单、数据卡片的布局代码
This commit is contained in:
@@ -10,8 +10,9 @@ from pydantic import (
|
||||
)
|
||||
|
||||
from app.common.enums import QueueEnum
|
||||
from app.core.base_schema import BaseSchema, UserBySchema
|
||||
from app.core.validator import DateTimeStr, datetime_validator
|
||||
from app.core.base_params import BaseQueryParam, TenantByQueryParam, UserByQueryParam
|
||||
from app.core.base_schema import BaseSchema, TenantBySchema, UserBySchema
|
||||
from app.core.validator import datetime_validator
|
||||
|
||||
|
||||
class NodeCreateSchema(BaseModel):
|
||||
@@ -23,18 +24,10 @@ class NodeCreateSchema(BaseModel):
|
||||
func: str | None = Field(default=None, description="代码块")
|
||||
args: str | None = Field(default=None, description="位置参数")
|
||||
kwargs: str | None = Field(default=None, description="关键字参数")
|
||||
coalesce: bool | None = Field(
|
||||
default=False, description="是否合并运行:是否在多个运行时间到期时仅运行作业一次"
|
||||
)
|
||||
max_instances: int | None = Field(
|
||||
default=1, ge=1, description="最大实例数:允许的最大并发执行实例数"
|
||||
)
|
||||
coalesce: bool | None = Field(default=False, description="是否合并运行:是否在多个运行时间到期时仅运行作业一次")
|
||||
max_instances: int | None = Field(default=1, ge=1, description="最大实例数:允许的最大并发执行实例数")
|
||||
jobstore: str | None = Field(default="default", max_length=64, description="任务存储")
|
||||
executor: str | None = Field(
|
||||
default="default",
|
||||
max_length=64,
|
||||
description="任务执行器:将运行此作业的执行程序的名称",
|
||||
)
|
||||
executor: str | None = Field(default="default", max_length=64, description="任务执行器:将运行此作业的执行程序的名称")
|
||||
start_date: str | None = Field(default=None, description="开始时间")
|
||||
end_date: str | None = Field(default=None, description="结束时间")
|
||||
code: str | None = Field(default=None, max_length=32, description="节点编码")
|
||||
@@ -70,7 +63,7 @@ class NodeUpdateSchema(NodeCreateSchema):
|
||||
"""节点更新模型"""
|
||||
|
||||
|
||||
class NodeOutSchema(NodeCreateSchema, BaseSchema, UserBySchema):
|
||||
class NodeOutSchema(NodeCreateSchema, BaseSchema, UserBySchema, TenantBySchema):
|
||||
"""节点响应模型"""
|
||||
|
||||
trigger: str | None = Field(default=None, description="触发器")
|
||||
@@ -79,36 +72,17 @@ class NodeOutSchema(NodeCreateSchema, BaseSchema, UserBySchema):
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class NodeQueryParam:
|
||||
class NodeQueryParam(BaseQueryParam, UserByQueryParam, TenantByQueryParam):
|
||||
"""节点查询参数"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
name: 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"],
|
||||
),
|
||||
created_id: int | None = Query(None, description="创建人"),
|
||||
updated_id: int | None = Query(None, description="更新人"),
|
||||
*args,
|
||||
**kwargs,
|
||||
) -> None:
|
||||
|
||||
super().__init__(*args, **kwargs)
|
||||
self.name = (QueueEnum.like.value, name)
|
||||
self.created_id = (QueueEnum.eq.value, created_id)
|
||||
self.updated_id = (QueueEnum.eq.value, updated_id)
|
||||
self.status = (QueueEnum.eq.value, status)
|
||||
|
||||
if created_time and len(created_time) == 2:
|
||||
self.created_time = (QueueEnum.between.value, (created_time[0], created_time[1]))
|
||||
if updated_time and len(updated_time) == 2:
|
||||
self.updated_time = (QueueEnum.between.value, (updated_time[0], updated_time[1]))
|
||||
|
||||
|
||||
class NodeExecuteSchema(BaseModel):
|
||||
|
||||
Reference in New Issue
Block a user