From 469802030ca634adddc63e1b31b8df5af3f0c683 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 14 Dec 2020 12:19:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):=20?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/definition/request/MsScenario.java    |   3 +-
 .../api/service/ApiAutomationService.java     |   2 +-
 .../api/service/ApiScenarioModuleService.java |   3 +-
 .../automation/scenario/AddBasisScenario.vue  | 135 +++++++++---------
 .../api/automation/scenario/ApiComponent.vue  |   2 +-
 .../automation/scenario/ApiScenarioModule.vue |   1 +
 .../automation/scenario/EditApiScenario.vue   |   9 +-
 .../api/automation/scenario/api/ApiList.vue   |   1 +
 .../api/definition/components/ApiCaseList.vue |   3 +
 .../api/definition/components/ApiConfig.vue   |   3 +
 .../api/definition/components/ApiList.vue     |   3 +
 .../request/http/ApiHttpRequestForm.vue       |  31 ++--
 .../request/http/ApiRequestForm.vue           |   6 +-
 frontend/src/business/components/xpack        |   2 +-
 14 files changed, 112 insertions(+), 92 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
index 6be0d1fe99..92290a861e 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
@@ -17,6 +17,7 @@ import io.metersphere.commons.utils.CommonBeanFactory;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jorphan.collections.HashTree;
@@ -47,7 +48,7 @@ public class MsScenario extends MsTestElement {
         if (!this.isEnable()) {
             return;
         }
-        if (environmentId != null) {
+        if (StringUtils.isNotEmpty(environmentId)) {
             ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
             ApiTestEnvironmentWithBLOBs environment = environmentService.get(environmentId);
             config.setConfig(JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class));
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 498e178e37..70145ccad2 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -124,7 +124,7 @@ public class ApiAutomationService {
         scenario.setDescription(request.getDescription());
         apiScenarioMapper.insert(scenario);
 
-        List<String> bodyUploadIds = new ArrayList<>(request.getBodyUploadIds());
+        List<String> bodyUploadIds = request.getBodyUploadIds();
         apiDefinitionService.createBodyFiles(bodyUploadIds, bodyFiles);
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
index ffbdb54759..24d2c3412b 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
@@ -21,11 +21,10 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ApiScenarioModuleService {
diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
index 3b826f7de1..8ef356a85e 100644
--- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
@@ -57,74 +57,75 @@
 </template>
 
 <script>
-import {WORKSPACE_ID} from '@/common/js/constants';
-import {getCurrentUser, getUUID,getCurrentProjectID} from "@/common/js/utils";
-import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
-export default {
-  name: "MsAddBasisScenario",
-  components: {MsDialogFooter},
-  props: {},
-  data() {
-    return {
-      scenarioForm: {},
-      visible: false,
-      currentModule: {},
-      userOptions: [],
-      rule: {
-        name: [
-          {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
-          {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
-        ],
-        principal: [{
-          required: true,
-          message: this.$t('api_test.automation.scenario.select_principal'),
-          trigger: 'change'
-        }],
-      },
-    }
-  }
-  ,
-  methods: {
-    saveScenario(saveAs) {
-      this.$refs['scenarioForm'].validate((valid) => {
-        if (valid) {
-          let path = "/api/automation/create";
-          this.setParameter();
-          this.result = this.$post(path, this.scenarioForm, () => {
-            this.visible = false;
-            if (saveAs) {
-              this.scenarioForm.request = JSON.stringify(this.scenarioForm.request);
-              this.$parent.saveAsEdit(this.scenarioForm);
-            } else {
-              this.$parent.refresh(this.currentModule);
-            }
-          });
-        } else {
-          return false;
-        }
-      })
-    },
-    setParameter() {
-      this.scenarioForm.projectId = getCurrentProjectID();
-      this.scenarioForm.id = getUUID().substring(0, 8);
-      this.scenarioForm.protocol = this.currentProtocol;
-      if (this.currentModule != null) {
-        this.scenarioForm.modulePath = this.currentModule.method !== undefined ? this.currentModule.method : null;
-        this.scenarioForm.apiScenarioModuleId = this.currentModule.id;
+  import {WORKSPACE_ID} from '@/common/js/constants';
+  import {getCurrentUser, getUUID, getCurrentProjectID} from "@/common/js/utils";
+  import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
+
+  export default {
+    name: "MsAddBasisScenario",
+    components: {MsDialogFooter},
+    props: {},
+    data() {
+      return {
+        scenarioForm: {},
+        visible: false,
+        currentModule: {},
+        userOptions: [],
+        rule: {
+          name: [
+            {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
+            {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
+          ],
+          principal: [{
+            required: true,
+            message: this.$t('api_test.automation.scenario.select_principal'),
+            trigger: 'change'
+          }],
+        },
+      }
+    }
+    ,
+    methods: {
+      saveScenario(saveAs) {
+        this.$refs['scenarioForm'].validate((valid) => {
+          if (valid) {
+            let path = "/api/automation/create";
+            this.setParameter();
+            this.$fileUpload(path, null, [], this.scenarioForm, () => {
+              this.visible = false;
+              if (saveAs) {
+                this.scenarioForm.request = JSON.stringify(this.scenarioForm.request);
+                this.$parent.saveAsEdit(this.scenarioForm);
+              } else {
+                this.$parent.refresh(this.currentModule);
+              }
+            });
+          } else {
+            return false;
+          }
+        })
+      },
+      setParameter() {
+        this.scenarioForm.projectId = getCurrentProjectID();
+        this.scenarioForm.id = getUUID().substring(0, 8);
+        this.scenarioForm.protocol = this.currentProtocol;
+        if (this.currentModule != null && this.currentModule != "newId") {
+          this.scenarioForm.modulePath = this.currentModule.method !== undefined ? this.currentModule.method : null;
+          this.scenarioForm.apiScenarioModuleId = this.currentModule.id;
+        }
+      },
+      getMaintainerOptions() {
+        let workspaceId = localStorage.getItem(WORKSPACE_ID);
+        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+          this.userOptions = response.data;
+        });
+      },
+      open(currentModule) {
+        this.scenarioForm = {principal: getCurrentUser().id};
+        this.currentModule = currentModule;
+        this.getMaintainerOptions();
+        this.visible = true;
       }
-    },
-    getMaintainerOptions() {
-      let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-        this.userOptions = response.data;
-      });
-    },
-    open(currentModule) {
-      this.scenarioForm = {principal: getCurrentUser().id};
-      this.currentModule = currentModule;
-      this.getMaintainerOptions();
-      this.visible = true;
     }
   }
-}
 </script>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/ApiComponent.vue
index 6b35d98651..8056137ced 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiComponent.vue
@@ -41,7 +41,7 @@
             </el-input>
           </div>
           <p class="tip">{{$t('api_test.definition.request.req_param')}} </p>
-          <ms-api-request-form :headers="request.headers " :request="request" v-if="request.protocol==='HTTP'"/>
+          <ms-api-request-form :referenced="true" :headers="request.headers " :request="request" v-if="request.protocol==='HTTP'"/>
           <ms-tcp-basis-parameters :request="request" v-if="request.protocol==='TCP'"/>
           <ms-sql-basis-parameters :request="request" v-if="request.protocol==='SQL'"/>
           <ms-dubbo-basis-parameters :request="request" v-if="request.protocol==='DUBBO' || request.protocol==='dubbo://'"/>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 47dc95d5a4..1f728d338d 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -265,6 +265,7 @@
           const children = parent.data.children || parent.data
           const index = children.findIndex(d => d.id !== undefined && data.id !== undefined && d.id === data.id)
           children.splice(index, 1);
+          this.getApiModuleTree();
         });
       },
 
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 9d629a8cba..ab484774bd 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -476,7 +476,7 @@
           request.enable === undefined ? request.enable = true : request.enable;
           request.active = false;
           request.resourceId = getUUID();
-          if (referenced === 'REF') {
+          if (referenced === 'REF' || !request.hashTree) {
             request.hashTree = [];
           }
           if (this.selectedTreeNode != undefined) {
@@ -496,7 +496,7 @@
           request.enable === undefined ? request.enable = true : request.enable;
           request.active = false;
           request.resourceId = getUUID();
-          if (referenced === 'REF') {
+          if (referenced === 'REF' || !request.hashTree) {
             request.hashTree = [];
           }
           if (this.selectedTreeNode != undefined) {
@@ -506,6 +506,8 @@
           }
         })
         this.apiListVisible = false;
+        this.currentRow.cases = [];
+        this.currentRow.apis = [];
         this.sort();
         this.reload();
       },
@@ -861,7 +863,8 @@
   /deep/ .el-step__icon.is-text {
     border: 1px solid;
   }
-  /deep/.el-drawer__header{
+
+  /deep/ .el-drawer__header {
     margin-bottom: 0px;
   }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/api/ApiList.vue b/frontend/src/business/components/api/automation/scenario/api/ApiList.vue
index a4102bb1df..9227f02246 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiList.vue
@@ -193,6 +193,7 @@
           this.total = response.data.itemCount;
           this.tableData = response.data.listObject;
         });
+        this.selectRows = new Set();
       },
       handleSelect(selection, row) {
         row.hashTree = [];
diff --git a/frontend/src/business/components/api/definition/components/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/ApiCaseList.vue
index 7f13288b18..7ca0bb37c6 100644
--- a/frontend/src/business/components/api/definition/components/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/ApiCaseList.vue
@@ -335,6 +335,9 @@
             for (let index in response.data) {
               let test = response.data[index];
               test.request = JSON.parse(test.request);
+              if (!test.request.hashTree) {
+                test.request.hashTree = [];
+              }
             }
             this.apiCaseList = response.data;
             if (this.apiCaseList.length == 0) {
diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index 1df8d46921..b886bf9d60 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -77,6 +77,9 @@
       } else {
         this.reqUrl = "/api/definition/create";
       }
+      if (!this.request.hashTree) {
+        this.request.hashTree = [];
+      }
     },
     methods: {
       runTest(data) {
diff --git a/frontend/src/business/components/api/definition/components/ApiList.vue b/frontend/src/business/components/api/definition/components/ApiList.vue
index 91fe6f53e9..498fb5c9e9 100644
--- a/frontend/src/business/components/api/definition/components/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/ApiList.vue
@@ -275,6 +275,9 @@
       handleTestCase(api) {
         this.selectApi = api;
         let request = JSON.parse(api.request);
+        if (!request.hashTree) {
+          request.hashTree = [];
+        }
         this.selectApi.url = request.path;
         this.$refs.caseList.open(this.selectApi);
       },
diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
index d89b29472b..279badcc10 100644
--- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
+++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
@@ -2,7 +2,7 @@
   <el-row>
     <el-col :span="21">
       <!-- HTTP 请求参数 -->
-      <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100%">
+      <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100%" v-loading="isReloadData">
         <el-tabs v-model="activeName" class="request-tabs">
           <!-- 请求头-->
           <el-tab-pane :label="$t('api_test.request.headers')" name="headers">
@@ -58,23 +58,23 @@
 
         </el-tabs>
       </div>
-
-      <div v-for="row in request.hashTree" :key="row.id" v-loading="isReloadData">
-        <!-- 前置脚本 -->
-        <ms-jsr233-processor v-if="row.label ==='JSR223 PreProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.pre_script')" style-type="color: #B8741A;background-color: #F9F1EA"
-                             :jsr223-processor="row"/>
-        <!--后置脚本-->
-        <ms-jsr233-processor v-if="row.label ==='JSR223 PostProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.post_script')" style-type="color: #783887;background-color: #F2ECF3"
-                             :jsr223-processor="row"/>
-        <!--断言规则-->
-        <ms-api-assertions v-if="row.type==='Assertions'" @copyRow="copyRow" @remove="remove" :is-read-only="isReadOnly" :assertions="row"/>
-        <!--提取规则-->
-        <ms-api-extract :is-read-only="isReadOnly" @copyRow="copyRow" @remove="remove" v-if="row.type==='Extract'" :extract="row"/>
-
+      <div v-if="!referenced">
+        <div v-for="row in request.hashTree" :key="row.id">
+          <!-- 前置脚本 -->
+          <ms-jsr233-processor v-if="row.label ==='JSR223 PreProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.pre_script')" style-type="color: #B8741A;background-color: #F9F1EA"
+                               :jsr223-processor="row"/>
+          <!--后置脚本-->
+          <ms-jsr233-processor v-if="row.label ==='JSR223 PostProcessor'" @copyRow="copyRow" @remove="remove" :is-read-only="false" :title="$t('api_test.definition.request.post_script')" style-type="color: #783887;background-color: #F2ECF3"
+                               :jsr223-processor="row"/>
+          <!--断言规则-->
+          <ms-api-assertions v-if="row.type==='Assertions'" @copyRow="copyRow" @remove="remove" :is-read-only="isReadOnly" :assertions="row"/>
+          <!--提取规则-->
+          <ms-api-extract :is-read-only="isReadOnly" @copyRow="copyRow" @remove="remove" v-if="row.type==='Extract'" :extract="row"/>
+        </div>
       </div>
     </el-col>
     <!--操作按钮-->
-    <el-col :span="3" class="ms-left-cell">
+    <el-col :span="3" class="ms-left-cell" v-if="!referenced">
       <el-button class="ms-left-buttion" size="small" @click="addPre">+{{$t('api_test.definition.request.pre_script')}}</el-button>
       <br/>
       <el-button class="ms-left-buttion" size="small" @click="addPost">+{{$t('api_test.definition.request.post_script')}}</el-button>
@@ -116,6 +116,7 @@
           return [];
         }
       },
+      referenced: Boolean,
       isShowEnable: Boolean,
       jsonPathList: Array,
       isReadOnly: {
diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiRequestForm.vue
index 3a5af1910c..de97afb499 100644
--- a/frontend/src/business/components/api/definition/components/request/http/ApiRequestForm.vue
+++ b/frontend/src/business/components/api/definition/components/request/http/ApiRequestForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="request-form">
-    <component :is="component" :is-read-only="isReadOnly" :request="request" :headers="headers" :isShowEnable="isShowEnable"/>
+    <component :is="component" :is-read-only="isReadOnly" :referenced="referenced" :request="request" :headers="headers" :isShowEnable="isShowEnable"/>
   </div>
 </template>
 
@@ -17,6 +17,10 @@
         type: Boolean,
         default: true
       },
+      referenced: {
+        type: Boolean,
+        default: false
+      },
       isReadOnly: {
         type: Boolean,
         default: false
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a22a3005d9..29a8fc0960 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a
+Subproject commit 29a8fc09602fde5708af06582ac972d98eb69836