From 5d1fcd104e4fee964b486e173499999bf1065052 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 25 Feb 2025 23:40:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=20=E9=87=8D=E8=AF=95?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/typings/api.d.ts                          |  2 ++
 .../scene/modules/scene-operate-drawer.vue    |  4 +++-
 .../task/modules/retry-task-detail-drawer.vue | 22 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index ab0a668..c2a9cd2 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -1253,6 +1253,8 @@ declare namespace Api {
       clientInfo: string;
       /** 失败原因 */
       operationReason: Common.RetryOperationReason;
+      /** 重试信息 */
+      responseVO: Api.Retry.Retry;
     }>;
 
     /** retryLog search params */
diff --git a/src/views/retry/scene/modules/scene-operate-drawer.vue b/src/views/retry/scene/modules/scene-operate-drawer.vue
index b3f2f40..e8d59f2 100644
--- a/src/views/retry/scene/modules/scene-operate-drawer.vue
+++ b/src/views/retry/scene/modules/scene-operate-drawer.vue
@@ -25,6 +25,8 @@ interface Props {
   rowData?: Api.RetryScene.Scene | null;
 }
 
+const ignoreRecovery = ref<Api.Common.BlockStrategy[]>([4]);
+
 const delayLevelDesc = ref<string>('10s');
 const callbackDelayLevelDesc = ref<string>('10s');
 
@@ -329,7 +331,7 @@ watch(
             </NGi>
             <NGi>
               <NFormItem :label="$t('page.retryScene.blockStrategy')" path="blockStrategy">
-                <BlockStrategy v-model:value="model.blockStrategy" />
+                <BlockStrategy v-model:value="model.blockStrategy" :ignore="ignoreRecovery" />
               </NFormItem>
             </NGi>
           </NGrid>
diff --git a/src/views/retry/task/modules/retry-task-detail-drawer.vue b/src/views/retry/task/modules/retry-task-detail-drawer.vue
index 3736fd5..107eb11 100644
--- a/src/views/retry/task/modules/retry-task-detail-drawer.vue
+++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { $t } from '@/locales';
 import { tagColor } from '@/utils/common';
-import { retryTaskStatusTypeRecord, retryTaskTypeRecord } from '@/constants/business';
+import { retryStatusTypeRecord, retryTaskStatusTypeRecord, retryTaskTypeRecord } from '@/constants/business';
 
 defineOptions({
   name: 'SceneDetailDrawer'
@@ -38,6 +38,26 @@ const visible = defineModel<boolean>('visible', {
           <NDescriptionsItem :label="$t('page.retryTask.taskType')" :span="1">
             <NTag :type="tagColor(rowData?.taskType!)">{{ $t(retryTaskTypeRecord[rowData?.taskType!]) }}</NTag>
           </NDescriptionsItem>
+          <NDescriptionsItem :label="$t('page.retry.retryCount')" :span="1">
+            {{ rowData?.responseVO?.retryCount }}
+          </NDescriptionsItem>
+          <NDescriptionsItem :label="$t('page.retry.retryStatus')" :span="1">
+            <NTag :type="tagColor(rowData?.responseVO?.retryStatus!)">
+              {{ $t(retryStatusTypeRecord[rowData?.responseVO?.retryStatus!]) }}
+            </NTag>
+          </NDescriptionsItem>
+          <NDescriptionsItem :label="$t('page.retry.bizNo')" :span="2">
+            {{ rowData?.responseVO?.bizNo }}
+          </NDescriptionsItem>
+          <NDescriptionsItem :label="$t('page.retry.idempotentId')" :span="2">
+            {{ rowData?.responseVO?.idempotentId }}
+          </NDescriptionsItem>
+          <NDescriptionsItem :label="$t('page.retry.executorName')" :span="2">
+            {{ rowData?.responseVO?.executorName }}
+          </NDescriptionsItem>
+          <NDescriptionsItem :label="$t('page.retry.argsStr')" :span="2">
+            {{ rowData?.responseVO?.argsStr }}
+          </NDescriptionsItem>
           <NDescriptionsItem :label="$t('common.createDt')">{{ rowData?.createDt }}</NDescriptionsItem>
         </NDescriptions>
       </NTabPane>