From 530ecf79c7f8902b87ab4e00b452cc9e453f758f Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Wed, 26 Jun 2024 18:05:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta2):=20=E9=98=BB=E5=A1=9E?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=B7=BB=E5=8A=A0=E6=81=A2=E5=A4=8D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/business.ts    | 3 ++-
 src/locales/langs/en-us.ts   | 3 ++-
 src/locales/langs/zh-cn.ts   | 3 ++-
 src/typings/api.d.ts         | 4 ++--
 src/typings/app.d.ts         | 1 +
 src/views/job/task/index.vue | 3 ++-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/constants/business.ts b/src/constants/business.ts
index 88df6d9..9edfead 100644
--- a/src/constants/business.ts
+++ b/src/constants/business.ts
@@ -120,7 +120,8 @@ export const routeKeyRecordOptions = transformRecordToNumberOption(routeKeyRecor
 export const blockStrategyRecord: Record<Api.Common.BlockStrategy, App.I18n.I18nKey> = {
   1: 'common.blockStrategy.items.discard',
   2: 'common.blockStrategy.items.overwrite',
-  3: 'common.blockStrategy.items.parallel'
+  3: 'common.blockStrategy.items.parallel',
+  4: 'common.blockStrategy.items.recovery'
 };
 export const blockStrategyRecordOptions = transformRecordToNumberOption(blockStrategyRecord);
 
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 1fcb3a8..704dcd9 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -115,7 +115,8 @@ const local: App.I18n.Schema = {
       items: {
         discard: 'Discard',
         overwrite: 'Overwrite',
-        parallel: 'Parallel'
+        parallel: 'Parallel',
+        recovery: 'Recovery'
       }
     },
     failStrategy: {
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 048f3be..8bbcc5e 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -115,7 +115,8 @@ const local: App.I18n.Schema = {
       items: {
         discard: '丢弃',
         overwrite: '覆盖',
-        parallel: '并行'
+        parallel: '并行',
+        recovery: '恢复'
       }
     },
     failStrategy: {
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
index e752f81..dbd7e8c 100644
--- a/src/typings/api.d.ts
+++ b/src/typings/api.d.ts
@@ -73,8 +73,8 @@ declare namespace Api {
     /** 1: 一致性Hash 2: 随机 3: LRU 4: 轮询 */
     type RouteKey = 1 | 2 | 3 | 4;
 
-    /** 阻塞策略 1:丢弃 2:覆盖 3:并行 */
-    type BlockStrategy = 1 | 2 | 3;
+    /** 阻塞策略 1:丢弃 2:覆盖 3:并行 4:恢复 */
+    type BlockStrategy = 1 | 2 | 3 | 4;
 
     /** 失败策略 1:跳过 2:阻塞 */
     type FailStrategy = 1 | 2;
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 42508a8..40c174b 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -368,6 +368,7 @@ declare namespace App {
             discard: string;
             overwrite: string;
             parallel: string;
+            recovery: string;
           };
         };
         failStrategy: {
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 0cfe52b..d597d4b 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -153,7 +153,8 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
         const tagMap: Record<Api.Common.BlockStrategy, NaiveUI.ThemeColor> = {
           1: 'info',
           2: 'success',
-          3: 'error'
+          3: 'error',
+          4: 'warning'
         };
         const label = $t(blockStrategyRecord[row.blockStrategy!]);