From 5eab49d5a936e4f209cf0d043b2e3cb857fef0a0 Mon Sep 17 00:00:00 2001 From: yiwenZhou <67539158+ywywZhou@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:12:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=8B=AC=E7=AB=8B=E5=AD=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E9=99=8D=E7=BA=A7?= =?UTF-8?q?=20&&=20master=E5=8A=9F=E8=83=BD=E8=BF=81=E7=A7=BB=20--ignore?= =?UTF-8?q?=20(#7381)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 独立子流程任务状态降级 --ignore * fix: 子任务节点重试点击报错问题修复 --ignore * fix: 子流程节点中存在第三方插件节点勾选的变量，查找对应变量配置时接口报错修复 --ignore * fix: 第三方插件执行详情输出展示问题修复 --bug=116432067 # Reviewed, transaction id: 3658 --- .../desktop/src/assets/html/index-dev.html | 10 +++ frontend/desktop/src/assets/html/index.html | 2 + .../TemplateCanvas/NodeTemplate/Subflow.vue | 32 +++++---- .../TemplateCanvas/NodeTemplate/TaskNode.vue | 2 +- .../components/NodeAction/index.vue | 14 +++- .../components/NodeExecuteInfo/index.vue | 67 +++++++++++++------ .../pages/task/TaskExecute/TaskOperation.vue | 11 ++- 7 files changed, 99 insertions(+), 39 deletions(-) diff --git a/frontend/desktop/src/assets/html/index-dev.html b/frontend/desktop/src/assets/html/index-dev.html index 3e11935f93..165d2ee244 100644 --- a/frontend/desktop/src/assets/html/index-dev.html +++ b/frontend/desktop/src/assets/html/index-dev.html @@ -13,6 +13,7 @@ var BK_DOC_URL = '' var FEEDBACK_URL = '' var USERNAME = 'admin'; + var TAM_PROJECT_ID = "" // 用户身份： 管理员 var IS_SUPERUSER = 1; // 用户身份： 职能化 @@ -38,18 +39,27 @@ var APP_CODE = 'bk_sops'; var FILE_UPLOAD_ENTRY = '/package/upload/'; var MAX_NODE_EXECUTE_TIMEOUT = 6000; + var PAAS_MAJOR_VERSION = 2 + var MEMBER_SELECTOR_DATA_HOST = '' + var BK_DOMAIN = '' + var BK_PAAS_ESB_HOST = '' + var TASK_LIST_STATUS_FILTER_DAYS = 180 // 是否开启通知中心 var ENABLE_NOTICE_CENTER = true + // 任务状态版本 + var TASK_STATUS_DISPLAY_VERSION ='v1' function getCookie(name) { var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)"); return (arr = document.cookie.match(reg)) ? unescape(arr[2]) : null; } +
+ diff --git a/frontend/desktop/src/assets/html/index.html b/frontend/desktop/src/assets/html/index.html index dedf5eb2c3..020008c1b8 100644 --- a/frontend/desktop/src/assets/html/index.html +++ b/frontend/desktop/src/assets/html/index.html @@ -55,6 +55,8 @@ // 是否开启通知中心 var ENABLE_NOTICE_CENTER = {{ENABLE_NOTICE_CENTER}} var MESSAGE_HELPER_URL = '{{MESSAGE_HELPER_URL}}' + // 任务状态版本 + var TASK_STATUS_DISPLAY_VERSION ='{{TASK_STATUS_DISPLAY_VERSION}}' function getCookie(name) { var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)"); return (arr = document.cookie.match(reg)) ? unescape(arr[2]) : null; diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue index 9695c8aa1c..8a27e15f51 100755 --- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/Subflow.vue @@ -78,18 +78,21 @@ {{ $t('跳过子流程') }} - - - {{ $t('暂停执行') }} - - - - {{ $t('继续执行') }} - - - - {{ $t('强制终止') }} - + + @@ -113,6 +116,11 @@ } } }, + data () { + return { + taskStatusDisplayVersion: window.TASK_STATUS_DISPLAY_VERSION + } + }, computed: { isOpenTooltip () { if (this.node.mode === 'execute') { diff --git a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/TaskNode.vue b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/TaskNode.vue index e83bb858d8..b7cbf8c0d0 100755 --- a/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/TaskNode.vue +++ b/frontend/desktop/src/components/common/TemplateCanvas/NodeTemplate/TaskNode.vue @@ -153,7 +153,7 @@ const { auto_retry_info: autoRetryInfo = {} } = this.node return { h: !!Object.keys(autoRetryInfo).length, - m: autoRetryInfo.m || 0, + m: autoRetryInfo.auto_retry_times || 0, c: autoRetryInfo.max_auto_retry_times || 10 } } diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeAction/index.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeAction/index.vue index 004f640b1e..0a0c330571 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeAction/index.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeAction/index.vue @@ -7,7 +7,7 @@ @click="onContinueClick"> {{ $t('继续执行') }} -