diff --git a/src/service/api/retry-task.ts b/src/service/api/retry-task.ts index dc7f8af..1bcc2e3 100644 --- a/src/service/api/retry-task.ts +++ b/src/service/api/retry-task.ts @@ -62,3 +62,12 @@ export function fetchBatchDeleteRetryTask(data: Api.RetryTask.BatchDeleteRetryTa data }); } + +/** generate retryTask idempotent id */ +export function fetchIdempotentIdGenerate(data: Api.RetryTask.GenerateRetryIdempotentIdVO) { + return request({ + url: '/retry-task/generate/idempotent-id', + method: 'post', + data + }); +} diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index c6b275a..792d773 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -679,6 +679,17 @@ declare namespace Api { ids: string[]; }; + type GenerateRetryIdempotentIdVO = { + /** 组名称 */ + groupName: string; + /** 场景名称 */ + sceneName: string; + /** 执行参数 */ + argsStr: string; + /** 执行器名称 */ + executorName: string; + }; + /** RetryTask search params */ type RetryTaskSearchParams = CommonType.RecordNullable< Pick & diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue index 92cee2d..dc0599e 100644 --- a/src/views/retry/task/index.vue +++ b/src/views/retry/task/index.vue @@ -129,9 +129,6 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP width: 260, render: row => (
- edit(row.id!)}> - {$t('common.edit')} - handleDelete(row.groupName!, row.id!)}> {{ default: () => $t('common.confirmDelete'), @@ -211,9 +208,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP const { drawerVisible, operateType, - editingData, handleAdd, - handleEdit, checkedRowKeys, onBatchDeleted, onDeleted @@ -239,10 +234,6 @@ async function handleBatchDelete() { onBatchDeleted(); } -function edit(id: string) { - handleEdit(id); -} - function handleBatchAdd() { openBatchAddDrawer(); } @@ -304,13 +295,8 @@ async function updateRetryTaskStatus(id: number, groupName: string, retryStatus: :pagination="mobilePagination" class="sm:h-full" /> - - + +
diff --git a/src/views/retry/task/modules/retry-task-operate-drawer.vue b/src/views/retry/task/modules/retry-task-operate-drawer.vue index a349d62..1db1291 100644 --- a/src/views/retry/task/modules/retry-task-operate-drawer.vue +++ b/src/views/retry/task/modules/retry-task-operate-drawer.vue @@ -3,7 +3,12 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'; import { useFormRules, useNaiveForm } from '@/hooks/common/form'; import OperateDrawer from '@/components/common/operate-drawer.vue'; import { $t } from '@/locales'; -import { fetchAddRetryTask, fetchGetAllGroupNameList, fetchGetRetrySceneList } from '@/service/api'; +import { + fetchAddRetryTask, + fetchGetAllGroupNameList, + fetchGetRetrySceneList, + fetchIdempotentIdGenerate +} from '@/service/api'; import { translateOptions, translateOptions2 } from '@/utils/common'; import { retryTaskStatusTypeOptions } from '@/constants/business'; @@ -113,12 +118,6 @@ async function handleSubmit() { window.$message?.success($t('common.addSuccess')); } - // if (props.operateType === 'edit') { - // const { ... } = model; - // fetchEditRetryTask({ ... }); - // window.$message?.success($t('common.updateSuccess')); - // } - closeDrawer(); emit('submitted'); } @@ -145,8 +144,20 @@ async function handleGroupNameUpdate(groupName: string) { } } -function setIdempotentId() { - model.idempotentId = 'test'; +async function setIdempotentId() { + const groupName = model.groupName; + const sceneName = model.sceneName; + const executorName = model.executorName; + const argsStr = model.argsStr; + const { data: idempotentId, error } = await fetchIdempotentIdGenerate({ + groupName, + sceneName, + executorName, + argsStr + }); + if (!error) { + model.idempotentId = idempotentId; + } } onMounted(() => { diff --git a/src/views/retry/task/modules/retry-task-search.vue b/src/views/retry/task/modules/retry-task-search.vue index 886b742..5c07941 100644 --- a/src/views/retry/task/modules/retry-task-search.vue +++ b/src/views/retry/task/modules/retry-task-search.vue @@ -61,8 +61,8 @@ onMounted(() => { v-model:value="model.groupName" :placeholder="$t('page.retryTask.form.groupName')" :options="translateOptions2(groupNameList)" - filterable clearable + filterable @update:value="handleGroupNameUpdate" />