mirror of
https://github.com/fastapiadmin/FastapiAdmin.git
synced 2026-10-05 09:20:57 +00:00
refactor: 统一项目中状态字段类型为数字类型
这是一个大规模的类型对齐优化: 1. 将多处字符串类型的status字段统一改为数字类型,包括前后端接口定义、数据模型、页面组件 2. 重构编排节点相关的命名和注释,统一改为"节点类型"替代"编排节点类型" 3. 移除了过时的忘记密码相关接口和模板代码 4. 优化搜索栏组件,支持展开仅显示次要字段 5. 调整部分接口参数和路由逻辑,对齐前后端参数格式
This commit is contained in:
@@ -83,6 +83,7 @@ export default DemoAPI;
|
||||
|
||||
export interface DemoPageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
name?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface DemoTable extends BaseType {
|
||||
|
||||
@@ -170,6 +170,7 @@ export interface GenTableColumnSchema extends BaseType {
|
||||
export interface GenTablePageQuery extends PageQuery, UserByQueryParams {
|
||||
table_name?: string;
|
||||
table_comment?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
/** 查询参数:DB 表 */
|
||||
|
||||
@@ -209,6 +209,7 @@ export interface EmailLogPageQuery extends PageQuery, UserByQueryParams {
|
||||
to_email?: string;
|
||||
biz_type?: string;
|
||||
template_code?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface EmailLogTable {
|
||||
|
||||
@@ -56,6 +56,13 @@ export default MenuAPI;
|
||||
export interface MenuPageQuery extends BaseQueryParams {
|
||||
name?: string;
|
||||
menu_client?: "pc" | "app";
|
||||
status?: number;
|
||||
type?: number;
|
||||
permission?: string;
|
||||
route_path?: string;
|
||||
component_path?: string;
|
||||
description?: string;
|
||||
scope?: "platform" | "tenant";
|
||||
}
|
||||
|
||||
export interface MenuTable extends BaseType {
|
||||
|
||||
@@ -127,6 +127,7 @@ export default OrderAPI;
|
||||
|
||||
export interface OrderPageQuery extends PageQuery, TenantByQueryParams {
|
||||
order_type?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface OrderTable {
|
||||
@@ -168,7 +169,9 @@ export interface PaymentRecordTable {
|
||||
|
||||
// ─── Refund 类型 ─────────────────────────────────────────
|
||||
|
||||
export interface RefundPageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {}
|
||||
export interface RefundPageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface RefundTable {
|
||||
id: number;
|
||||
|
||||
@@ -86,6 +86,7 @@ export default PackageAPI;
|
||||
export interface PackagePageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
name?: string;
|
||||
code?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface PackageTable extends BaseType {
|
||||
|
||||
@@ -105,6 +105,7 @@ export default PluginAPI;
|
||||
export interface PluginQueryParam extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
name?: string;
|
||||
category?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface PluginTable extends BaseType {
|
||||
|
||||
@@ -116,7 +116,7 @@ export interface WorkspaceData {
|
||||
id: number;
|
||||
name: string;
|
||||
code: string;
|
||||
status: string;
|
||||
status: number;
|
||||
status_label: string;
|
||||
start_time: string | null;
|
||||
end_time: string | null;
|
||||
|
||||
@@ -133,6 +133,7 @@ export default TenantAPI;
|
||||
export interface TenantPageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
name?: string;
|
||||
code?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface TenantTable extends BaseType {
|
||||
|
||||
@@ -23,7 +23,7 @@ const AuthAPI = {
|
||||
},
|
||||
|
||||
refreshToken(body: RefreshToekenBody) {
|
||||
return request<ApiResponse<LoginResult>>({
|
||||
return request<ApiResponse<JWTOut>>({
|
||||
url: `${API_PATH}/token/refresh`,
|
||||
method: "post",
|
||||
data: body,
|
||||
@@ -45,32 +45,6 @@ const AuthAPI = {
|
||||
});
|
||||
},
|
||||
|
||||
/** 获取免登录用户列表 */
|
||||
getAutoLoginUsers() {
|
||||
return request<ApiResponse<AutoLoginUser[]>>({
|
||||
url: `${API_PATH}/auto-login/users`,
|
||||
method: "get",
|
||||
});
|
||||
},
|
||||
|
||||
/** 获取免登录Token */
|
||||
getAutoLoginToken(userId: number) {
|
||||
return request<ApiResponse<AutoLoginToken>>({
|
||||
url: `${API_PATH}/auto-login/token`,
|
||||
method: "post",
|
||||
params: { user_id: userId },
|
||||
});
|
||||
},
|
||||
|
||||
/** 免登录 */
|
||||
autoLogin(token: string) {
|
||||
return request<ApiResponse<LoginResult>>({
|
||||
url: `${API_PATH}/auto-login`,
|
||||
method: "post",
|
||||
params: { token },
|
||||
});
|
||||
},
|
||||
|
||||
/** 获取当前用户的可选租户列表 */
|
||||
getTenants() {
|
||||
return request<ApiResponse<TenantOption[]>>({
|
||||
@@ -129,12 +103,16 @@ export interface LoginFormData {
|
||||
login_type?: string;
|
||||
}
|
||||
|
||||
/** 登录成功返回 (JWTOutSchema) */
|
||||
export interface LoginResult {
|
||||
/** JWT 响应 (JWTOutSchema) */
|
||||
export interface JWTOut {
|
||||
access_token: string;
|
||||
refresh_token: string;
|
||||
token_type: string;
|
||||
expires_in: number;
|
||||
}
|
||||
|
||||
/** 登录成功返回 */
|
||||
export interface LoginResult extends JWTOut {
|
||||
tenants?: TenantOption[];
|
||||
}
|
||||
|
||||
@@ -148,20 +126,6 @@ export interface LogoutBody {
|
||||
token: string;
|
||||
}
|
||||
|
||||
/** 免登录用户 (AutoLoginUserSchema) */
|
||||
export interface AutoLoginUser {
|
||||
id: number;
|
||||
username: string;
|
||||
name: string;
|
||||
avatar?: string | null;
|
||||
}
|
||||
|
||||
/** 免登录 Token (AutoLoginTokenSchema) */
|
||||
export interface AutoLoginToken {
|
||||
token: string;
|
||||
user: AutoLoginUser;
|
||||
}
|
||||
|
||||
/** 租户选项 */
|
||||
export interface TenantOption {
|
||||
id: number;
|
||||
|
||||
@@ -11,9 +11,9 @@ const DeptAPI = {
|
||||
});
|
||||
},
|
||||
|
||||
detailDept(query: number) {
|
||||
detailDept(id: number) {
|
||||
return request<ApiResponse<DeptTable>>({
|
||||
url: `${API_PATH}/detail/${query}`,
|
||||
url: `${API_PATH}/detail/${id}`,
|
||||
method: "get",
|
||||
});
|
||||
},
|
||||
@@ -53,8 +53,9 @@ const DeptAPI = {
|
||||
|
||||
export default DeptAPI;
|
||||
|
||||
export interface DeptPageQuery extends UserByQueryParams {
|
||||
export interface DeptPageQuery extends UserByQueryParams, TenantByQueryParams {
|
||||
name?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface DeptTable extends BaseType {
|
||||
|
||||
@@ -135,12 +135,14 @@ export default DictAPI;
|
||||
export interface DictPageQuery extends PageQuery, UserByQueryParams {
|
||||
dict_name?: string;
|
||||
dict_type?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface DictDataPageQuery extends PageQuery, UserByQueryParams {
|
||||
dict_label?: string;
|
||||
dict_type?: string;
|
||||
dict_type_id?: number;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface DictTable extends BaseType {
|
||||
|
||||
@@ -40,9 +40,10 @@ const OperationLogAPI = {
|
||||
|
||||
export default OperationLogAPI;
|
||||
|
||||
export interface OperationLogPageQuery extends PageQuery {
|
||||
export interface OperationLogPageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
request_path?: string;
|
||||
creator_name?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface OperationLogTable {
|
||||
@@ -86,8 +87,9 @@ export const LoginLogAPI = {
|
||||
},
|
||||
};
|
||||
|
||||
export interface LoginLogPageQuery extends PageQuery {
|
||||
export interface LoginLogPageQuery extends PageQuery, UserByQueryParams, TenantByQueryParams {
|
||||
username?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface LoginLogTable {
|
||||
|
||||
@@ -100,6 +100,7 @@ export default NoticeAPI;
|
||||
export interface NoticePageQuery extends PageQuery, UserByQueryParams {
|
||||
notice_title?: string;
|
||||
notice_type?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface NoticeTable extends BaseType {
|
||||
|
||||
@@ -86,6 +86,7 @@ export interface ConfigPageQuery extends PageQuery, UserByQueryParams {
|
||||
config_name?: string;
|
||||
config_key?: string;
|
||||
config_type?: boolean;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface ConfigTable extends BaseType {
|
||||
|
||||
@@ -64,6 +64,7 @@ export default PositionAPI;
|
||||
|
||||
export interface PositionPageQuery extends PageQuery, UserByQueryParams {
|
||||
name?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface PositionTable extends BaseType {
|
||||
|
||||
@@ -114,7 +114,7 @@ export interface permissionMenuType {
|
||||
type: number;
|
||||
permission: string;
|
||||
parent_id?: number;
|
||||
status: string;
|
||||
status: number;
|
||||
description?: string;
|
||||
children?: permissionMenuType[];
|
||||
}
|
||||
|
||||
@@ -41,6 +41,7 @@ export interface TicketPageQuery extends PageQuery, UserByQueryParams {
|
||||
title?: string;
|
||||
ticket_type?: string;
|
||||
assigned_id?: number;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface TicketTable extends BaseType {
|
||||
|
||||
@@ -36,16 +36,16 @@ export const UserAPI = {
|
||||
});
|
||||
},
|
||||
|
||||
resetUserPassword(body: ResetPasswordForm) {
|
||||
resetUserPassword(id: number, body: ResetPasswordForm) {
|
||||
return request<ApiResponse>({
|
||||
url: `${API_PATH}/reset/password`,
|
||||
url: `${API_PATH}/password/reset/${id}`,
|
||||
method: "put",
|
||||
data: body,
|
||||
});
|
||||
},
|
||||
|
||||
registerUser(body: RegisterForm) {
|
||||
return request<ApiResponse>({
|
||||
return request<ApiResponse<UserInfo>>({
|
||||
url: `${API_PATH}/register`,
|
||||
method: "post",
|
||||
data: body,
|
||||
@@ -54,7 +54,7 @@ export const UserAPI = {
|
||||
|
||||
forgetPassword(body: ForgetPasswordForm) {
|
||||
return request<ApiResponse>({
|
||||
url: `${API_PATH}/forget/password`,
|
||||
url: `${API_PATH}/password/forget`,
|
||||
method: "post",
|
||||
data: body,
|
||||
});
|
||||
@@ -68,9 +68,9 @@ export const UserAPI = {
|
||||
});
|
||||
},
|
||||
|
||||
detailUser(query: number) {
|
||||
detailUser(id: number) {
|
||||
return request<ApiResponse<UserInfo>>({
|
||||
url: `${API_PATH}/detail/${query}`,
|
||||
url: `${API_PATH}/detail/${id}`,
|
||||
method: "get",
|
||||
});
|
||||
},
|
||||
@@ -107,11 +107,11 @@ export const UserAPI = {
|
||||
});
|
||||
},
|
||||
|
||||
exportUser(body: UserPageQuery) {
|
||||
exportUser(query: UserPageQuery) {
|
||||
return request<Blob>({
|
||||
url: `${API_PATH}/export`,
|
||||
method: "post",
|
||||
data: body,
|
||||
method: "get",
|
||||
params: query,
|
||||
responseType: "blob",
|
||||
});
|
||||
},
|
||||
@@ -119,7 +119,7 @@ export const UserAPI = {
|
||||
downloadTemplateUser() {
|
||||
return request<ApiResponse>({
|
||||
url: `${API_PATH}/import/template`,
|
||||
method: "post",
|
||||
method: "get",
|
||||
responseType: "blob",
|
||||
});
|
||||
},
|
||||
@@ -244,7 +244,6 @@ export interface PasswordFormState {
|
||||
}
|
||||
|
||||
export interface ResetPasswordForm {
|
||||
id: number;
|
||||
password: string;
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ const JobAPI = {
|
||||
export default JobAPI;
|
||||
|
||||
export interface SchedulerStatus {
|
||||
status: string;
|
||||
status: number;
|
||||
is_running: boolean;
|
||||
job_count: number;
|
||||
}
|
||||
@@ -138,6 +138,7 @@ export interface JobLogPageQuery extends PageQuery, UserByQueryParams {
|
||||
job_id?: string;
|
||||
job_name?: string;
|
||||
trigger_type?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface JobLogTable extends BaseType {
|
||||
|
||||
@@ -78,6 +78,7 @@ export default NodeAPI;
|
||||
export interface NodePageQuery extends PageQuery, UserByQueryParams {
|
||||
name?: string;
|
||||
code?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export type TriggerType = "now" | "cron" | "interval" | "date";
|
||||
@@ -91,7 +92,7 @@ export interface ExecuteNodeParams {
|
||||
|
||||
export interface ExecuteNodeResult {
|
||||
job_id: number;
|
||||
status: string;
|
||||
status: number;
|
||||
trigger: TriggerType;
|
||||
}
|
||||
|
||||
|
||||
@@ -66,6 +66,7 @@ export { WorkflowDefinitionAPI };
|
||||
export interface WorkflowPageQuery extends PageQuery, UserByQueryParams {
|
||||
name?: string;
|
||||
code?: string;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface WorkflowTable extends BaseType {
|
||||
@@ -100,7 +101,7 @@ export interface WorkflowExecuteForm {
|
||||
export interface WorkflowExecuteResult {
|
||||
workflow_id: number;
|
||||
workflow_name: string;
|
||||
status: string;
|
||||
status: number;
|
||||
start_time?: string;
|
||||
end_time?: string;
|
||||
variables?: Record<string, any>;
|
||||
|
||||
@@ -61,7 +61,7 @@ const WorkflowNodeTypeAPI = {
|
||||
export default WorkflowNodeTypeAPI;
|
||||
export { WorkflowNodeTypeAPI };
|
||||
|
||||
/** 编排节点类型选项(对应后端 task_workflow_node_type) */
|
||||
/** 节点类型选项(对应后端 task_workflow_node_type) */
|
||||
export interface WorkflowNodeTypeOption {
|
||||
id: number;
|
||||
code: string;
|
||||
@@ -76,6 +76,7 @@ export interface WorkflowNodeTypePageQuery extends PageQuery, UserByQueryParams
|
||||
code?: string;
|
||||
category?: string;
|
||||
is_active?: boolean;
|
||||
status?: number;
|
||||
}
|
||||
|
||||
export interface WorkflowNodeTypeTable extends BaseType {
|
||||
|
||||
Reference in New Issue
Block a user