diff --git a/packages/api/src/core/connections.ts b/packages/api/src/core/connections.ts index ccd83d5aa..dbb575d3b 100644 --- a/packages/api/src/core/connections.ts +++ b/packages/api/src/core/connections.ts @@ -44,6 +44,51 @@ export function batchUpdateConnectionAgentSettings( return requestClient.patch(`${BASE_URL}/batch-agent-settings`, params) } +export interface ConnectionAgentConflictReport { + total: number + hiddenCount: number + hasConflicts: boolean + items: Array<{ + id: string + name: string + syncType: string + status: string + editable: boolean + canEdit: boolean + autoResolvable: boolean + blockedReason: string | null + revision: number | null + allowedAgentProcessIds?: string[] | null + code: string + reason: string + connections: Array<{ id: string; name: string }> + }> +} + +export function updateConflictTaskAgents( + params: BatchUpdateConnectionAgentSettingsParams & { + taskEdits: Array<{ id: string; revision: number | null }> + taskSettings: BatchUpdateConnectionAgentSettingsParams['settings'] + }, +) { + return requestClient.post<{ + updatedTaskIds: string[] + failures: Array<{ id: string; code: string }> + }>(`${BASE_URL}/agent-settings-conflicts/tasks`, params) +} + +export function checkConnectionAgentSettings( + params: BatchUpdateConnectionAgentSettingsParams & { + skip?: number + limit?: number + }, +) { + return requestClient.post( + `${BASE_URL}/agent-settings-conflicts`, + params, + ) +} + export function checkConnection(id: string, params: any) { return requestClient.patch(`${BASE_URL}/${id}`, params) } diff --git a/packages/business/src/locale/lang/en.js b/packages/business/src/locale/lang/en.js index 1791260fe..63164879e 100644 --- a/packages/business/src/locale/lang/en.js +++ b/packages/business/src/locale/lang/en.js @@ -1,4 +1,43 @@ export default { + packages_business_agent_edit_one: 'Edit task Agent', + + packages_business_agent_recheck: 'Check again', + packages_business_agent_recheck_clear: + 'No conflicts detected. You can continue saving the connection.', + packages_business_agent_auto_title: 'Confirm automatic allocation', + packages_business_agent_auto_confirm: + 'Save platform automatic allocation for these {count} tasks: {names}. Task changes are saved first and remain if you cancel or connection saving fails.', + packages_business_agent_auto_save: + 'Set automatic allocation and save ({count})', + packages_business_agent_actions_hint: + 'Automatic action includes only eligible tasks on this page or in your selection. Resolve the other items as indicated, then check again.', + packages_business_agent_action: 'How to resolve', + packages_business_agent_action_auto: + 'Can resolve automatically: use platform allocation', + packages_business_agent_action_no_edit_permission: + 'View only; task edit permission required', + packages_business_agent_action_task_active: + 'Task is active; stop it and check again', + packages_business_agent_action_connection_conflict: + 'Change the related connection Agent settings; task changes cannot resolve this', + packages_business_agent_action_unsupported_policy: + 'This task type has no editable task Agent policy', + packages_business_agent_action_policy_conflict: + 'Edit task Agent settings and check again', + + packages_business_agent_tasks_selected: 'Selected {count} tasks', + + packages_business_agent_tasks_retry: + 'The task changed, is not editable, or its save result is unknown. Refresh and retry.', + + packages_business_agent_tasks_hint: + 'Only editable inactive tasks can be selected. Task changes are saved first and remain saved if connection saving is canceled or fails.', + + packages_business_agent_tasks_edit: 'Batch edit task Agents', + packages_business_agent_tasks_saved: + '{count} tasks updated. These changes remain saved even if you cancel or connection saving fails.', + packages_business_agent_tasks_continue: 'Continue saving connection', + packages_business_status_wait_start: 'Ready To Start', packages_business_status_starting: 'Starting', packages_business_status_renewing: 'Resetting', @@ -1907,6 +1946,24 @@ export default { 'When any API Server connection pool resource is tight and triggers the alarm threshold', packages_business_api_server_connection_pool_idle_warn: 'When the number of connections in the connection pool of any API Server falls below the alarm threshold', + packages_business_agent_conflict_title: 'Agent changes conflict with tasks', + packages_business_agent_conflict_summary: + 'These changes conflict with {count} tasks. Adjust the task or connection settings before saving again.', + packages_business_agent_conflict_hidden: + 'You do not have permission to view {count} of these tasks. Contact an administrator to resolve them.', + packages_business_agent_conflict_type: 'Task type', + packages_business_agent_conflict_status: 'Task status', + packages_business_agent_conflict_connections: 'Changed connections', + packages_business_agent_conflict_reason: 'Conflict reason', + packages_business_agent_conflict_reason_connections: + 'The task connections have no mutually allowed Agent.', + packages_business_agent_conflict_reason_task: + 'The Agent specified by the task is not allowed by its connections.', + packages_business_agent_conflict_type_sync: 'Data development', + packages_business_agent_conflict_type_migrate: 'Data replication', + packages_business_agent_conflict_type_logCollector: 'Shared mining', + packages_business_agent_conflict_type_connHeartbeat: 'Heartbeat', + packages_business_agent_conflict_type_inspect: 'Data verification', packages_business_connector_requires_download: 'This data source is not registered. Download and register it before creating a connection.', packages_business_connector_update_available: 'Update', diff --git a/packages/business/src/locale/lang/zh-CN.js b/packages/business/src/locale/lang/zh-CN.js index 797d97619..3a7a562c0 100644 --- a/packages/business/src/locale/lang/zh-CN.js +++ b/packages/business/src/locale/lang/zh-CN.js @@ -1,4 +1,39 @@ export default { + packages_business_agent_edit_one: '修改任务 Agent', + + packages_business_agent_recheck: '重新检查', + packages_business_agent_recheck_clear: '当前未检测到冲突,可以继续保存连接。', + packages_business_agent_auto_title: '确认批量改为自动分配', + packages_business_agent_auto_confirm: + '将以下 {count} 个任务改为平台自动分配并立即保存:{names}。任务先保存,取消或连接保存失败不会撤销这些修改。', + packages_business_agent_auto_save: '改为自动分配并保存({count} 项)', + packages_business_agent_actions_hint: + '自动操作仅处理本页或已勾选任务中预检可解决的项目。其他项目请按处理方式调整后重新检查。', + packages_business_agent_action: '处理方式', + packages_business_agent_action_auto: '可自动解决:改为平台自动分配', + packages_business_agent_action_no_edit_permission: + '仅可查看,需要任务编辑权限', + packages_business_agent_action_task_active: '任务活动中,请先停止后重新检查', + packages_business_agent_action_connection_conflict: + '需调整相关连接的 Agent 配置,改任务无法解决', + packages_business_agent_action_unsupported_policy: + '此类型没有可修改的任务级 Agent 设置', + packages_business_agent_action_policy_conflict: + '请手动调整任务 Agent 后重新检查', + + packages_business_agent_tasks_selected: '已选择 {count} 个任务', + + packages_business_agent_tasks_retry: + '任务已变化、不可编辑或保存结果不确定,请刷新确认后重试。', + + packages_business_agent_tasks_hint: + '仅可选择有编辑权限的非运行任务。任务设置先保存;取消或连接保存失败不会撤销任务修改。', + + packages_business_agent_tasks_edit: '批量修改任务 Agent', + packages_business_agent_tasks_saved: + '已修改 {count} 个任务。取消或连接保存失败不会撤销已保存的任务设置。', + packages_business_agent_tasks_continue: '继续保存连接', + packages_business_status_wait_start: '待启动', packages_business_status_starting: '启动中', packages_business_status_renewing: '重置中', @@ -1710,6 +1745,24 @@ export default { '当任一API Server 连接池资源紧张触发告警阈值时', packages_business_api_server_connection_pool_idle_warn: '当任一API Server 连接池连接数低于告警阈值时', + packages_business_agent_conflict_title: '切换 Agent 存在任务冲突', + packages_business_agent_conflict_summary: + '本次修改会与 {count} 个任务产生 Agent 冲突。请先调整任务或连接配置,再重新保存。', + packages_business_agent_conflict_hidden: + '其中有 {count} 个任务无权查看,请联系管理员处理。', + packages_business_agent_conflict_type: '任务类型', + packages_business_agent_conflict_status: '任务状态', + packages_business_agent_conflict_connections: '修改的连接', + packages_business_agent_conflict_reason: '冲突原因', + packages_business_agent_conflict_reason_connections: + '任务关联连接没有共同允许的 Agent。', + packages_business_agent_conflict_reason_task: + '任务指定的 Agent 不在连接允许的范围内。', + packages_business_agent_conflict_type_sync: '数据开发', + packages_business_agent_conflict_type_migrate: '数据复制', + packages_business_agent_conflict_type_logCollector: '共享挖掘', + packages_business_agent_conflict_type_connHeartbeat: '心跳任务', + packages_business_agent_conflict_type_inspect: '数据校验', packages_business_connector_requires_download: '此数据源尚未注册,请先下载并注册后再创建连接。', packages_business_connector_update_available: '更新', diff --git a/packages/business/src/locale/lang/zh-TW.js b/packages/business/src/locale/lang/zh-TW.js index 8b204f157..a454d797d 100644 --- a/packages/business/src/locale/lang/zh-TW.js +++ b/packages/business/src/locale/lang/zh-TW.js @@ -1,4 +1,39 @@ export default { + packages_business_agent_edit_one: '修改任務 Agent', + + packages_business_agent_recheck: '重新檢查', + packages_business_agent_recheck_clear: '目前未偵測到衝突,可以繼續儲存連線。', + packages_business_agent_auto_title: '確認批次改為自動分配', + packages_business_agent_auto_confirm: + '將以下 {count} 個任務改為平台自動分配並立即儲存:{names}。任務先儲存,取消或連線儲存失敗不會撤銷這些修改。', + packages_business_agent_auto_save: '改為自動分配並儲存({count} 項)', + packages_business_agent_actions_hint: + '自動操作僅處理本頁或已勾選任務中預檢可解決的項目。其他項目請依處理方式調整後重新檢查。', + packages_business_agent_action: '處理方式', + packages_business_agent_action_auto: '可自動解決:改為平台自動分配', + packages_business_agent_action_no_edit_permission: + '僅可檢視,需要任務編輯權限', + packages_business_agent_action_task_active: '任務執行中,請先停止後重新檢查', + packages_business_agent_action_connection_conflict: + '需調整相關連線的 Agent 設定,修改任務無法解決', + packages_business_agent_action_unsupported_policy: + '此類型沒有可修改的任務級 Agent 設定', + packages_business_agent_action_policy_conflict: + '請手動調整任務 Agent 後重新檢查', + + packages_business_agent_tasks_selected: '已選擇 {count} 個任務', + + packages_business_agent_tasks_retry: + '任務已變更、不可編輯或儲存結果不確定,請重新整理確認後重試。', + + packages_business_agent_tasks_hint: + '僅可選擇有編輯權限的非執行任務。任務設定先儲存;取消或連線儲存失敗不會撤銷任務修改。', + + packages_business_agent_tasks_edit: '批次修改任務 Agent', + packages_business_agent_tasks_saved: + '已修改 {count} 個任務。取消或連線儲存失敗不會撤銷已儲存的任務設定。', + packages_business_agent_tasks_continue: '繼續儲存連線', + packages_business_status_wait_start: '待啟動', packages_business_status_starting: '啟動中', packages_business_status_renewing: '重置中', @@ -1699,6 +1734,24 @@ export default { '當任一API Server 連接池資源緊張触发告警閾值時', packages_business_api_server_connection_pool_idle_warn: '當任一API Server 連接池連接數低於告警閾值時', + packages_business_agent_conflict_title: '切換 Agent 存在任務衝突', + packages_business_agent_conflict_summary: + '本次修改會與 {count} 個任務產生 Agent 衝突。請先調整任務或連線設定,再重新儲存。', + packages_business_agent_conflict_hidden: + '其中有 {count} 個任務無權檢視,請聯絡管理員處理。', + packages_business_agent_conflict_type: '任務類型', + packages_business_agent_conflict_status: '任務狀態', + packages_business_agent_conflict_connections: '修改的連線', + packages_business_agent_conflict_reason: '衝突原因', + packages_business_agent_conflict_reason_connections: + '任務關聯的連線沒有共同允許的 Agent。', + packages_business_agent_conflict_reason_task: + '任務指定的 Agent 不在連線允許的範圍內。', + packages_business_agent_conflict_type_sync: '資料開發', + packages_business_agent_conflict_type_migrate: '資料複製', + packages_business_agent_conflict_type_logCollector: '共享挖掘', + packages_business_agent_conflict_type_connHeartbeat: '心跳任務', + packages_business_agent_conflict_type_inspect: '資料校驗', packages_business_connector_requires_download: '此資料來源尚未註冊,請先下載並註冊後再建立連線。', packages_business_connector_update_available: '更新', diff --git a/packages/business/src/views/connections/AgentTaskConflictDialog.vue b/packages/business/src/views/connections/AgentTaskConflictDialog.vue new file mode 100644 index 000000000..22f6b15af --- /dev/null +++ b/packages/business/src/views/connections/AgentTaskConflictDialog.vue @@ -0,0 +1,421 @@ + + + diff --git a/packages/business/src/views/connections/BatchAgentSettingsDialog.vue b/packages/business/src/views/connections/BatchAgentSettingsDialog.vue index 22deb3b09..e3c262145 100644 --- a/packages/business/src/views/connections/BatchAgentSettingsDialog.vue +++ b/packages/business/src/views/connections/BatchAgentSettingsDialog.vue @@ -20,6 +20,13 @@ interface ConnectionRow { shareCdcEnable?: boolean } +const props = defineProps<{ + loading?: boolean + title?: string + subtitleKey?: string + allowedAgentProcessIds?: string[] | null +}>() + const emit = defineEmits<{ submit: [payload: BatchAgentSettingsPayload] }>() @@ -28,6 +35,7 @@ const { t } = useI18n() const isDaas = import.meta.env.VUE_APP_PLATFORM === 'DAAS' const visible = ref(false) const selectedConnections = ref([]) +const selectedAllowedAgentProcessIds = ref() const schemaForm = ref | null>(null) const formValues = ref>({}) const formKey = ref(0) @@ -88,11 +96,21 @@ const formScope = { ) } }, - loadAccessNode: loadAccessNodeOptions, + loadAccessNode: (field: unknown, others: { value?: string } = {}) => + loadAccessNodeOptions(field, { + ...others, + allowedAgentProcessIds: selectedAllowedAgentProcessIds.value, + }), } -const open = (connections: ConnectionRow[]) => { +const open = ( + connections: ConnectionRow[], + allowedAgents = props.allowedAgentProcessIds, +) => { selectedConnections.value = [...connections] + selectedAllowedAgentProcessIds.value = allowedAgents + ? [...allowedAgents] + : allowedAgents const hasSharedCdcConnection = connections.some( (connection) => connection.shareCdcEnable, ) @@ -158,16 +176,18 @@ defineExpose({ open, close: handleClose })