From 5b3bae8ebc558c9823639c5f513ddf27960d4502 Mon Sep 17 00:00:00 2001 From: hanshuaikang <1758504262@qq.com> Date: Fri, 4 Aug 2023 17:55:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Djob=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=B7=B3=E8=BD=ACid=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/static/components/atoms/job/execute_task/v1_0.js | 2 +- .../components/static/components/atoms/job/execute_task/v1_1.js | 2 +- .../components/static/components/atoms/job/execute_task/v1_2.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 58134aaa53..0fc7c110c6 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,7 +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; - let url = bk_job_host + '/' + biz_cc_id + "/api_plan/" + this.value; + let url = bk_job_host + "/api_plan/" + this.value; window.open(url, '_blank') }, validation: [ diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js index 2abcb8d670..91b9f152a1 100644 --- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js +++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_1.js @@ -67,7 +67,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 + '/' + biz_cc_id + "/api_plan/" + this.value; + let url = bk_job_host + "/api_plan/" + this.value; window.open(url, '_blank') }, validation: [ diff --git a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js index 4d9af1cb84..2094a06367 100644 --- a/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js +++ b/pipeline_plugins/components/static/components/atoms/job/execute_task/v1_2.js @@ -67,7 +67,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 + '/' + biz_cc_id + "/api_plan/" + this.value; + let url = bk_job_host + "/api_plan/" + this.value; window.open(url, '_blank') }, validation: [ From 855884670670a53d75ef06ea804bd2b9dcd9abe7 Mon Sep 17 00:00:00 2001 From: hanshuaikang <1758504262@qq.com> Date: Tue, 15 Aug 2023 18:09:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Djob=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=96=B9=E6=A1=88=20=E9=BB=98=E8=AE=A4=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=B7=B3=E8=BD=AC=E8=BF=9E=E6=8E=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/static/components/atoms/job/job_execute_task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js b/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js index 8b4876a9c6..0df336b1a9 100644 --- a/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js +++ b/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js @@ -66,7 +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; - let url = bk_job_host + '/' + biz_cc_id + "/api_plan/" + this.value; + let url = bk_job_host + "/api_plan/" + this.value; window.open(url, '_blank') }, validation: [ From a1f8c76297585bdffcbde273ffa00e9e90ca5f1b Mon Sep 17 00:00:00 2001 From: hanshuaikang <1758504262@qq.com> Date: Wed, 16 Aug 2023 11:24:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8Djob=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=96=B9=E6=A1=88=20=E9=BB=98=E8=AE=A4=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=B7=B3=E8=BD=AC=E8=BF=9E=E6=8E=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=A4=84=E7=90=86job=20host=20=E4=B8=8B?= =?UTF-8?q?=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/static/components/atoms/job/execute_task/v1_0.js | 1 + .../components/static/components/atoms/job/job_execute_task.js | 1 + 2 files changed, 2 insertions(+) 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') }, diff --git a/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js b/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js index 0df336b1a9..c049489e33 100644 --- a/pipeline_plugins/components/static/components/atoms/job/job_execute_task.js +++ b/pipeline_plugins/components/static/components/atoms/job/job_execute_task.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') },