From 75130add3e37ac4480696f819c57930322842e30 Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Sat, 23 Apr 2022 18:02:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E3=80=81=E5=8E=BB=E6=8E=89=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=8A=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                | 2 +-
 .../api/automation/scenario/component/StepExtendBtns.vue  | 8 +++++++-
 frontend/src/business/components/xpack                    | 2 +-
 frontend/src/common/js/default-table-header.js            | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index bdfba7d9f6..b9bbc67a4e 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit bdfba7d9f60a4a0fc6b31441c6bc6dbbfbf1b7ac
+Subproject commit b9bbc67a4e477bb0f6a169c27f8e9ea8060c1e1d
diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
index 19a7fd400d..d0470c88ec 100644
--- a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
@@ -32,7 +32,7 @@
       :title="$t('commons.reference_settings')"
       :visible.sync="dialogVisible" width="400px">
       <ul>
-        <el-tooltip :content="$t('commons.enable_scene_info')" placement="top">-->
+        <el-tooltip :content="$t('commons.enable_scene_info')" placement="top" v-if = 'showEnableScence'>
           <el-checkbox v-model="data.environmentEnable" @change="checkEnv" :disabled="data.disabled">
             {{ $t('commons.enable_scene') }}
           </el-checkbox>
@@ -62,6 +62,12 @@ export default {
         return false;
       }
     },
+    showEnableScence: {
+      type: Boolean,
+      default() {
+        return true;
+      }
+    },
     data: Object,
     environmentType: String,
     environmentGroupId: String,
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 74a23130a1..1b855b6ac1 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 74a23130a1a04e3cd1db0fd4f770f083e5609bc1
+Subproject commit 1b855b6ac11b593f252b6dd013735372b38d992c
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 3bacd5e632..3465a20874 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -89,10 +89,10 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'level', key: '3', label: 'api_test.automation.case_level'},
     {id: 'status', key: '4', label: 'test_track.plan.plan_status'},
     {id: 'tags', key: '5', label: 'commons.tag'},
-    {id: 'versionId', key: 'f', label: 'project.version.name', xpack: true},
+    // {id: 'versionId', key: 'f', label: 'project.version.name', xpack: true},
     {id: 'creatorName', key: 'd', label: 'api_test.automation.creator'},
     {id: 'principalName', key: '6', label: 'api_test.definition.api_principal'},
-    {id: 'environmentMap', key: 'e', label: 'commons.environment'},
+    // {id: 'environmentMap', key: 'e', label: 'commons.environment'},
     {id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'},
     {id: 'stepTotal', key: '8', label: 'api_test.automation.step'},
     {id: 'lastResult', key: 'a', label: 'api_test.automation.last_result'},