diff --git a/frontend/src/pages/Dashboard/components/DeploymentFormModal.tsx b/frontend/src/pages/Dashboard/components/DeploymentFormModal.tsx index 74b3d79e..6374c31f 100644 --- a/frontend/src/pages/Dashboard/components/DeploymentFormModal.tsx +++ b/frontend/src/pages/Dashboard/components/DeploymentFormModal.tsx @@ -75,12 +75,11 @@ const DeploymentFormModal: React.FC = ({ // 通知信息(使用环境配置的通知设置) notification: { notificationChannelId: environment.notificationConfig?.notificationChannelId, - deployNotificationEnabled: environment.notificationConfig?.deployNotificationEnabled, - deployNotificationTemplateId: environment.notificationConfig?.deployNotificationTemplateId, + preApprovalNotificationEnabled: environment.notificationConfig?.preApprovalNotificationEnabled, + preApprovalNotificationTemplateId: environment.notificationConfig?.preApprovalNotificationTemplateId, buildNotificationEnabled: environment.notificationConfig?.buildNotificationEnabled, buildNotificationTemplateId: environment.notificationConfig?.buildNotificationTemplateId, buildFailureFileEnabled: environment.notificationConfig?.buildFailureFileEnabled, - buildFailureNotificationTemplateId: environment.notificationConfig?.buildFailureNotificationTemplateId, }, }; }, [app, environment, teamId, currentUser]); // 只在这些依赖变化时重新生成 diff --git a/frontend/src/pages/Dashboard/types.ts b/frontend/src/pages/Dashboard/types.ts index 82924ed3..efcb2269 100644 --- a/frontend/src/pages/Dashboard/types.ts +++ b/frontend/src/pages/Dashboard/types.ts @@ -60,12 +60,11 @@ export interface ApplicationConfig { export interface NotificationConfig { notificationChannelId: number; - deployNotificationEnabled: boolean; - deployNotificationTemplateId: number; + preApprovalNotificationEnabled: boolean; + preApprovalNotificationTemplateId: number; buildNotificationEnabled: boolean; buildNotificationTemplateId: number; buildFailureFileEnabled: boolean; - buildFailureNotificationTemplateId: number; } export interface DeployEnvironment { diff --git a/frontend/src/pages/Deploy/Team/List/components/ApplicationManageDialog.tsx b/frontend/src/pages/Deploy/Team/List/components/ApplicationManageDialog.tsx index 4864e2fe..563cc509 100644 --- a/frontend/src/pages/Deploy/Team/List/components/ApplicationManageDialog.tsx +++ b/frontend/src/pages/Deploy/Team/List/components/ApplicationManageDialog.tsx @@ -292,15 +292,15 @@ const ApplicationManageDialog: React.FC = ({ {/* 表格 */}
-
- +
+
- 应用ID - 应用编码 - 应用名称 - 创建时间 - 操作 + 应用ID + 应用编码 + 应用名称 + 创建时间 + 操作 @@ -316,20 +316,20 @@ const ApplicationManageDialog: React.FC = ({ ) : data?.content && data.content.length > 0 ? ( data.content.map((record) => ( - + {record.applicationId} - + {record.applicationCode || '-'} - + {record.applicationName || '-'} - + {record.createTime || '-'} -
+
diff --git a/frontend/src/pages/Deploy/Team/List/types.ts b/frontend/src/pages/Deploy/Team/List/types.ts index 8370cee6..8f3515f6 100644 --- a/frontend/src/pages/Deploy/Team/List/types.ts +++ b/frontend/src/pages/Deploy/Team/List/types.ts @@ -53,12 +53,11 @@ export interface NotificationConfig { teamId?: number; environmentId?: number; notificationChannelId?: number; - deployNotificationEnabled?: boolean; - deployNotificationTemplateId?: number; + preApprovalNotificationEnabled?: boolean; + preApprovalNotificationTemplateId?: number; buildNotificationEnabled?: boolean; buildNotificationTemplateId?: number; buildFailureFileEnabled?: boolean; - buildFailureNotificationTemplateId?: number; notificationChannelName?: string; // 关联数据 channelType?: string; // 渠道类型:WEWORK, EMAIL, DINGTALK等 updateTime?: string; // 更新时间 @@ -96,12 +95,11 @@ export interface TeamEnvironmentConfigRequest { notificationConfig?: { id?: number; notificationChannelId?: number; - deployNotificationEnabled?: boolean; - deployNotificationTemplateId?: number; + preApprovalNotificationEnabled?: boolean; + preApprovalNotificationTemplateId?: number; buildNotificationEnabled?: boolean; buildNotificationTemplateId?: number; buildFailureFileEnabled?: boolean; - buildFailureNotificationTemplateId?: number; }; } diff --git a/frontend/src/pages/System/Online/List/index.tsx b/frontend/src/pages/System/Online/List/index.tsx index d00fbd3c..94bc33fa 100644 --- a/frontend/src/pages/System/Online/List/index.tsx +++ b/frontend/src/pages/System/Online/List/index.tsx @@ -210,19 +210,19 @@ const OnlineUserList: React.FC = () => {
-
+
- 用户名 - 昵称 - 部门 - 登录时间 - 在线时长 - 最后活跃 - IP地址 - 浏览器 - 操作系统 - 操作 + 用户名 + 昵称 + 部门 + 登录时间 + 在线时长 + 最后活跃 + IP地址 + 浏览器 + 操作系统 + 操作 @@ -235,26 +235,28 @@ const OnlineUserList: React.FC = () => { ) : data?.content && data.content.length > 0 ? ( data.content.map((user) => ( - {user.username} - {user.nickname} - {user.departmentName || '-'} - {formatTime(user.loginTime)} - {formatDuration(user.onlineDuration)} - {formatTime(user.lastActiveTime)} - {user.ipAddress || '-'} - {user.browser || '-'} - {user.os || '-'} - - + {user.username} + {user.nickname} + {user.departmentName || '-'} + {formatTime(user.loginTime)} + {formatDuration(user.onlineDuration)} + {formatTime(user.lastActiveTime)} + {user.ipAddress || '-'} + {user.browser || '-'} + {user.os || '-'} + +
+ +
))