minor: master merge to horse

TencentBlueKing · Sep 11, 2023 · 0b55c0f · 0b55c0f
2 parents 7086547 + 248e903
commit 0b55c0f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -42,11 +42,11 @@
             <component
                 :is="schemeTemplate"
                 ref="taskScheme"
-                v-show="!isPreviewMode"
                 :project_id="project_id"
                 :template_id="template_id"
                 :template-name="templateName"
-                :is-scheme-show="isSchemeShow"
+                :is-scheme-show="true"
+                :view-mode="viewMode"
                 :is-scheme-editable="viewMode !== 'appmaker'"
                 :is-preview-mode="isPreviewMode"
                 :is-common-process="isCommonProcess"
@@ -71,6 +71,7 @@
                 {{ $t('下一步') }}
             </bk-button>
             <bk-button
+                v-if="viewMode !== 'appmaker'"
                 class="preview-button"
                 data-test-id="createTask_form_togglePreview"
                 @click="togglePreviewMode(!isPreviewMode)">

diff --git 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
@@ -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')
                 },