fix(sj_1.0.0_beta3): 重试任务bug修改

1. 重试任务-重置按钮无效
2. 重试任务-删除重试日志、死信任务新增按钮
This commit is contained in:
wodeyangzipingpingwuqi 2024-05-28 11:00:12 +08:00
parent 1049a082c2
commit 40c289b725
5 changed files with 14 additions and 34 deletions

View File

@ -27,7 +27,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
apiFn: fetchGetRetryDeadLetterPageList,
apiParams: {
page: 1,
size: 10
size: 10,
groupName: null,
sceneName: null
// if you want to use the searchParams in Form, you need to define the following properties, and the value is null
// the value can not be undefined, otherwise the property in Form will not be reactive
},
@ -191,6 +193,7 @@ async function rollback(row: Api.RetryDeadLetter.DeadLetter) {
v-model:columns="columnChecks"
:disabled-delete="checkedRowKeys.length === 0"
:loading="loading"
:show-add="false"
@add="handleAdd"
@delete="handleBatchDelete"
@refresh="getData"

View File

@ -1,8 +1,9 @@
<script setup lang="ts">
import { onMounted, ref } from 'vue';
import { $t } from '@/locales';
import { translateOptions2 } from '@/utils/common';
import { fetchGetAllGroupNameList, fetchGetRetrySceneList } from '@/service/api';
import { fetchGetAllGroupNameList } from '@/service/api';
import SelectGroup from '@/components/common/select-group.vue';
import SelectScene from '@/components/common/select-scene.vue';
defineOptions({
name: 'RetryDeadLetterSearch'
@ -19,24 +20,12 @@ const model = defineModel<Api.RetryDeadLetter.RetryDeadLetterSearchParams>('mode
/** 组列表 */
const groupNameList = ref<string[]>([]);
/** 场景列表 */
const sceneNameList = ref<string[]>([]);
async function getGroupNameList() {
const res = await fetchGetAllGroupNameList();
groupNameList.value = res.data as string[];
}
async function handleGroupNameUpdate(groupName: string) {
if (groupName) {
const res = await fetchGetRetrySceneList({ groupName });
sceneNameList.value = res.data!.map((scene: Api.RetryScene.Scene) => scene.sceneName);
} else {
model.value.sceneName = '';
sceneNameList.value = [];
}
}
function reset() {
emit('reset');
}
@ -52,24 +41,11 @@ onMounted(() => {
<template>
<SearchForm :model="model" @search="search" @reset="reset">
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryDeadLetter.groupName')" path="groupName" class="py-1 pr-24px">
<NSelect
v-model:value="model.groupName"
:placeholder="$t('page.retryDeadLetter.form.groupName')"
:options="translateOptions2(groupNameList)"
clearable
filterable
@update:value="handleGroupNameUpdate"
/>
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
<SelectGroup v-model:value="model.groupName" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryDeadLetter.sceneName')" path="sceneName" class="py-1 pr-24px">
<NSelect
v-model:value="model.sceneName"
:placeholder="$t('page.retryDeadLetter.form.sceneName')"
:options="translateOptions2(sceneNameList)"
clearable
/>
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
<SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />
</NFormItemGi>
</SearchForm>
</template>

View File

@ -184,6 +184,7 @@ async function loadRetryInfo(row: Api.RetryLog.RetryLog) {
v-model:columns="columnChecks"
:disabled-delete="checkedRowKeys.length === 0"
:loading="loading"
:show-add="false"
@delete="handleBatchDelete"
@refresh="getData"
/>

View File

@ -28,7 +28,7 @@ function search() {
<template>
<SearchForm :model="model" @search="search" @reset="reset">
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.groupName')" path="groupName" class="pr-24px">
<SelectGroup v-model="model.groupName" />
<SelectGroup v-model:value="model.groupName" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryLog.sceneName')" path="sceneName" class="pr-24px">
<SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />

View File

@ -28,7 +28,7 @@ function search() {
<template>
<SearchForm :model="model" @search="search" @reset="reset">
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.groupName')" path="groupName" class="pr-24px">
<SelectGroup v-model="model.groupName" />
<SelectGroup v-model:value="model.groupName" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" :label="$t('page.retryScene.sceneName')" path="sceneName" class="pr-24px">
<SelectScene v-model:value="model.sceneName" :group-name="model.groupName as string" />