From 681a02b9527b0449c3ee07cc452e0b4a724d5a74 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 26 Nov 2021 12:33:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9F=9F=E5=90=8D=E6=A0=B9=E6=8D=AE=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   |  4 +-
 .../scenario/common/CustomizeReqInfo.vue      |  5 ++-
 .../scenario/component/ApiComponent.vue       |  5 ++-
 .../component/ApiScenarioComponent.vue        | 41 ++++++++++---------
 .../scenario/component/ComponentConfig.vue    |  7 +++-
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 3f83d27b68..a7494a148b 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -205,12 +205,14 @@
                          :project-list="projectList"
                          :env-map="projectEnvMap"
                          :env-group-id="envGroupId"
+                         :environment-type="environmentType"
                          @remove="remove"
                          @copyRow="copyRow"
                          @suggestClick="suggestClick"
                          @refReload="refReload"
                          @runScenario="runDebug"
                          @stopScenario="stop"
+                         @setDomain="setDomain"
                          @openScenario="openScenario"/>
                     </span>
               </el-tree>
@@ -528,7 +530,7 @@ export default {
     currentUser: () => {
       return getCurrentUser();
     },
-    setDomain(flag) {
+    setDomain() {
       if (this.projectEnvMap && this.projectEnvMap.size > 0) {
         let scenario = {
           id: this.currentScenario.id,
diff --git a/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue b/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue
index 24259f12a2..b4a45b1bfd 100644
--- a/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/CustomizeReqInfo.vue
@@ -9,7 +9,7 @@
         <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-model="request.url"
                   style="width: 50%" size="small" @blur="urlChange" :disabled="request.disabled">
         </el-input>
-        <el-checkbox v-if="isCustomizeReq" class="is-ref-environment" v-model="request.isRefEnvironment">
+        <el-checkbox v-if="isCustomizeReq" class="is-ref-environment" v-model="request.isRefEnvironment" @change="setDomain" :disabled="request.disabled">
           {{ $t('api_test.request.refer_to_environment') }}
         </el-checkbox>
       </div>
@@ -123,6 +123,9 @@ export default {
         this.$error(this.$t('api_test.request.url_invalid'), 2000);
       }
     },
+    setDomain() {
+      this.$emit("setDomain");
+    }
   }
 }
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 31c3140d60..6fcba534c1 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -52,7 +52,7 @@
       <!--请求内容-->
       <template v-slot:request>
         <legend style="width: 100%">
-          <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
+          <customize-req-info :is-customize-req="isCustomizeReq" :request="request" @setDomain="setDomain"/>
           <p class="tip">{{ $t('api_test.definition.request.req_param') }} </p>
           <ms-api-request-form
             v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"
@@ -617,6 +617,9 @@ export default {
       this.loading = false;
       this.$emit('refReload', this.request, this.node);
     },
+    setDomain() {
+      this.$emit("setDomain");
+    },
     reload() {
       this.loading = true
       this.$nextTick(() => {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
index 077bd66382..5d23b1ace4 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -41,7 +41,7 @@
     </template>
     <template v-slot:scenarioEnable>
       <el-tooltip content="启用场景环境：当前步骤使用场景原始环境配置运行" placement="top">
-        <el-checkbox v-model="scenario.environmentEnable" @change="checkEnv">启用场景环境</el-checkbox>
+        <el-checkbox v-model="scenario.environmentEnable" @change="checkEnv" :disabled="scenario.disabled">启用场景环境</el-checkbox>
       </el-tooltip>
     </template>
     <template v-slot:button>
@@ -66,8 +66,7 @@ import MsTcpBasisParameters from "../../../definition/components/request/tcp/Tcp
 import MsDubboBasisParameters from "../../../definition/components/request/dubbo/BasisParameters";
 import MsApiRequestForm from "../../../definition/components/request/http/ApiHttpRequestForm";
 import ApiBaseComponent from "../common/ApiBaseComponent";
-import {getCurrentProjectID, getUUID} from "@/common/js/utils";
-import {getUrl} from "@/business/components/api/automation/scenario/component/urlhelper";
+import {getCurrentProjectID, getUUID, strMapToObj} from "@/common/js/utils";
 
 export default {
   name: "ApiScenarioComponent",
@@ -88,7 +87,10 @@ export default {
       default: false,
     },
     currentEnvironmentId: String,
-    projectList: Array
+    projectList: Array,
+    environmentType: String,
+    environmentGroupId: String,
+    envMap: Map
   },
   watch: {
     message() {
@@ -174,30 +176,31 @@ export default {
       this.$emit('stopScenario');
       this.reload();
     },
-    checkEnv() {
+    checkEnv(val) {
       this.$post("/api/automation/checkScenarioEnv", {scenarioDefinition: JSON.stringify(this.scenario), projectId: this.projectId}, res => {
         if (this.scenario.environmentEnable && !res.data) {
           this.scenario.environmentEnable = false;
           this.$warning("当前场景没有环境，需要先设置自身环境");
           return;
         }
-        this.setDomain();
+        this.setDomain(val);
       });
     },
-    setDomain() {
-      if (this.scenario.environmentEnable) {
-        let param = {
-          environmentEnable: true,
-          id: this.scenario.id,
-          definition: JSON.stringify(this.scenario)
-        }
-        this.$post("/api/automation/setDomain", param, res => {
-          if (res.data) {
-            let data = JSON.parse(res.data);
-            this.scenario.hashTree = data.hashTree;
-          }
-        })
+    setDomain(val) {
+      let param = {
+        environmentEnable: val,
+        id: this.scenario.id,
+        environmentType: this.environmentType,
+        environmentGroupId: this.environmentGroupId,
+        environmentMap: strMapToObj(this.envMap),
+        definition: JSON.stringify(this.scenario)
       }
+      this.$post("/api/automation/setDomain", param, res => {
+        if (res.data) {
+          let data = JSON.parse(res.data);
+          this.scenario.hashTree = data.hashTree;
+        }
+      })
     },
     getCode() {
       if (this.node && this.node.data.code && this.node.data.debug) {
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 0a21b8acad..ebd9706b8a 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -20,7 +20,7 @@
         :title="title"
         :color="titleColor"
         :response="response"
-        :environmet-type="environmentType"
+        :environment-type="environmentType"
         :environment-group-id="envGroupId"
         :background-color="backgroundColor"
         :project-list="projectList"
@@ -34,7 +34,7 @@
         @copyRow="copyRow"
         @refReload="refReload"
         @openScenario="openScenario"
-
+        @setDomain="setDomain"
       />
     </keep-alive>
   </div>
@@ -231,6 +231,9 @@ export default {
     },
     stopScenario() {
       this.$emit('stopScenario');
+    },
+    setDomain() {
+      this.$emit("setDomain");
     }
   }
 }