From e1db9e893046f8f8e0fcc24d9b34d43db8f616f8 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sun, 23 Feb 2025 12:47:16 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E8=AF=95=E4=BF=A1=E6=81=AF=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=202.=20=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/business.ts                     |  3 +-
 src/locales/langs/zh-cn.ts                    |  2 +-
 src/typings/api.d.ts                          |  9 ++-
 src/views/retry/info/index.vue                | 18 ++---
 .../info/modules/retry-operate-drawer.vue     | 66 +++++++++----------
 src/views/retry/task/index.vue                |  6 +-
 6 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/constants/business.ts b/src/constants/business.ts
index d811474..28aa7a5 100644
--- a/src/constants/business.ts
+++ b/src/constants/business.ts
@@ -284,7 +284,8 @@ export const retryOperationReasonRecord: Record<Api.Common.RetryOperationReason,
   7: 'common.retryOperationReason.items.mannerStop',
   8: 'common.retryOperationReason.items.noRunningRetry',
   9: 'common.retryOperationReason.items.sceneClosed',
-  10: 'common.retryOperationReason.items.retryFail'
+  10: 'common.retryOperationReason.items.retryFail',
+  11: 'common.retryOperationReason.items.clientTriggerRetryStop'
 };
 export const retryOperationReasonOptions = transformRecordToNumberOption(retryOperationReasonRecord);
 
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 646294f..1126225 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -236,7 +236,7 @@ const local: App.I18n.Schema = {
         mannerStop: '手动停止',
         noRunningRetry: '当前重试非运行中',
         sceneClosed: '当前场景已关闭',
-        retryFail: '重试失败',
+        retryFail: '客户端执行重试失败',
         clientTriggerRetryStop: '客户端触发任务停止'
       }
     },
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index 2436ab1..ab0a668 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -118,8 +118,11 @@ declare namespace Api {
      */
     type OperationReason = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14;
 
-    /** 1、任务执行超时 2、无客户端节点 3、JOB已关闭 4、任务丢弃 5、任务被覆盖 6、无可执行任务项 7、任务执行期间发生非预期异常 8、手动停止 8、当前重试非运行中 9、当前场景已关闭 10、重试失败 */
-    type RetryOperationReason = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10;
+    /**
+     * 1、任务执行超时 2、无客户端节点 3、JOB已关闭 4、任务丢弃 5、任务被覆盖 6、无可执行任务项 7、任务执行期间发生非预期异常 8、手动停止 8、当前重试非运行中 9、当前场景已关闭 10、重试失败
+     * 11、客户端触发任务停止
+     */
+    type RetryOperationReason = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11;
   }
 
   /**
@@ -1249,7 +1252,7 @@ declare namespace Api {
       /** 客户端信息 */
       clientInfo: string;
       /** 失败原因 */
-      operationReason: Common.OperationReason;
+      operationReason: Common.RetryOperationReason;
     }>;
 
     /** retryLog search params */
diff --git a/src/views/retry/info/index.vue b/src/views/retry/info/index.vue
index 1318da8..2f290ad 100644
--- a/src/views/retry/info/index.vue
+++ b/src/views/retry/info/index.vue
@@ -187,14 +187,11 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
             show: row.retryStatus !== 1 && row.retryStatus !== 2,
             render: () => (
               <div class="flex-center">
-                <NPopconfirm
-                  onPositiveClick={() => handleExecute(row.groupName!, row.id! as any)}
-                  v-if="row.retryStatus !== 1 && row.retryStatus !== 2"
-                >
+                <NPopconfirm onPositiveClick={() => handleExecute(row.groupName!, row.id! as any)}>
                   {{
                     default: () => $t('common.confirmExecute'),
                     trigger: () => (
-                      <NButton type="error" text ghost size="small">
+                      <NButton type="error" quaternary size="small">
                         {$t('common.execute')}
                       </NButton>
                     )
@@ -219,7 +216,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
                   {{
                     default: () => $t('common.confirmPause'),
                     trigger: () => (
-                      <NButton type="success" text ghost size="small">
+                      <NButton type="success" quaternary size="small">
                         {$t('common.pause')}
                       </NButton>
                     )
@@ -231,7 +228,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
           {
             type: 'divider',
             key: 'd2',
-            show: row.retryStatus === 0
+            show: row.retryStatus === 3
           },
           {
             label: $t('common.pause'),
@@ -244,7 +241,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
                   {{
                     default: () => $t('common.confirmResume'),
                     trigger: () => (
-                      <NButton type="info" text ghost size="small">
+                      <NButton type="info" quaternary size="small">
                         {$t('common.resume')}
                       </NButton>
                     )
@@ -256,7 +253,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
           {
             type: 'divider',
             key: 'd2',
-            show: row.retryStatus === 0
+            show: row.retryStatus !== 1 && row.retryStatus !== 2
           },
           {
             label: $t('common.finish'),
@@ -268,7 +265,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
                   {{
                     default: () => $t('common.confirmFinish'),
                     trigger: () => (
-                      <NButton type="warning" text ghost size="small">
+                      <NButton type="warning" quaternary size="small">
                         {$t('common.finish')}
                       </NButton>
                     )
@@ -277,7 +274,6 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
               </div>
             )
           },
-
           {
             type: 'divider',
             key: 'd2'
diff --git a/src/views/retry/info/modules/retry-operate-drawer.vue b/src/views/retry/info/modules/retry-operate-drawer.vue
index 888ecd6..c1ed8cc 100644
--- a/src/views/retry/info/modules/retry-operate-drawer.vue
+++ b/src/views/retry/info/modules/retry-operate-drawer.vue
@@ -148,7 +148,7 @@ async function setIdempotentId() {
   const groupName = model.groupName;
   const sceneName = model.sceneName;
   const executorName = model.executorName;
-  const argsStr = model.argsStr;
+  const argsStr = JSON.stringify(argsList.value);
   const { data: idempotentId, error } = await fetchIdempotentIdGenerate({
     groupName,
     sceneName,
@@ -174,6 +174,35 @@ async function setIdempotentId() {
           :disabled="props.operateType === 'edit'"
         />
       </NFormItem>
+      <NFormItem :label="$t('page.retryTask.bizNo')" path="bizNo">
+        <NInput
+          v-model:value="model.bizNo"
+          :placeholder="$t('page.retryTask.form.bizNo')"
+          :disabled="props.operateType === 'edit'"
+        />
+      </NFormItem>
+      <NFormItem :label="$t('page.retry.executorName')" path="executorName">
+        <NInput
+          v-model:value="model.executorName"
+          :placeholder="$t('page.retry.form.executorName')"
+          :disabled="props.operateType === 'edit'"
+        />
+      </NFormItem>
+      <NFormItem :label="$t('page.retry.argsStr')" path="argsStr">
+        <NDynamicInput v-model:value="argsList" :on-create="() => ''">
+          <template #default="{ index }">
+            <NFormItem
+              class="w-full"
+              ignore-path-change
+              :show-label="false"
+              :show-feedback="false"
+              :path="`argsStr[${index}]`"
+            >
+              <CodeMirror v-model="argsList[index]" lang="json" :placeholder="$t('page.retry.argsStr')" />
+            </NFormItem>
+          </template>
+        </NDynamicInput>
+      </NFormItem>
       <NFormItem :label="$t('page.retryTask.idempotentId')" path="idempotentId">
         <NInputGroup>
           <NInput
@@ -187,43 +216,14 @@ async function setIdempotentId() {
                 <icon-clarity:thin-client-solid class="text-icon" />
               </NButton>
             </template>
-            {{ $t('page.retryTask.generateIdempotentId') }}
+            {{ $t('page.retry.generateIdempotentId') }}
           </NTooltip>
         </NInputGroup>
       </NFormItem>
-      <NFormItem :label="$t('page.retryTask.bizNo')" path="bizNo">
-        <NInput
-          v-model:value="model.bizNo"
-          :placeholder="$t('page.retryTask.form.bizNo')"
-          :disabled="props.operateType === 'edit'"
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.retryTask.executorName')" path="executorName">
-        <NInput
-          v-model:value="model.executorName"
-          :placeholder="$t('page.retryTask.form.executorName')"
-          :disabled="props.operateType === 'edit'"
-        />
-      </NFormItem>
-      <NFormItem :label="$t('page.retryTask.argsStr')" path="argsStr">
-        <NDynamicInput v-model:value="argsList" :on-create="() => ''">
-          <template #default="{ index }">
-            <NFormItem
-              class="w-full"
-              ignore-path-change
-              :show-label="false"
-              :show-feedback="false"
-              :path="`argsStr[${index}]`"
-            >
-              <CodeMirror v-model="argsList[index]" lang="json" :placeholder="$t('page.jobTask.form.argsStr')" />
-            </NFormItem>
-          </template>
-        </NDynamicInput>
-      </NFormItem>
-      <NFormItem :label="$t('page.retryTask.retryStatus')" path="retryStatus">
+      <NFormItem :label="$t('page.retry.retryStatus')" path="retryStatus">
         <NSelect
           v-model:value="model.retryStatus"
-          :placeholder="$t('page.retryTask.form.retryStatus')"
+          :placeholder="$t('page.retry.form.retryStatus')"
           :options="translateOptions(retryStatusTypeOptions)"
         />
       </NFormItem>
diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue
index b9f1711..8b01aae 100644
--- a/src/views/retry/task/index.vue
+++ b/src/views/retry/task/index.vue
@@ -12,7 +12,7 @@ import {
 import { $t } from '@/locales';
 import { useAppStore } from '@/store/modules/app';
 import { useTable, useTableOperate } from '@/hooks/common/table';
-import { operationReasonRecord, retryTaskStatusTypeRecord, retryTaskTypeRecord } from '@/constants/business';
+import { retryOperationReasonRecord, retryTaskStatusTypeRecord, retryTaskTypeRecord } from '@/constants/business';
 import { monthRangeISO8601, tagColor } from '@/utils/common';
 import SvgIcon from '@/components/custom/svg-icon.vue';
 import RetryLogSearch from './modules/retry-task-search.vue';
@@ -142,12 +142,12 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       key: 'operationReason',
       title: $t('page.retryTask.operationReason'),
       align: 'center',
-      width: 120,
+      width: 240,
       render: row => {
         if (row.operationReason === null) {
           return null;
         }
-        const label = $t(operationReasonRecord[row.operationReason!]);
+        const label = $t(retryOperationReasonRecord[row.operationReason!]);
 
         return <NTag type={tagColor(row.operationReason!)}>{label}</NTag>;
       }