diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 283b7b0..acc5790 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -44,17 +44,24 @@ const local: App.I18n.Schema = { success: 'Success', fail: 'Fail', stop: 'Stop', + execute: 'Execute', + resume: 'Resume', + pause: 'Pause', + finish: 'Finish', running: 'Running', - confirmStop: 'Are you sure you want to stop?', + confirmExecute: 'Are you sure you want to execute?', + confirmResume: 'Are you sure you want to resume?', + confirmPause: 'Are you sure you want to pause?', + confirmFinish: 'Are you sure you want to finishe?', yesOrNo: { yes: 'Yes', no: 'No' }, systemTaskType: { - retry: '重试任务', - callback: '回调任务', - job: '定时任务', - workflow: '工作流' + retry: 'Retry task', + callback: 'Callback task', + job: 'Job task', + workflow: 'Workflow' } }, request: { diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index d9d410a..91678cd 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -44,8 +44,15 @@ const local: App.I18n.Schema = { success: '成功', fail: '失败', stop: '停止', + execute: '执行', + resume: '恢复', + pause: '暂停', + finish: '完成', running: '运行中', - confirmStop: '确认停止吗?', + confirmExecute: '确认执行吗?', + confirmResume: '确认恢复吗?', + confirmPause: '确认暂停吗?', + confirmFinish: '确认完成吗?', yesOrNo: { yes: '是', no: '否' diff --git a/src/service/api/retry-task.ts b/src/service/api/retry-task.ts index 967941e..dc7f8af 100644 --- a/src/service/api/retry-task.ts +++ b/src/service/api/retry-task.ts @@ -44,3 +44,21 @@ export function fetchUpdateRetryTaskStatus(data: Api.RetryTask.RetryTaskUpdateSt data }); } + +/** manual execute retryTask */ +export function fetchExecuteRetryTask(data: Api.RetryTask.ManualTriggerTaskRequestVO) { + return request({ + url: '/retry-task/manual/trigger/retry/task', + method: 'post', + data + }); +} + +/** batch delete retryTask */ +export function fetchBatchDeleteRetryTask(data: Api.RetryTask.BatchDeleteRetryTaskVO) { + return request({ + url: '/retry-task/batch', + method: 'delete', + data + }); +} diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index e3202f0..c1c7574 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -669,6 +669,16 @@ declare namespace Api { retryStatus: RetryStatusType; }; + type ManualTriggerTaskRequestVO = { + groupName: string; + uniqueIds: string[]; + }; + + type BatchDeleteRetryTaskVO = { + groupName: string; + ids: string[]; + }; + /** RetryTask search params */ type RetryTaskSearchParams = CommonType.RecordNullable< Pick & @@ -703,7 +713,7 @@ declare namespace Api { /** 最大重试次数 */ maxRetryCount: number; /** 间隔时间 */ - triggerInterval: string; + triggerInterval: number; /** 调用链超时时间 */ deadlineRequest: number; /** 超时时间 */ diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 6d89b9a..5e57ce7 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -290,8 +290,15 @@ declare namespace App { success: string; fail: string; stop: string; + execute: string; + resume: string; + pause: string; + finish: string; running: string; - confirmStop: string; + confirmExecute: string; + confirmResume: string; + confirmPause: string; + confirmFinish: string; yesOrNo: { yes: string; no: string; diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue index b1b197b..e009e2f 100644 --- a/src/views/retry/scene/modules/scene-operate-drawer.vue +++ b/src/views/retry/scene/modules/scene-operate-drawer.vue @@ -75,7 +75,7 @@ function createDefaultModel(): Model { sceneStatus: 1, backOff: 2, maxRetryCount: 1, - triggerInterval: '60', + triggerInterval: 60, deadlineRequest: 60000, executorTimeout: 60, description: '', diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue index ac4120d..92cee2d 100644 --- a/src/views/retry/task/index.vue +++ b/src/views/retry/task/index.vue @@ -1,7 +1,12 @@ @@ -208,6 +288,7 @@ async function handleStop(id: number, groupName: string) { :loading="loading" @add="handleAdd" @batch-add="handleBatchAdd" + @delete="handleBatchDelete" @refresh="getData" />