diff --git a/env.py b/env.py index 59a977e857..bacb13b3b6 100644 --- a/env.py +++ b/env.py @@ -98,6 +98,7 @@ ENABLE_SWAGGER_UI = os.getenv("BKAPP_ENABLE_SWAGGER_UI", False) ENABLE_IPV6 = False if os.getenv("BKAPP_ENABLE_IPV6") is None else True +ENABLE_GSE_V2 = int(os.getenv("BKAPP_ENABLE_GSE_V2", 0)) == 1 # 流程最高嵌套层数 TEMPLATE_MAX_RECURSIVE_NUMBER = int(os.getenv("BKAPP_TEMPLATE_MAX_RECURSIVE_NUMBER", 200)) diff --git a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue index 56395a6b75..759e09eeab 100644 --- a/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue +++ b/frontend/desktop/src/pages/task/TaskCreate/TaskSelectNode.vue @@ -42,11 +42,11 @@ diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue index 576a4bb4d3..ffeb8564ec 100644 --- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue +++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue @@ -1701,7 +1701,7 @@ ordered.push(treeItem) newOrdered = null } - + if (conditions.length) { conditions.forEach(item => { item.style = `margin-left: ${item.parentId ? 16 : marginLeft + 33}px` @@ -1754,7 +1754,7 @@ }) return result }, - + getNodeSourceMaps (pipelineData) { const sourceMap = pipelineData.line.reduce((acc, cur) => { const { source, target } = cur diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js index 0fc7c110c6..4142a6f4b1 100644 --- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js +++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_0.js @@ -66,6 +66,7 @@ } let biz_cc_id = this.get_parent && this.get_parent().get_child('biz_cc_id')._get_value(); let bk_job_host = window.BK_JOB_HOST; + if (bk_job_host.charAt(bk_job_host.length - 1) == "/") bk_job_host = bk_job_host.substr(0, bk_job_host.length - 1); let url = bk_job_host + "/api_plan/" + this.value; window.open(url, '_blank') },