From c53fe5ac4a2ecbc113f7b32a517cd2e0d2c2a07a Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 27 Nov 2020 17:57:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E7=9A=84=E5=9C=BA=E6=99=AF=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/scenario/Scenario.java            |  1 +
 .../components/api/test/ApiTestConfig.vue     |  6 +++++-
 .../api/test/components/ApiScenarioConfig.vue | 20 ++++++++++++++-----
 .../components/request/ApiRequestConfig.vue   |  7 +++++--
 .../api/test/model/ScenarioModel.js           | 11 +++++++++-
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java b/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
index e245cbdc09..20bc993991 100644
--- a/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/scenario/Scenario.java
@@ -21,4 +21,5 @@ public class Scenario {
     private TCPConfig tcpConfig;
     private List<DatabaseConfig> databaseConfigs;
     private Boolean enable;
+    private Boolean referenceEnable;
 }
diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue
index b20dd09439..504b3f3d38 100644
--- a/frontend/src/business/components/api/test/ApiTestConfig.vue
+++ b/frontend/src/business/components/api/test/ApiTestConfig.vue
@@ -171,7 +171,11 @@ export default {
           let scenarios = [];
           this.test.scenarioDefinition.forEach(scenario => {
             if (scenario.isReference()) {
-              if (scenarioMap[scenario.id]) scenarios.push(scenarioMap[scenario.id]);
+              if (scenarioMap[scenario.id]) {
+                let item = scenarioMap[scenario.id];
+                item.referenceEnable = scenario.referenceEnable;
+                scenarios.push(item);
+              }
             } else {
               scenarios.push(scenario);
             }
diff --git a/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue b/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
index 98f388dfc0..cff3eefaa8 100644
--- a/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
@@ -5,7 +5,7 @@
         <ms-api-collapse v-model="activeName" @change="handleChange">
           <draggable :list="scenarios" group="Scenario" class="scenario-draggable" ghost-class="scenario-ghost">
             <ms-api-collapse-item v-for="(scenario, index) in scenarios" :key="index"
-                                  :title="scenario.name" :name="index" :class="{'disable-scenario': !scenario.enable}">
+                                  :title="scenario.name" :name="index" :class="{'disable-scenario': !scenario.isEnable()}">
               <template slot="title">
                 <div class="scenario-name">
                   <el-tag type="info" size="small" v-if="scenario.isReference()">{{
@@ -26,11 +26,11 @@
                     <el-dropdown-item :disabled="isReadOnly" :command="{type:'delete', index:index}">
                       {{ $t('api_test.scenario.delete') }}
                     </el-dropdown-item>
-                    <el-dropdown-item v-if="scenario.enable" :disabled="isReadOnly"
+                    <el-dropdown-item v-if="scenario.isEnable()" :disabled="isReadOnly"
                                       :command="{type:'disable', index:index}">
                       {{ $t('api_test.scenario.disable') }}
                     </el-dropdown-item>
-                    <el-dropdown-item v-if="!scenario.enable" :disabled="isReadOnly"
+                    <el-dropdown-item v-if="!scenario.isEnable()" :disabled="isReadOnly"
                                       :command="{type:'enable', index:index}">
                       {{ $t('api_test.scenario.enable') }}
                     </el-dropdown-item>
@@ -156,10 +156,20 @@ export default {
       }
     },
     disableScenario(index) {
-      this.scenarios[index].enable = false;
+      let scenario = this.scenarios[index];
+      if (scenario.isReference()) {
+        scenario.referenceEnable = false;
+      } else {
+        scenario.enable = false;
+      }
     },
     enableScenario(index) {
-      this.scenarios[index].enable = true;
+      let scenario = this.scenarios[index];
+      if (scenario.isReference()) {
+        scenario.referenceEnable = true;
+      } else {
+        scenario.enable = true;
+      }
     },
     handleChange(index) {
       this.select(this.scenarios[index]);
diff --git a/frontend/src/business/components/api/test/components/request/ApiRequestConfig.vue b/frontend/src/business/components/api/test/components/request/ApiRequestConfig.vue
index 1c8cc4f4ee..81f3eb0d7b 100644
--- a/frontend/src/business/components/api/test/components/request/ApiRequestConfig.vue
+++ b/frontend/src/business/components/api/test/components/request/ApiRequestConfig.vue
@@ -3,7 +3,7 @@
     <draggable :list="this.scenario.requests" group="Request" class="request-draggable" ghost-class="request-ghost"
                :disabled="isReference">
       <div class="request-item" v-for="(request, index) in this.scenario.requests" :key="index" @click="select(request)"
-           :class="{'selected': isSelected(request), 'disable-request': !request.enable || !scenario.enable}">
+           :class="{'selected': isSelected(request), 'disable-request': isEnable(request)}">
         <ms-condition-label :request="request"/>
         <el-row type="flex" align="middle">
           <div class="request-type">
@@ -180,7 +180,10 @@ export default {
       request.dubboConfig = this.scenario.dubboConfig;
       this.selected = request;
       this.$emit("select", request, this.scenario);
-    }
+    },
+    isEnable(request) {
+      return !request.enable || !this.scenario.isEnable();
+    },
   },
 
   created() {
diff --git a/frontend/src/business/components/api/test/model/ScenarioModel.js b/frontend/src/business/components/api/test/model/ScenarioModel.js
index 883d3d9396..031a84759d 100644
--- a/frontend/src/business/components/api/test/model/ScenarioModel.js
+++ b/frontend/src/business/components/api/test/model/ScenarioModel.js
@@ -230,6 +230,7 @@ export class Scenario extends BaseConfig {
     this.databaseConfigs = [];
     this.tcpConfig = undefined;
     this.assertions = undefined;
+    this.referenceEnable = undefined;
 
     this.set(options);
     this.sets({
@@ -271,6 +272,14 @@ export class Scenario extends BaseConfig {
   isReference() {
     return this.id.indexOf("#") !== -1
   }
+
+  isEnable() {
+    if (this.isReference()) {
+      return this.referenceEnable;
+    } else {
+      return this.enable;
+    }
+  }
 }
 
 class DubboConfig extends BaseConfig {
@@ -1144,7 +1153,7 @@ class JMXGenerator {
   addScenarios(testPlan, testId, scenarios) {
     scenarios.forEach(s => {
 
-      if (s.enable) {
+      if (s.isEnable()) {
         let scenario = s.clone();
 
         let threadGroup = new ThreadGroup(scenario.name || "");