From ed7857c632ea8ca03862fe0680a6218624c675df Mon Sep 17 00:00:00 2001
From: vhwweng <1010382269@qq.com>
Date: Fri, 23 Jul 2021 14:30:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E9=AB=98=E7=BA=A7=E7=89=B9=E6=80=A7=EF=BC=9A=E5=8D=B3?=
 =?UTF-8?q?=E4=BD=BF=E5=89=8D=E9=9D=A2=E6=9C=89=E6=8F=92=E4=BB=B6=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E5=A4=B1=E8=B4=A5=E4=B9=9F=E8=BF=90=E8=A1=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=B3=E4=BD=BF=E8=A2=AB=E5=8F=96=E6=B6=88=E4=B9=9F=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=20issue=20#1156?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/common/optionConfigMixin.js             | 4 ++++
 src/frontend/locale/pipeline/en-US.json                       | 1 +
 src/frontend/locale/pipeline/zh-CN.json                       | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/frontend/devops-pipeline/src/store/modules/common/optionConfigMixin.js b/src/frontend/devops-pipeline/src/store/modules/common/optionConfigMixin.js
index a869bfa0988..de0b88a8e2f 100755
--- a/src/frontend/devops-pipeline/src/store/modules/common/optionConfigMixin.js
+++ b/src/frontend/devops-pipeline/src/store/modules/common/optionConfigMixin.js
@@ -140,6 +140,10 @@ const optionConfigMixin = {
                             id: 'PRE_TASK_FAILED_BUT_CANCEL',
                             name: this.$t('storeMap.atomEvenFail')
                         },
+                        {
+                            id: 'PRE_TASK_FAILED_EVEN_CANCEL',
+                            name: this.$t('storeMap.atomEvenCancel')
+                        },
                         {
                             id: 'PRE_TASK_FAILED_ONLY',
                             name: this.$t('storeMap.atomOnlyFail')
diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json
index a3b2bf41775..7b691d3b3cc 100644
--- a/src/frontend/locale/pipeline/en-US.json
+++ b/src/frontend/locale/pipeline/en-US.json
@@ -863,6 +863,7 @@
         "atomRunCondition": "Run this task",
         "atomPreSuc": "Run when all pre-plugins run successfully (including continue when failed)",
         "atomEvenFail": "Even if a previous task has failed, unless the build was canceled",
+        "atomEvenCancel": "Run even if a previous plugin failed, and run even if it was cancelled",
         "atomOnlyFail": "Only when a previous task has failed",
         "varMatch": "run it when all the custom variables are macthed",
         "varNotMatch": "Don‘t run it when all the custom variables are macthed",
diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json
index 00a1da21005..14fb81dd09a 100644
--- a/src/frontend/locale/pipeline/zh-CN.json
+++ b/src/frontend/locale/pipeline/zh-CN.json
@@ -866,6 +866,7 @@
         "atomRunCondition": "何时运行本插件",
         "atomPreSuc": "所有前置插件运行成功时运行（包括失败时继续）",
         "atomEvenFail": "即使前面有插件运行失败也运行，除非被取消才不运行",
+        "atomEvenCancel": "即使前面有插件运行失败也运行，即使被取消也运行",
         "atomOnlyFail": "只有前面有插件运行失败时才运行",
         "varMatch": "自定义变量全部满足时才运行",
         "varNotMatch": "自定义变量全部满足时不运行",