Skip to content

Commit 9ff36d4

Browse files
authored
Delete the default value of schema enum data (#723)
1 parent 98ef07a commit 9ff36d4

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

backend/app/admin/schema/data_rule.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class DataRuleSchemaBase(SchemaBase):
1414
name: str = Field(description='规则名称')
1515
model: str = Field(description='模型名称')
1616
column: str = Field(description='字段名称')
17-
operator: RoleDataRuleOperatorType = Field(RoleDataRuleOperatorType.AND, description='操作符(AND/OR)')
18-
expression: RoleDataRuleExpressionType = Field(RoleDataRuleExpressionType.eq, description='表达式类型')
17+
operator: RoleDataRuleOperatorType = Field(description='操作符(AND/OR)')
18+
expression: RoleDataRuleExpressionType = Field(description='表达式类型')
1919
value: str = Field(description='规则值')
2020

2121

backend/app/admin/schema/data_scope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DataScopeBase(SchemaBase):
1313
"""数据范围基础模型"""
1414

1515
name: str = Field(description='名称')
16-
status: StatusType = Field(StatusType.enable, description='状态')
16+
status: StatusType = Field(description='状态')
1717

1818

1919
class CreateDataScopeParam(DataScopeBase):

backend/app/admin/schema/dept.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class DeptSchemaBase(SchemaBase):
1717
leader: str | None = Field(None, description='负责人')
1818
phone: CustomPhoneNumber | None = Field(None, description='联系电话')
1919
email: CustomEmailStr | None = Field(None, description='邮箱')
20-
status: StatusType = Field(StatusType.enable, description='状态')
20+
status: StatusType = Field(description='状态')
2121

2222

2323
class CreateDeptParam(DeptSchemaBase):

backend/app/admin/schema/menu.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ class MenuSchemaBase(SchemaBase):
1717
parent_id: int | None = Field(None, description='菜单父级 ID')
1818
sort: int = Field(0, ge=0, description='排序')
1919
icon: str | None = Field(None, description='图标')
20-
type: MenuType = Field(MenuType.directory, description='菜单类型(0目录 1菜单 2按钮 3内嵌 4外链)')
20+
type: MenuType = Field(description='菜单类型(0目录 1菜单 2按钮 3内嵌 4外链)')
2121
component: str | None = Field(None, description='组件路径')
2222
perms: str | None = Field(None, description='权限标识')
23-
status: StatusType = Field(StatusType.enable, description='状态')
24-
display: StatusType = Field(StatusType.enable, description='是否显示')
25-
cache: StatusType = Field(StatusType.enable, description='是否缓存')
23+
status: StatusType = Field(description='状态')
24+
display: StatusType = Field(description='是否显示')
25+
cache: StatusType = Field(description='是否缓存')
2626
link: str | None = Field(None, description='外链地址')
2727
remark: str | None = Field(None, description='备注')
2828

backend/app/admin/schema/opera_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class OperaLogSchemaBase(SchemaBase):
2626
browser: str | None = Field(None, description='浏览器')
2727
device: str | None = Field(None, description='设备')
2828
args: dict[str, Any] | None = Field(None, description='请求参数')
29-
status: StatusType = Field(StatusType.enable, description='状态')
29+
status: StatusType = Field(description='状态')
3030
code: str = Field(description='状态码')
3131
msg: str | None = Field(None, description='消息')
3232
cost_time: float = Field(description='耗时')

backend/app/admin/schema/role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class RoleSchemaBase(SchemaBase):
1414
"""角色基础模型"""
1515

1616
name: str = Field(description='角色名称')
17-
status: StatusType = Field(StatusType.enable, description='状态')
17+
status: StatusType = Field(description='状态')
1818
is_filter_scopes: bool = Field(True, description='过滤数据权限')
1919
remark: str | None = Field(None, description='备注')
2020

backend/app/admin/schema/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class GetUserInfoDetail(UserInfoSchemaBase):
7474
uuid: str = Field(description='用户 UUID')
7575
email: CustomEmailStr | None = Field(None, description='邮箱')
7676
phone: CustomPhoneNumber | None = Field(None, description='手机号')
77-
status: StatusType = Field(StatusType.enable, description='状态')
77+
status: StatusType = Field(description='状态')
7878
is_superuser: bool = Field(description='是否超级管理员')
7979
is_staff: bool = Field(description='是否管理员')
8080
is_multi_login: bool = Field(description='是否允许多端登录')

backend/app/task/schema/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class TaskSchedulerSchemeBase(SchemaBase):
2222
start_time: datetime | None = Field(default=None, description='任务开始触发的时间')
2323
expire_time: datetime | None = Field(default=None, description='任务不再触发的截止时间')
2424
expire_seconds: int | None = Field(default=None, description='任务不再触发的秒数时间差')
25-
type: TaskSchedulerType = Field(default=TaskSchedulerType.INTERVAL, description='任务调度类型(0间隔 1定时)')
25+
type: TaskSchedulerType = Field(description='任务调度类型(0间隔 1定时)')
2626
interval_every: int | None = Field(default=None, description='任务再次运行前的间隔周期数')
2727
interval_period: PeriodType | None = Field(default=None, description='任务运行之间的周期类型')
2828
crontab: str = Field(default='* * * * *', description='运行的 Crontab 表达式')

backend/plugin/dict/schema/dict_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class DictDataSchemaBase(SchemaBase):
1515
label: str = Field(description='字典标签')
1616
value: str = Field(description='字典值')
1717
sort: int = Field(description='排序')
18-
status: StatusType = Field(StatusType.enable, description='状态')
18+
status: StatusType = Field(description='状态')
1919
remark: str | None = Field(None, description='备注')
2020

2121

backend/plugin/dict/schema/dict_type.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class DictTypeSchemaBase(SchemaBase):
1313

1414
name: str = Field(description='字典名称')
1515
code: str = Field(description='字典编码')
16-
status: StatusType = Field(StatusType.enable, description='状态')
16+
status: StatusType = Field(description='状态')
1717
remark: str | None = Field(None, description='备注')
1818

1919

0 commit comments

Comments
 (0)