From 4f674176d07f0e38321114f4a5f5c0769d194c9d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 21 Jun 2021 11:40:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4):?=
 =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=20=E5=90=AF=E7=94=A8/?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=20=E5=9B=BE=E6=A0=87=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/EditApiScenario.vue    | 12 ++++++------
 .../scenario/maximize/MaximizeScenario.vue         | 14 ++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index dee174d42a..74d8b58ea4 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -166,11 +166,11 @@
               <el-tooltip :content="$t('api_test.automation.close_expansion')" placement="top" effect="light">
                 <i class="el-icon-remove-outline ms-open-btn" size="mini" v-prevent-re-click @click="closeExpansion"/>
               </el-tooltip>
-              <el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-if="!stepEnable">
-                <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" v-prevent-re-click @click="enableAll"/>
+              <el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-if="!stepEnable">
+                <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" v-prevent-re-click @click="enableAll"/>
               </el-tooltip>
-              <el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-else>
-                <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" v-prevent-re-click @click="disableAll"/>
+              <el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-else>
+                <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" v-prevent-re-click @click="disableAll"/>
               </el-tooltip>
 
               <el-tree node-key="resourceId" :props="props" :data="scenarioDefinition" class="ms-tree"
@@ -256,7 +256,7 @@
         </template>
 
         <maximize-scenario :scenario-definition="scenarioDefinition" :envMap="projectEnvMap" :moduleOptions="moduleOptions"
-                           :currentScenario="currentScenario" :type="type" ref="maximizeScenario" @openScenario="openScenario"/>
+                           :currentScenario="currentScenario" :type="type" :stepReEnable="stepEnable" ref="maximizeScenario" @openScenario="openScenario"/>
       </ms-drawer>
       <ms-change-history ref="changeHistory"/>
 
@@ -389,7 +389,7 @@ export default {
       drawer: false,
       isFullUrl: true,
       expandedStatus: false,
-      stepEnable: false,
+      stepEnable: true,
       envResult: {
         loading: false
       }
diff --git a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
index 98999c7f44..bf3eeb7cfa 100644
--- a/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/maximize/MaximizeScenario.vue
@@ -11,11 +11,11 @@
           <el-tooltip :content="$t('api_test.automation.close_expansion')" placement="top" effect="light">
             <i class="el-icon-remove-outline ms-open-btn" size="mini" @click="closeExpansion"/>
           </el-tooltip>
-          <el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-if="!stepEnable">
-            <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" @click="enableAll"/>
+          <el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-if="!stepEnable">
+            <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" @click="enableAll"/>
           </el-tooltip>
-          <el-tooltip :content="$t('api_test.scenario.disable')" placement="top" effect="light" v-else>
-            <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-off']" @click="disableAll"/>
+          <el-tooltip :content="$t('api_test.scenario.enable')" placement="top" effect="light" v-else>
+            <font-awesome-icon class="ms-open-btn" :icon="['fas', 'toggle-on']" @click="disableAll"/>
           </el-tooltip>
           <el-tree node-key="resourceId"
                    :props="props"
@@ -175,6 +175,7 @@ export default {
     moduleOptions: Array,
     currentScenario: {},
     type: String,
+    stepReEnable: Boolean,
     scenarioDefinition: Array,
     envMap: Map,
   },
@@ -240,7 +241,7 @@ export default {
       projectList: [],
       debugResult: new Map,
       expandedStatus: false,
-      stepEnable: false,
+      stepEnable: true,
     }
   },
   created() {
@@ -249,6 +250,7 @@ export default {
     }
     this.operatingElements = ELEMENTS.get("ALL");
     this.projectEnvMap = this.envMap;
+    this.stepEnable = this.stepReEnable;
   },
   watch: {
     envMap() {
@@ -969,7 +971,7 @@ export default {
             }
           }
         });
-      }else{
+      } else {
         this.expandedNode = [];
         this.expandedStatus = true;
         this.shrinkTreeNode();