From 62c7c00c0493d2f2132dc6f77c61806a0b3e6219 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 24 Dec 2020 10:36:32 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3/=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E6=9F=A5=E7=9C=8B=E5=BC=95=E7=94=A8=E7=9A=84=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=AE=A1=E5=88=92=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复接口/场景查看引用的测试计划显示重复的问题的问题
---
 .../java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index e3dbb2b706..9b757043a1 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -231,6 +231,7 @@
     <select id="selectTestPlanByRelevancy" resultMap="BaseResultMap" parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
         SELECT * FROM TEST_PLAN p LEFT JOIN test_plan_project t ON t.test_plan_id=p.id
         <where>
+            AND t.project_id = #{request.projectId}
             <if test="request.scenarioId != null">
                 AND p.id IN (SELECT test_plan_id FROM test_plan_api_scenario WHERE api_scenario_id = #{request.scenarioId} )
             </if>

From 4ae66e176be49767c4e54d00f0d8e31661da015f Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 24 Dec 2020 11:11:47 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5-=E8=BF=87?=
 =?UTF-8?q?=E5=8E=BB=E4=B8=83=E5=A4=A9=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复首页-过去七天失败用例数量统计错误的问题
---
 .../ext/ExtApiDefinitionExecResultMapper.xml       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 254b8576b7..6d66b45840 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -50,12 +50,20 @@
             ) caseErrorCountData ON caseErrorCountData.testCaseID =testCase.testCaseID
             WHERE caseErrorCountData.executeTime >= #{startTimestamp}
             UNION
-            SELECT scene.`name` AS caseName,testPlan.`name` AS testPlan,count(report.id) AS failureTimes,'scenario' AS caseType
+            SELECT scene.`name` AS caseName,apiScene.testPlanName AS testPlan,count(report.id) AS failureTimes,'scenario' AS caseType
             FROM api_scenario_report report
                INNER JOIN api_scenario_report_detail reportDetail ON report.id = reportDetail.report_id
                INNER JOIN api_scenario scene ON reportDetail.content like concat('%"', scene.`name`,'"%')
-               LEFT JOIN test_plan_api_scenario apiScene ON apiScene.api_scenario_id = scene.id
-               LEFT JOIN test_plan testPlan ON testPlan.id = apiScene.test_plan_id
+               LEFT JOIN
+                 (
+                     SELECT
+                         apiScene.api_scenario_id,
+                         group_concat(testPlan.`name`) AS testPlanName
+                     FROM
+                         test_plan_api_scenario apiScene
+                             INNER JOIN test_plan testPlan ON testPlan.id = apiScene.test_plan_id
+                     GROUP BY apiScene.api_scenario_id
+                 )apiScene ON apiScene.api_scenario_id = scene.id
             WHERE report.project_id = #{projectId}
             AND report.status = 'Error' AND report.create_time >= #{startTimestamp}
           GROUP BY scene.id

From 42d42bb76bc92b781c79b27dc8c3ab9555bc32a7 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 24 Dec 2020 11:19:01 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5-=E8=BF=87?=
 =?UTF-8?q?=E5=8E=BB=E4=B8=83=E5=A4=A9=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复首页-过去七天失败用例数量统计错误的问题
---
 .../java/io/metersphere/api/controller/APITestController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 3006f0af17..421eec048a 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -268,7 +268,7 @@ public class APITestController {
         if(allCount!=0){
             float coverageRageNumber =(float)apiCountResult.getExecutionPassCount()*100/allCount;
             DecimalFormat df = new DecimalFormat("0.0");
-            apiCountResult.setCoverageRage(df.format(coverageRageNumber)+"%");
+            apiCountResult.setPassRage(df.format(coverageRageNumber)+"%");
         }
 
         return  apiCountResult;

From 75ae7adfaef6260c0f7b8e1b12ac7bb0dd3353ed Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 24 Dec 2020 11:21:00 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E5=8E=BB=E6=8E=89=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E7=9A=84=20/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/service/SystemParameterService.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/service/SystemParameterService.java b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
index e58e268726..1660186db3 100644
--- a/backend/src/main/java/io/metersphere/service/SystemParameterService.java
+++ b/backend/src/main/java/io/metersphere/service/SystemParameterService.java
@@ -212,6 +212,8 @@ public class SystemParameterService {
     public void saveBaseInfo(List<SystemParameter> parameters) {
         SystemParameterExample example = new SystemParameterExample();
         parameters.forEach(param -> {
+            // 去掉路径最后的 /
+            param.setParamValue(StringUtils.removeEnd(param.getParamValue(), "/"));
             example.createCriteria().andParamKeyEqualTo(param.getParamKey());
             if (systemParameterMapper.countByExample(example) > 0) {
                 systemParameterMapper.updateByPrimaryKey(param);

From e4dba81ad7d23636205d2766506faee93a942cb6 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 11:37:11 +0800
Subject: [PATCH 5/8] =?UTF-8?q?refactor:=20=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E6=8E=A5=E5=8F=A3=E5=AF=BC=E5=85=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/ApiTestCaseController.java |   7 +
 .../api/service/ApiTestCaseService.java       |   5 +
 .../base/mapper/ext/ExtApiTestCaseMapper.java |   5 +
 .../base/mapper/ext/ExtApiTestCaseMapper.xml  |  15 ++
 .../automation/scenario/EditApiScenario.vue   |  31 +--
 .../scenario/api/ScenarioApiRelevance.vue     | 165 ++++++++++++
 .../scenario/api/ScenarioRelevanceApiList.vue | 248 ++++++++++++++++++
 .../api/ScenarioRelevanceCaseList.vue         | 239 +++++++++++++++++
 8 files changed, 692 insertions(+), 23 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
 create mode 100644 frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
 create mode 100644 frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
index ec064953a7..015848897b 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestCaseController.java
@@ -21,6 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/api/testcase")
@@ -43,6 +44,12 @@ public class ApiTestCaseController {
         return PageUtils.setPageInfo(page, apiTestCaseService.listSimple(request));
     }
 
+    @PostMapping("/get/request")
+    public Map<String, String> listSimple(@RequestBody ApiTestCaseRequest request) {
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return apiTestCaseService.getRequest(request);
+    }
+
     @PostMapping(value = "/create", consumes = {"multipart/form-data"})
     public void create(@RequestPart("request") SaveApiTestCaseRequest request, @RequestPart(value = "files") List<MultipartFile> bodyFiles) {
         apiTestCaseService.create(request, bodyFiles);
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
index 42a46d2eaa..0ce3aa2cc0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -332,4 +332,9 @@ public class ApiTestCaseService {
         example.createCriteria().andIdIn(caseIds);
         return apiTestCaseMapper.selectByExample(example);
     }
+
+    public Map<String, String> getRequest(ApiTestCaseRequest request) {
+        List<ApiTestCaseWithBLOBs> list = extApiTestCaseMapper.getRequest(request);
+        return list.stream().collect(Collectors.toMap(ApiTestCaseWithBLOBs::getId, ApiTestCaseWithBLOBs::getRequest));
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
index 8f3f4558b6..1451d970bf 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
@@ -4,10 +4,13 @@ import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.ApiTestCaseDTO;
 import io.metersphere.api.dto.definition.ApiTestCaseRequest;
 import io.metersphere.api.dto.definition.ApiTestCaseResult;
+import io.metersphere.base.domain.ApiTestCaseWithBLOBs;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ExtApiTestCaseMapper {
 
@@ -20,4 +23,6 @@ public interface ExtApiTestCaseMapper {
     List<ApiDataCountResult> countProtocolByProjectID(String projectId);
 
     long countByProjectIDAndCreateInThisWeek(@Param("projectId") String projectId, @Param("firstDayTimestamp") long firstDayTimestamp, @Param("lastDayTimestamp") long lastDayTimestamp);
+
+    List<ApiTestCaseWithBLOBs> getRequest(@Param("request") ApiTestCaseRequest request);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
index a9945e7844..234bf0d40d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.xml
@@ -290,5 +290,20 @@
         AND testCase.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
     </select>
 
+    <select id="getRequest" resultType="io.metersphere.base.domain.ApiTestCaseWithBLOBs">
+        select id, request
+        from api_test_case
+        where 1
+        <if test="request.id != null and request.id!=''">
+            and id = #{request.id}
+        </if>
+        <if test="request.ids != null and request.ids.size() > 0">
+            and id in
+            <foreach collection="request.ids" item="caseId" separator="," open="(" close=")">
+                #{caseId}
+            </foreach>
+        </if>
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index c9bb269508..564b195bff 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -201,11 +201,7 @@
       </div>
 
       <!--接口列表-->
-      <el-drawer :visible.sync="apiListVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :modal="false" size="90%">
-        <ms-api-definition :visible="visibleRef" :currentRow="currentRow"/>
-        <el-button style="float: right;margin: 0px 20px 0px" type="primary" @click="pushApiOrCase('REF')">{{$t('api_test.scenario.reference')}}</el-button>
-        <el-button style="float: right;" type="primary" @click="pushApiOrCase('Copy')">{{ $t('commons.copy') }}</el-button>
-      </el-drawer>
+      <scenario-api-relevance @save="pushApiOrCase" ref="scenarioApiRelevance"/>
 
       <!--自定义接口-->
       <el-drawer :visible.sync="customizeVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.customize_req')" style="overflow: auto" :modal="false" size="90%">
@@ -260,6 +256,7 @@
   import ApiImport from "../../definition/components/import/ApiImport";
   import InputTag from 'vue-input-tag'
   import "@/common/css/material-icons.css"
+  import ScenarioApiRelevance from "./api/ScenarioApiRelevance";
 
   export default {
     name: "EditApiScenario",
@@ -268,6 +265,7 @@
       currentScenario: {},
     },
     components: {
+      ScenarioApiRelevance,
       ApiEnvironmentConfig,
       MsScenarioParameters,
       MsApiReportDetail,
@@ -279,7 +277,6 @@
       MsIfController,
       MsApiAssertions,
       MsApiExtract,
-      MsApiDefinition,
       MsApiComponent,
       MsApiCustomize,
       ApiImport,
@@ -323,7 +320,6 @@
         debugData: {},
         reportId: "",
         projectId: "",
-        visibleRef: "",
         enableCookieShare: false,
       }
     }
@@ -518,8 +514,7 @@
       }
       ,
       apiListImport() {
-        this.visibleRef = getUUID();
-        this.apiListVisible = true;
+        this.$refs.scenarioApiRelevance.open();
       }
       ,
       recursiveSorting(arr) {
@@ -599,20 +594,10 @@
         }
       }
       ,
-      pushApiOrCase(referenced) {
-        if (this.currentRow.cases.length === 0 && this.currentRow.apis.length === 0) {
-          this.$warning(this.$t('api_test.automation.reference_info'));
-          return;
-        }
-        this.currentRow.cases.forEach(item => {
-          this.setApiParameter(item, "CASE", referenced);
-        })
-        this.currentRow.apis.forEach(item => {
-          this.setApiParameter(item, "API", referenced);
-        })
-        this.apiListVisible = false;
-        this.currentRow.cases = [];
-        this.currentRow.apis = [];
+      pushApiOrCase(data, refType,  referenced) {
+        data.forEach(item => {
+          this.setApiParameter(item, refType, referenced);
+        });
         this.sort();
         this.reload();
       }
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
new file mode 100644
index 0000000000..185fc3df58
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue
@@ -0,0 +1,165 @@
+<template>
+  <el-dialog class="api-relevance" :title="$t('test_track.plan_view.relevance_test_case')"
+             :visible.sync="dialogVisible"
+             width="60%"
+             :close-on-click-modal="false"
+             top="50px">
+
+    <ms-container>
+      <ms-aside-container :enable-aside-hidden="false">
+        <ms-api-module
+          @nodeSelectEvent="nodeChange"
+          @protocolChange="handleProtocolChange"
+          @refreshTable="refresh"
+          @setModuleOptions="setModuleOptions"
+          :is-read-only="true"
+          ref="nodeTree"/>
+      </ms-aside-container>
+
+      <ms-main-container>
+        <scenario-relevance-api-list
+          v-if="isApiListEnable"
+          :current-protocol="currentProtocol"
+          :select-node-ids="selectNodeIds"
+          :is-api-list-enable="isApiListEnable"
+          @isApiListEnableChange="isApiListEnableChange"
+          ref="apiList"
+        />
+
+        <scenario-relevance-case-list
+          v-if="!isApiListEnable"
+          :current-protocol="currentProtocol"
+          :select-node-ids="selectNodeIds"
+          :is-api-list-enable="isApiListEnable"
+          @isApiListEnableChange="isApiListEnableChange"
+          ref="apiCaseList"/>
+      </ms-main-container>
+    </ms-container>
+
+    <template v-slot:footer>
+      <el-button type="primary" @click="copy" @keydown.enter.native.prevent>复制</el-button>
+      <el-button v-if="!isApiListEnable" type="primary" @click="reference" @keydown.enter.native.prevent>引用</el-button>
+    </template>
+
+  </el-dialog>
+</template>
+
+<script>
+    import ScenarioRelevanceCaseList from "./ScenarioRelevanceCaseList";
+    import MsApiModule from "../../../definition/components/module/ApiModule";
+    import MsContainer from "../../../../common/components/MsContainer";
+    import MsAsideContainer from "../../../../common/components/MsAsideContainer";
+    import MsMainContainer from "../../../../common/components/MsMainContainer";
+    import ScenarioRelevanceApiList from "./ScenarioRelevanceApiList";
+    export default {
+      name: "ScenarioApiRelevance",
+      components: {
+        ScenarioRelevanceApiList,
+        MsMainContainer, MsAsideContainer, MsContainer, MsApiModule, ScenarioRelevanceCaseList},
+      data() {
+          return {
+            dialogVisible: false,
+            result: {},
+            currentProtocol: null,
+            selectNodeIds: [],
+            moduleOptions: {},
+            isApiListEnable: true,
+          }
+      },
+      methods: {
+        reference() {
+          this.save('REF');
+        },
+        copy() {
+          this.save('Copy');
+        },
+        save(reference) {
+          if (this.isApiListEnable) {
+            this.$emit('save', this.$refs.apiList.selectRows, 'API', reference);
+            this.close();
+          } else {
+            let apiCases = this.$refs.apiCaseList.selectRows;
+            let ids = Array.from(apiCases).map(row => row.id);
+            this.result = this.$post("/api/testcase/get/request", {ids: ids}, (response) => {
+              apiCases.forEach((item) => {
+                item.request = response.data[item.id];
+              });
+              this.$emit('save', apiCases, 'CASE', reference);
+              this.close();
+            });
+          }
+        },
+        close() {
+          this.refresh();
+          this.dialogVisible = false;
+        },
+        open() {
+          this.dialogVisible = true;
+        },
+        isApiListEnableChange(data) {
+          this.isApiListEnable = data;
+        },
+        nodeChange(node, nodeIds, pNodes) {
+          this.selectNodeIds = nodeIds;
+        },
+        handleProtocolChange(protocol) {
+          this.currentProtocol = protocol;
+        },
+        setModuleOptions(data) {
+          this.moduleOptions = data;
+        },
+
+        saveCaseRelevance() {
+
+          let param = {};
+          let url = '';
+          let environmentId = undefined;
+          let selectIds = [];
+          if (this.isApiListEnable) {
+            url = '/api/definition/relevance';
+            environmentId = this.$refs.apiList.environmentId;
+            selectIds = Array.from(this.$refs.apiList.selectRows).map(row => row.id);
+          } else {
+            url = '/api/testcase/relevance';
+            environmentId = this.$refs.apiCaseList.environmentId;
+            selectIds = Array.from(this.$refs.apiCaseList.selectRows).map(row => row.id);
+          }
+
+          if (!environmentId) {
+            this.$warning(this.$t('api_test.environment.select_environment'));
+            return;
+          }
+          param.planId = this.planId;
+          param.selectIds = selectIds;
+          param.environmentId = environmentId;
+          this.result = this.$post(url, param, () => {
+            this.$success(this.$t('commons.save_success'));
+            this.$emit('refresh');
+            this.refresh();
+            this.$refs.baseRelevance.close();
+          });
+        },
+
+        refresh() {
+          if (this.isApiListEnable) {
+            this.$refs.apiList.initTable();
+          } else {
+            this.$refs.apiCaseList.initTable();
+          }
+        },
+
+      }
+    }
+</script>
+
+<style scoped>
+
+  .ms-aside-container {
+    border: 0px;
+  }
+
+  .api-relevance >>> .el-dialog__body {
+    padding: 10px 20px;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
new file mode 100644
index 0000000000..83a0c956ca
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
@@ -0,0 +1,248 @@
+<template>
+  <api-list-container
+      :is-api-list-enable="isApiListEnable"
+      @isApiListEnableChange="isApiListEnableChange">
+
+      <el-input placeholder="搜索" @blur="initTable" class="search-input" size="small" @keyup.enter.native="initTable" v-model="condition.name"/>
+
+      <el-table v-loading="result.loading"
+                border
+                :data="tableData" row-key="id" class="test-content adjust-table"
+                @select-all="handleSelectAll"
+                @select="handleSelect">
+        <el-table-column type="selection"/>
+
+        <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
+
+        <el-table-column
+          prop="status"
+          column-key="api_status"
+          :label="$t('api_test.definition.api_status')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <ms-tag v-if="scope.row.status == 'Prepare'" type="info" effect="plain" :content="$t('test_track.plan.plan_status_prepare')"/>
+            <ms-tag v-if="scope.row.status == 'Underway'" type="warning" effect="plain" :content="$t('test_track.plan.plan_status_running')"/>
+            <ms-tag v-if="scope.row.status == 'Completed'" type="success" effect="plain" :content="$t('test_track.plan.plan_status_completed')"/>
+            <ms-tag v-if="scope.row.status == 'Trash'" type="danger" effect="plain" content="废弃"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="method"
+          :label="$t('api_test.definition.api_type')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope" class="request-method">
+            <el-tag size="mini" :style="{'background-color': getColor(scope.row.method), border: getColor(true, scope.row.method)}" class="api-el-tag">
+              {{ scope.row.method}}
+            </el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="path"
+          :label="$t('api_test.definition.api_path')"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          prop="userName"
+          :label="$t('api_test.definition.api_principal')"
+          show-overflow-tooltip/>
+
+        <el-table-column width="160" :label="$t('api_test.definition.api_last_time')" prop="updateTime">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="caseTotal"
+          :label="$t('api_test.definition.api_case_number')"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          prop="caseStatus"
+          :label="$t('api_test.definition.api_case_status')"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          prop="casePassingRate"
+          :label="$t('api_test.definition.api_case_passing_rate')"
+          show-overflow-tooltip/>
+      </el-table>
+      <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                           :total="total"/>
+    </api-list-container>
+</template>
+
+<script>
+
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
+  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+  import MsTablePagination from "../../../../common/pagination/TablePagination";
+  import MsTag from "../../../../common/components/MsTag";
+  import MsBottomContainer from "../../../definition/components/BottomContainer";
+  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+  import MsBatchEdit from "../../../definition/components/basis/BatchEdit";
+  import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../../definition/model/JsonData";
+  import {getCurrentProjectID} from "@/common/js/utils";
+  import ApiListContainer from "../../../definition/components/list/ApiListContainer";
+  import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
+  import {_filter, _sort} from "../../../../../../common/js/utils";
+  import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
+
+  export default {
+    name: "ScenarioRelevanceApiList",
+    components: {
+      PriorityTableItem,
+      ApiListContainer,
+      MsTableOperatorButton,
+      MsTableOperator,
+      MsTablePagination,
+      MsTag,
+      MsBottomContainer,
+      ShowMoreBtn,
+      MsBatchEdit
+    },
+    data() {
+      return {
+        condition: {},
+        selectCase: {},
+        result: {},
+        moduleId: "",
+        deletePath: "/test/case/delete",
+        selectRows: new Set(),
+        typeArr: [
+          {id: 'priority', name: this.$t('test_track.case.priority')},
+        ],
+        priorityFilters: [
+          {text: 'P0', value: 'P0'},
+          {text: 'P1', value: 'P1'},
+          {text: 'P2', value: 'P2'},
+          {text: 'P3', value: 'P3'}
+        ],
+        valueArr: {
+          priority: CASE_PRIORITY,
+        },
+        methodColorMap: new Map(API_METHOD_COLOUR),
+        tableData: [],
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      }
+    },
+    props: {
+      currentProtocol: String,
+      selectNodeIds: Array,
+      visible: {
+        type: Boolean,
+        default: false,
+      },
+      isApiListEnable: {
+        type: Boolean,
+        default: false,
+      },
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      isCaseRelevance: {
+        type: Boolean,
+        default: false,
+      },
+      relevanceProjectId: String,
+      planId: String
+    },
+    created: function () {
+      this.initTable();
+    },
+    watch: {
+      selectNodeIds() {
+        this.initTable();
+      },
+      currentProtocol() {
+        this.initTable();
+      },
+    },
+    computed: {
+
+    },
+    methods: {
+      isApiListEnableChange(data) {
+        this.$emit('isApiListEnableChange', data);
+      },
+      initTable() {
+        this.selectRows = new Set();
+        this.condition.filters = ["Prepare", "Underway", "Completed"];
+        this.condition.moduleIds = this.selectNodeIds;
+        if (this.trashEnable) {
+          this.condition.filters = ["Trash"];
+          this.condition.moduleIds = [];
+        }
+        if (this.projectId != null) {
+          this.condition.projectId = this.projectId;
+        }
+        if (this.currentProtocol != null) {
+          this.condition.protocol = this.currentProtocol;
+        }
+        this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+        });
+      },
+
+      handleSelect(selection, row) {
+        _handleSelect(this, selection, row, this.selectRows);
+      },
+      showExecResult(row) {
+        this.visible = false;
+        this.$emit('showExecResult', row);
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.initTable();
+      },
+      sort(column) {
+        // 每次只对一个字段排序
+        if (this.condition.orders) {
+          this.condition.orders = [];
+        }
+        _sort(column, this.condition);
+        this.initTable();
+      },
+      handleSelectAll(selection) {
+        _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      },
+      buildPagePath(path) {
+        return path + "/" + this.currentPage + "/" + this.pageSize;
+      },
+      getColor(method) {
+        return this.methodColorMap.get(method);
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  .operate-button > div {
+    display: inline-block;
+    margin-left: 10px;
+  }
+
+  .request-method {
+    padding: 0 5px;
+    color: #1E90FF;
+  }
+
+  .api-el-tag {
+    color: white;
+  }
+
+  .search-input {
+    float: right;
+    width: 300px;
+    /*margin-bottom: 20px;*/
+    margin-right: 20px;
+  }
+
+</style>
diff --git a/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue
new file mode 100644
index 0000000000..b4452b8964
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue
@@ -0,0 +1,239 @@
+<template>
+  <div>
+    <api-list-container
+      :is-api-list-enable="isApiListEnable"
+      @isApiListEnableChange="isApiListEnableChange">
+
+      <el-input placeholder="搜索" @blur="initTable" @keyup.enter.native="initTable" class="search-input" size="small" v-model="condition.name"/>
+
+      <el-table v-loading="result.loading"
+                border
+                :data="tableData" row-key="id" class="test-content adjust-table"
+                @select-all="handleSelectAll"
+                @filter-change="filter"
+                @sort-change="sort"
+                @select="handleSelect">
+        <el-table-column type="selection"/>
+
+        <el-table-column prop="name" :label="$t('api_test.definition.api_name')" show-overflow-tooltip/>
+
+        <el-table-column
+          prop="priority"
+          :filters="priorityFilters"
+          column-key="priority"
+          :label="$t('test_track.case.priority')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <priority-table-item :value="scope.row.priority"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="path"
+          :label="$t('api_test.definition.api_path')"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          prop="createUser"
+          :label="'创建人'"
+          show-overflow-tooltip/>
+
+        <el-table-column
+          sortable="custom"
+          width="160"
+          :label="$t('api_test.definition.api_last_time')"
+          prop="updateTime">
+          <template v-slot:default="scope">
+            <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
+          </template>
+        </el-table-column>
+
+      </el-table>
+      <ms-table-pagination :change="initTable" :current-page.sync="currentPage" :page-size.sync="pageSize"
+                           :total="total"/>
+    </api-list-container>
+
+  </div>
+
+</template>
+
+<script>
+
+  import MsTableOperator from "../../../../common/components/MsTableOperator";
+  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+  import MsTablePagination from "../../../../common/pagination/TablePagination";
+  import MsTag from "../../../../common/components/MsTag";
+  import MsBottomContainer from "../../../definition/components/BottomContainer";
+  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+  import MsBatchEdit from "../../../definition/components/basis/BatchEdit";
+  import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../../definition/model/JsonData";
+  import {getCurrentProjectID} from "@/common/js/utils";
+  import ApiListContainer from "../../../definition/components/list/ApiListContainer";
+  import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
+  import {_filter, _sort} from "../../../../../../common/js/utils";
+  import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
+
+  export default {
+    name: "ScenarioRelevanceCaseList",
+    components: {
+      PriorityTableItem,
+      ApiListContainer,
+      MsTableOperatorButton,
+      MsTableOperator,
+      MsTablePagination,
+      MsTag,
+      MsBottomContainer,
+      ShowMoreBtn,
+      MsBatchEdit
+    },
+    data() {
+      return {
+        condition: {},
+        selectCase: {},
+        result: {},
+        moduleId: "",
+        selectRows: new Set(),
+        typeArr: [
+          {id: 'priority', name: this.$t('test_track.case.priority')},
+        ],
+        priorityFilters: [
+          {text: 'P0', value: 'P0'},
+          {text: 'P1', value: 'P1'},
+          {text: 'P2', value: 'P2'},
+          {text: 'P3', value: 'P3'}
+        ],
+        valueArr: {
+          priority: CASE_PRIORITY,
+        },
+        methodColorMap: new Map(API_METHOD_COLOUR),
+        tableData: [],
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+      }
+    },
+    props: {
+      currentProtocol: String,
+      selectNodeIds: Array,
+      visible: {
+        type: Boolean,
+        default: false,
+      },
+      isApiListEnable: {
+        type: Boolean,
+        default: false,
+      },
+      isReadOnly: {
+        type: Boolean,
+        default: false
+      },
+      isCaseRelevance: {
+        type: Boolean,
+        default: false,
+      },
+      relevanceProjectId: String,
+      planId: String
+    },
+    created: function () {
+      this.initTable();
+    },
+    watch: {
+      selectNodeIds() {
+        this.initTable();
+      },
+      currentProtocol() {
+        this.initTable();
+      },
+    },
+    computed: {
+
+    },
+    methods: {
+      isApiListEnableChange(data) {
+        this.$emit('isApiListEnableChange', data);
+      },
+      initTable() {
+        this.selectRows = new Set();
+        this.condition.status = "";
+        this.condition.moduleIds = this.selectNodeIds;
+        if (this.currentProtocol != null) {
+          this.condition.protocol = this.currentProtocol;
+        }
+        this.condition.projectId = getCurrentProjectID();
+
+        this.result = this.$post("/api/testcase/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+        });
+      },
+
+      handleSelect(selection, row) {
+        _handleSelect(this, selection, row, this.selectRows);
+      },
+      showExecResult(row) {
+        this.visible = false;
+        this.$emit('showExecResult', row);
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.initTable();
+      },
+      sort(column) {
+        // 每次只对一个字段排序
+        if (this.condition.orders) {
+          this.condition.orders = [];
+        }
+        _sort(column, this.condition);
+        this.initTable();
+      },
+      handleSelectAll(selection) {
+        _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      },
+      buildPagePath(path) {
+        return path + "/" + this.currentPage + "/" + this.pageSize;
+      },
+      handleTestCase(testCase) {
+        this.$get('/api/definition/get/' + testCase.apiDefinitionId, (response) => {
+          let api = response.data;
+          let selectApi = api;
+          let request = {};
+          if (Object.prototype.toString.call(api.request).match(/\[object (\w+)\]/)[1].toLowerCase() === 'object') {
+            request = api.request;
+          } else {
+            request = JSON.parse(api.request);
+          }
+          if (!request.hashTree) {
+            request.hashTree = [];
+          }
+          selectApi.url = request.path;
+          this.$refs.caseList.open(selectApi, testCase.id);
+        });
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  .operate-button > div {
+    display: inline-block;
+    margin-left: 10px;
+  }
+
+  .request-method {
+    padding: 0 5px;
+    color: #1E90FF;
+  }
+
+  .api-el-tag {
+    color: white;
+  }
+
+  .search-input {
+    float: right;
+    width: 300px;
+    /*margin-bottom: 20px;*/
+    margin-right: 20px;
+  }
+
+</style>

From 54247fc15cf0304de4a5d69cab9efe3df3f23e28 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 24 Dec 2020 11:40:41 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack                      | 2 +-
 .../api/definition/components/list/ApiCaseSimpleList.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 79343a2763..9f4a9bbf46 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 79343a2763b014355f91fc21b2356a95ae437973
+Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index 787c5053ff..811a046091 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -273,7 +273,7 @@
         } else if (this.isRelevanceModel) {
           return '/api/testcase/delete/' + apiCase.id;
         } else {
-          return '/api/testcase/delete/' + +apiCase.id;
+          return '/api/testcase/delete/' + apiCase.id;
         }
       },
       // getMaintainerOptions() {

From 611b1e3c972cec56f4e5aa375c85fd9101dcb5e2 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Thu, 24 Dec 2020 11:45:15 +0800
Subject: [PATCH 7/8] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8CFAB=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 1574 +++++++++--------
 frontend/src/common/js/outside-click.js       |   31 +
 2 files changed, 837 insertions(+), 768 deletions(-)
 create mode 100644 frontend/src/common/js/outside-click.js

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index c9bb269508..18d04c2c67 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -1,41 +1,42 @@
 <template>
-  <el-card class="card-content">
-    <div>
+  <el-card>
+    <div class="card-content">
       <div class="ms-main-div" @click="showAll">
         <el-row>
           <el-col>
             <!--操作按钮-->
             <div class="ms-opt-btn">
-              <el-button type="primary" size="small" @click="editScenario">{{$t('commons.save')}}</el-button>
+              <el-button type="primary" size="small" @click="editScenario">{{ $t('commons.save') }}</el-button>
             </div>
           </el-col>
         </el-row>
-        <div class="tip">{{$t('test_track.plan_view.base_info')}}</div>
-        <el-form :model="currentScenario" label-position="right" label-width="80px" size="small" :rules="rules" ref="currentScenario" style="margin-right: 20px">
+        <div class="tip">{{ $t('test_track.plan_view.base_info') }}</div>
+        <el-form :model="currentScenario" label-position="right" label-width="80px" size="small" :rules="rules"
+                 ref="currentScenario" style="margin-right: 20px">
           <!-- 基础信息 -->
           <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('commons.name')" prop="name">
                 <el-input class="ms-scenario-input" size="small" v-model="currentScenario.name"/>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('test_track.module.module')" prop="apiScenarioModuleId">
                 <el-select class="ms-scenario-input" size="small" v-model="currentScenario.apiScenarioModuleId">
                   <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('commons.status')" prop="status">
                 <el-select class="ms-scenario-input" size="small" v-model="currentScenario.status">
                   <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+          </el-row>
+          <el-row>
+            <el-col :span="7">
               <el-form-item :label="$t('api_test.definition.request.responsible')" prop="principal">
                 <el-select v-model="currentScenario.principal"
                            :placeholder="$t('api_test.definition.request.responsible')" filterable size="small"
@@ -47,20 +48,16 @@
                     :value="item.id">
                   </el-option>
                 </el-select>
-
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('test_track.case.priority')" prop="level">
                 <el-select class="ms-scenario-input" size="small" v-model="currentScenario.level">
                   <el-option v-for="item in levels" :key="item.id" :label="item.label" :value="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('api_test.automation.follow_people')" prop="followPeople">
                 <el-select v-model="currentScenario.followPeople"
                            :placeholder="$t('api_test.automation.follow_people')" filterable size="small"
@@ -76,14 +73,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item label="Tag" prop="tags">
                 <ms-input-tag :currentScenario="currentScenario" ref="tag"/>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('commons.description')" prop="description">
                 <el-input class="ms-http-textarea"
                           v-model="currentScenario.description"
@@ -99,7 +95,7 @@
       <!-- 场景步骤-->
       <div v-loading="loading">
         <div @click="showAll">
-          <p class="tip">{{$t('api_test.automation.scenario_step')}} </p>
+          <p class="tip">{{ $t('api_test.automation.scenario_step') }} </p>
         </div>
         <el-row>
           <el-col :span="21">
@@ -107,20 +103,21 @@
             <div class="ms-debug-div" @click="showAll">
               <el-row style="margin: 5px">
                 <el-col :span="6" class="ms-col-one ms-font">
-                  {{currentScenario.name ===undefined || ''? $t('api_test.scenario.name') : currentScenario.name}}
+                  {{ currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name }}
                 </el-col>
                 <el-col :span="3" class="ms-col-one ms-font">
-                  {{$t('api_test.automation.step_total')}}：{{scenarioDefinition.length}}
+                  {{ $t('api_test.automation.step_total') }}：{{ scenarioDefinition.length }}
                 </el-col>
                 <el-col :span="3" class="ms-col-one ms-font">
-                  <el-link class="head" @click="showScenarioParameters">{{$t('api_test.automation.scenario_total')}}</el-link>
-                  ：{{this.currentScenario.variables!=undefined?this.currentScenario.variables.length-1: 0}}
+                  <el-link class="head" @click="showScenarioParameters">{{ $t('api_test.automation.scenario_total') }}
+                  </el-link>
+                  ：{{ this.currentScenario.variables != undefined ? this.currentScenario.variables.length - 1 : 0 }}
                 </el-col>
                 <el-col :span="3" class="ms-col-one ms-font">
                   <el-checkbox v-model="enableCookieShare">共享cookie</el-checkbox>
                 </el-col>
                 <el-col :span="7" class="ms-font">
-                  {{$t('api_test.definition.request.run_env')}}：
+                  {{ $t('api_test.definition.request.run_env') }}：
                   <el-select v-model="currentEnvironmentId" size="small" class="ms-htt-width"
                              :placeholder="$t('api_test.definition.request.run_env')"
                              clearable>
@@ -140,7 +137,8 @@
                   </el-select>
                 </el-col>
                 <el-col :span="2">
-                  <el-button size="small" type="primary" @click="runDebug">{{$t('api_test.request.debug')}}</el-button>
+                  <el-button size="small" type="primary" @click="runDebug">{{ $t('api_test.request.debug') }}
+                  </el-button>
                 </el-col>
               </el-row>
             </div>
@@ -151,68 +149,90 @@
                        :expand-on-click-node="false"
                        @node-expand="nodeExpand"
                        @node-collapse="nodeCollapse"
-                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading" draggable>
+                       :allow-drop="allowDrop" @node-drag-end="allowDrag" @node-click="nodeClick" v-if="!loading"
+                       draggable>
                  <span class="custom-tree-node father" slot-scope="{ node, data}" style="width: 96%">
                     <template>
                       <!-- 场景 -->
-                      <ms-api-scenario-component v-if="data.type==='scenario'" :scenario="data" :node="node" @remove="remove" @copyRow="copyRow"/>
+                      <ms-api-scenario-component v-if="data.type==='scenario'" :scenario="data" :node="node"
+                                                 @remove="remove" @copyRow="copyRow"/>
                       <!--条件控制器-->
-                      <ms-if-controller :controller="data" :node="node" v-if="data.type==='IfController'" @remove="remove" @copyRow="copyRow"/>
+                      <ms-if-controller :controller="data" :node="node" v-if="data.type==='IfController'"
+                                        @remove="remove" @copyRow="copyRow"/>
                       <!--等待控制器-->
-                      <ms-constant-timer :timer="data" :node="node" v-if="data.type==='ConstantTimer'" @remove="remove" @copyRow="copyRow"/>
+                      <ms-constant-timer :timer="data" :node="node" v-if="data.type==='ConstantTimer'" @remove="remove"
+                                         @copyRow="copyRow"/>
                       <!--自定义脚本-->
-                      <ms-jsr233-processor v-if="data.type==='JSR223Processor'" @remove="remove" @copyRow="copyRow" :title="$t('api_test.automation.customize_script')"
-                                           style-type="color: #7B4D12;background-color: #F1EEE9" :jsr223-processor="data" :node="node"/>
+                      <ms-jsr233-processor v-if="data.type==='JSR223Processor'" @remove="remove" @copyRow="copyRow"
+                                           :title="$t('api_test.automation.customize_script')"
+                                           style-type="color: #7B4D12;background-color: #F1EEE9"
+                                           :jsr223-processor="data" :node="node"/>
                       <!--前置脚本-->
-                      <ms-jsr233-processor v-if="data.type==='JSR223PreProcessor'" @remove="remove" @copyRow="copyRow" :title="$t('api_test.definition.request.pre_script')"
-                                           style-type="color: #B8741A;background-color: #F9F1EA" :jsr223-processor="data" :node="node"/>
+                      <ms-jsr233-processor v-if="data.type==='JSR223PreProcessor'" @remove="remove" @copyRow="copyRow"
+                                           :title="$t('api_test.definition.request.pre_script')"
+                                           style-type="color: #B8741A;background-color: #F9F1EA"
+                                           :jsr223-processor="data" :node="node"/>
                       <!--后置脚本-->
-                      <ms-jsr233-processor v-if="data.type==='JSR223PostProcessor'" @remove="remove" @copyRow="copyRow" :title="$t('api_test.definition.request.post_script')"
-                                           style-type="color: #783887;background-color: #F2ECF3" :jsr223-processor="data" :node="node"/>
+                      <ms-jsr233-processor v-if="data.type==='JSR223PostProcessor'" @remove="remove" @copyRow="copyRow"
+                                           :title="$t('api_test.definition.request.post_script')"
+                                           style-type="color: #783887;background-color: #F2ECF3"
+                                           :jsr223-processor="data" :node="node"/>
                       <!--断言规则-->
-                      <ms-api-assertions v-if="data.type==='Assertions'" @remove="remove" @copyRow="copyRow" customizeStyle="margin-top: 0px" :assertions="data" :node="node"/>
+                      <ms-api-assertions v-if="data.type==='Assertions'" @remove="remove" @copyRow="copyRow"
+                                         customizeStyle="margin-top: 0px" :assertions="data" :node="node"/>
                       <!--提取规则-->
-                      <ms-api-extract @remove="remove" @copyRow="copyRow" v-if="data.type==='Extract'" customizeStyle="margin-top: 0px" :extract="data" :node="node"/>
+                      <ms-api-extract @remove="remove" @copyRow="copyRow" v-if="data.type==='Extract'"
+                                      customizeStyle="margin-top: 0px" :extract="data" :node="node"/>
                       <!--API 导入 -->
-                      <ms-api-component :request="data" :currentEnvironmentId="currentEnvironmentId" @remove="remove" @copyRow="copyRow" v-if="data.type==='HTTPSamplerProxy'||data.type==='DubboSampler'||data.type==='JDBCSampler'||data.type==='TCPSampler'" :node="node"/>
+                      <ms-api-component :request="data" :currentEnvironmentId="currentEnvironmentId" @remove="remove"
+                                        @copyRow="copyRow"
+                                        v-if="data.type==='HTTPSamplerProxy'||data.type==='DubboSampler'||data.type==='JDBCSampler'||data.type==='TCPSampler'"
+                                        :node="node"/>
                     </template>
                    </span>
               </el-tree>
             </div>
           </el-col>
           <!-- 按钮列表 -->
-          <div>
-            <el-col :span="3">
-              <vue-fab id="fab" mainBtnColor="#783887" :click-auto-close="false">
-                <fab-item
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  :idx="getIdx(index)"
-                  :title="item.title"
-                  :title-bg-color="item.titleBgColor"
-                  :title-color="item.titleColor"
-                  :color="item.titleColor"
-                  :icon="item.icon"
-                  @clickItem="item.click"/>
-              </vue-fab>
-            </el-col>
-          </div>
+          <el-col :span="3">
+            <vue-fab id="fab" mainBtnColor="#783887" size="small" :global-options="globalOptions"
+                     :click-auto-close="false" v-outside-click="outsideClick">
+              <fab-item
+                v-for="(item, index) in buttons"
+                :key="index"
+                :idx="getIdx(index)"
+                :title="item.title"
+                :title-bg-color="item.titleBgColor"
+                :title-color="item.titleColor"
+                :color="item.titleColor"
+                :icon="item.icon"
+                @clickItem="item.click"/>
+            </vue-fab>
+          </el-col>
         </el-row>
       </div>
 
       <!--接口列表-->
-      <el-drawer :visible.sync="apiListVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :modal="false" size="90%">
+      <el-drawer :visible.sync="apiListVisible" :destroy-on-close="true" direction="ltr" :withHeader="false"
+                 :modal="false" size="90%">
         <ms-api-definition :visible="visibleRef" :currentRow="currentRow"/>
-        <el-button style="float: right;margin: 0px 20px 0px" type="primary" @click="pushApiOrCase('REF')">{{$t('api_test.scenario.reference')}}</el-button>
-        <el-button style="float: right;" type="primary" @click="pushApiOrCase('Copy')">{{ $t('commons.copy') }}</el-button>
+        <el-button style="float: right;margin: 0px 20px 0px" type="primary" @click="pushApiOrCase('REF')">
+          {{ $t('api_test.scenario.reference') }}
+        </el-button>
+        <el-button style="float: right;" type="primary" @click="pushApiOrCase('Copy')">{{
+            $t('commons.copy')
+          }}
+        </el-button>
       </el-drawer>
 
       <!--自定义接口-->
-      <el-drawer :visible.sync="customizeVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.customize_req')" style="overflow: auto" :modal="false" size="90%">
+      <el-drawer :visible.sync="customizeVisible" :destroy-on-close="true" direction="ltr" :withHeader="false"
+                 :title="$t('api_test.automation.customize_req')" style="overflow: auto" :modal="false" size="90%">
         <ms-api-customize :request="customizeRequest" @addCustomizeApi="addCustomizeApi"/>
       </el-drawer>
       <!--场景导入 -->
-      <el-drawer :visible.sync="scenarioVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.scenario_import')" style="overflow: auto" :modal="false" size="90%">
+      <el-drawer :visible.sync="scenarioVisible" :destroy-on-close="true" direction="ltr" :withHeader="false"
+                 :title="$t('api_test.automation.scenario_import')" style="overflow: auto" :modal="false" size="90%">
         <ms-import-api-scenario @addScenario="addScenario"/>
       </el-drawer>
 
@@ -223,12 +243,14 @@
       <ms-run :debug="true" :environment="currentEnvironmentId" :reportId="reportId" :run-data="debugData"
               @runRefresh="runRefresh" ref="runTest"/>
       <!-- 调试结果 -->
-      <el-drawer :visible.sync="debugVisible" :destroy-on-close="true" direction="ltr" :withHeader="true" :modal="false" size="90%">
+      <el-drawer :visible.sync="debugVisible" :destroy-on-close="true" direction="ltr" :withHeader="true" :modal="false"
+                 size="90%">
         <ms-api-report-detail :report-id="reportId" :debug="true" :currentProjectId="projectId"/>
       </el-drawer>
 
       <!--场景公共参数-->
-      <ms-scenario-parameters :currentScenario="currentScenario" @addParameters="addParameters" ref="scenarioParameters"/>
+      <ms-scenario-parameters :currentScenario="currentScenario" @addParameters="addParameters"
+                              ref="scenarioParameters"/>
       <!--外部导入-->
       <api-import ref="apiImport" :saved="false" @refresh="apiImport"/>
     </div>
@@ -236,762 +258,778 @@
 </template>
 
 <script>
-  import {API_STATUS, PRIORITY} from "../../definition/model/JsonData";
-  import {WORKSPACE_ID} from '@/common/js/constants';
-  import {Assertions, Extract, IfController, JSR223Processor, ConstantTimer} from "../../definition/model/ApiTestModel";
-  import MsJsr233Processor from "./Jsr233Processor";
-  import {parseEnvironment} from "../../definition/model/EnvironmentModel";
-  import MsConstantTimer from "./ConstantTimer";
-  import MsIfController from "./IfController";
-  import MsApiAssertions from "../../definition/components/assertion/ApiAssertions";
-  import MsApiExtract from "../../definition/components/extract/ApiExtract";
-  import MsApiDefinition from "./api/ApiDefinition";
-  import MsApiComponent from "./ApiComponent";
-  import {ELEMENTS, ELEMENT_TYPE} from "./Setting";
-  import MsApiCustomize from "./ApiCustomize";
-  import {getUUID, getCurrentProjectID} from "@/common/js/utils";
-  import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig";
-  import MsInputTag from "./MsInputTag";
-  import MsRun from "./DebugRun";
-  import MsImportApiScenario from "./ImportApiScenario";
-  import MsApiScenarioComponent from "./ApiScenarioComponent";
-  import MsApiReportDetail from "../report/ApiReportDetail";
-  import MsScenarioParameters from "./ScenarioParameters";
-  import ApiImport from "../../definition/components/import/ApiImport";
-  import InputTag from 'vue-input-tag'
-  import "@/common/css/material-icons.css"
+import {API_STATUS, PRIORITY} from "../../definition/model/JsonData";
+import {WORKSPACE_ID} from '@/common/js/constants';
+import {Assertions, Extract, IfController, JSR223Processor, ConstantTimer} from "../../definition/model/ApiTestModel";
+import MsJsr233Processor from "./Jsr233Processor";
+import {parseEnvironment} from "../../definition/model/EnvironmentModel";
+import MsConstantTimer from "./ConstantTimer";
+import MsIfController from "./IfController";
+import MsApiAssertions from "../../definition/components/assertion/ApiAssertions";
+import MsApiExtract from "../../definition/components/extract/ApiExtract";
+import MsApiDefinition from "./api/ApiDefinition";
+import MsApiComponent from "./ApiComponent";
+import {ELEMENTS, ELEMENT_TYPE} from "./Setting";
+import MsApiCustomize from "./ApiCustomize";
+import {getUUID, getCurrentProjectID} from "@/common/js/utils";
+import ApiEnvironmentConfig from "../../definition/components/environment/ApiEnvironmentConfig";
+import MsInputTag from "./MsInputTag";
+import MsRun from "./DebugRun";
+import MsImportApiScenario from "./ImportApiScenario";
+import MsApiScenarioComponent from "./ApiScenarioComponent";
+import MsApiReportDetail from "../report/ApiReportDetail";
+import MsScenarioParameters from "./ScenarioParameters";
+import ApiImport from "../../definition/components/import/ApiImport";
+import InputTag from 'vue-input-tag'
+import "@/common/css/material-icons.css"
+import OutsideClick from "@/common/js/outside-click";
 
-  export default {
-    name: "EditApiScenario",
-    props: {
-      moduleOptions: Array,
-      currentScenario: {},
-    },
-    components: {
-      ApiEnvironmentConfig,
-      MsScenarioParameters,
-      MsApiReportDetail,
-      MsInputTag, MsRun,
-      MsApiScenarioComponent,
-      MsImportApiScenario,
-      MsJsr233Processor,
-      MsConstantTimer,
-      MsIfController,
-      MsApiAssertions,
-      MsApiExtract,
-      MsApiDefinition,
-      MsApiComponent,
-      MsApiCustomize,
-      ApiImport,
-      InputTag,
-    },
-    data() {
-      return {
-        props: {
-          label: "label",
-          children: "hashTree"
-        },
-        rules: {
-          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'}
-          ],
-          userId: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
-          apiScenarioModuleId: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
-          status: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
-          principal: [{required: true, message: this.$t('api_test.definition.request.responsible'), trigger: 'change'}],
-        },
-        environments: [],
-        currentEnvironmentId: "",
-        maintainerOptions: [],
-        value: API_STATUS[0].id,
-        options: API_STATUS,
-        levels: PRIORITY,
-        scenario: {},
-        loading: false,
-        apiListVisible: false,
-        customizeVisible: false,
-        scenarioVisible: false,
-        debugVisible: false,
-        customizeRequest: {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false},
-        operatingElements: [],
-        currentRow: {cases: [], apis: [], referenced: true},
-        selectedTreeNode: undefined,
-        expandedNode: [],
-        scenarioDefinition: [],
-        path: "/api/automation/create",
-        debugData: {},
-        reportId: "",
-        projectId: "",
-        visibleRef: "",
-        enableCookieShare: false,
+export default {
+  name: "EditApiScenario",
+  props: {
+    moduleOptions: Array,
+    currentScenario: {},
+  },
+  components: {
+    ApiEnvironmentConfig,
+    MsScenarioParameters,
+    MsApiReportDetail,
+    MsInputTag, MsRun,
+    MsApiScenarioComponent,
+    MsImportApiScenario,
+    MsJsr233Processor,
+    MsConstantTimer,
+    MsIfController,
+    MsApiAssertions,
+    MsApiExtract,
+    MsApiDefinition,
+    MsApiComponent,
+    MsApiCustomize,
+    ApiImport,
+    InputTag,
+  },
+  data() {
+    return {
+      props: {
+        label: "label",
+        children: "hashTree"
+      },
+      rules: {
+        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'}
+        ],
+        userId: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
+        apiScenarioModuleId: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
+        status: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
+        principal: [{required: true, message: this.$t('api_test.definition.request.responsible'), trigger: 'change'}],
+      },
+      environments: [],
+      currentEnvironmentId: "",
+      maintainerOptions: [],
+      value: API_STATUS[0].id,
+      options: API_STATUS,
+      levels: PRIORITY,
+      scenario: {},
+      loading: false,
+      apiListVisible: false,
+      customizeVisible: false,
+      scenarioVisible: false,
+      debugVisible: false,
+      customizeRequest: {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false},
+      operatingElements: [],
+      currentRow: {cases: [], apis: [], referenced: true},
+      selectedTreeNode: undefined,
+      expandedNode: [],
+      scenarioDefinition: [],
+      path: "/api/automation/create",
+      debugData: {},
+      reportId: "",
+      projectId: "",
+      visibleRef: "",
+      enableCookieShare: false,
+      globalOptions: {
+        spacing: 30
       }
     }
-    ,
-    created() {
-      if (!this.currentScenario.apiScenarioModuleId) {
-        this.currentScenario.apiScenarioModuleId = "";
+  }
+  ,
+  created() {
+    if (!this.currentScenario.apiScenarioModuleId) {
+      this.currentScenario.apiScenarioModuleId = "";
+    }
+    this.projectId = getCurrentProjectID();
+    this.operatingElements = ELEMENTS.get("ALL");
+    this.getMaintainerOptions();
+    this.getApiScenario();
+  }
+  ,
+  watch: {}
+  ,
+  directives: {OutsideClick},
+  computed: {
+    buttons() {
+      let buttons = [
+        {
+          title: this.$t('api_test.automation.api_list_import'),
+          show: this.showButton("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"),
+          titleColor: "#F56C6C",
+          titleBgColor: "#FCF1F1",
+          icon: "api",
+          click: this.apiListImport
+        }, {
+          title: this.$t('api_test.automation.external_import'),
+          show: this.showButton("OT_IMPORT"),
+          titleColor: "#409EFF",
+          titleBgColor: "#EEF5FE",
+          icon: "next_plan",
+          click: () => {
+            this.addComponent('OT_IMPORT')
+          }
+        }, {
+          title: this.$t('api_test.automation.wait_controller'),
+          show: this.showButton("ConstantTimer"),
+          titleColor: "#67C23A",
+          titleBgColor: "#F2F9EE",
+          icon: "access_time",
+          click: () => {
+            this.addComponent('ConstantTimer')
+          }
+        }, {
+          title: this.$t('api_test.automation.if_controller'),
+          show: this.showButton("IfController"),
+          titleColor: "#E6A23C",
+          titleBgColor: "#FCF6EE",
+          icon: "alt_route",
+          click: () => {
+            this.addComponent('IfController')
+          }
+        }, {
+          title: this.$t('api_test.automation.scenario_import'),
+          show: this.operatingElements.indexOf('scenario') === 0,
+          titleColor: "#606266",
+          titleBgColor: "#F4F4F5",
+          icon: "movie",
+          click: () => {
+            this.addComponent('scenario')
+          }
+        }, {
+          title: this.$t('api_test.automation.customize_script'),
+          show: this.showButton("JSR223Processor"),
+          titleColor: "#7B4D12",
+          titleBgColor: "#F1EEE9",
+          icon: "code",
+          click: () => {
+            this.addComponent('JSR223Processor')
+          }
+        }, {
+          title: this.$t('api_test.automation.customize_req'),
+          show: this.showButton("CustomizeReq"),
+          titleColor: "#008080",
+          titleBgColor: "#EBF2F2",
+          icon: "tune",
+          click: () => {
+            this.addComponent('CustomizeReq')
+          }
+        }, {
+          title: this.$t('api_test.definition.request.pre_script'),
+          show: this.showButton("JSR223PreProcessor"),
+          titleColor: "#B8741A",
+          titleBgColor: "#F9F1EA",
+          icon: "skip_previous",
+          click: () => {
+            this.addComponent('JSR223PreProcessor')
+          }
+        }, {
+          title: this.$t('api_test.definition.request.post_script'),
+          show: this.showButton("JSR223PostProcessor"),
+          titleColor: "#783887",
+          titleBgColor: "#F2ECF3",
+          icon: "skip_next",
+          click: () => {
+            this.addComponent('JSR223PostProcessor')
+          }
+        }, {
+          title: this.$t('api_test.definition.request.assertions_rule'),
+          show: this.showButton("Assertions"),
+          titleColor: "#A30014",
+          titleBgColor: "#F7E6E9",
+          icon: "fact_check",
+          click: () => {
+            this.addComponent('Assertions')
+          }
+        }, {
+          title: this.$t('api_test.definition.request.extract_param'),
+          show: this.showButton("Extract"),
+          titleColor: "#015478",
+          titleBgColor: "#E6EEF2",
+          icon: "colorize",
+          click: () => {
+            this.addComponent('Extract')
+          }
+        }
+      ];
+      return buttons.filter(btn => btn.show);
+    }
+  },
+  methods: {
+    getIdx(index) {
+      return index - 0.33
+    },
+    showButton(...names) {
+      for (const name of names) {
+        if (this.operatingElements.includes(name)) {
+          return true;
+        }
       }
-      this.projectId = getCurrentProjectID();
+      return false;
+    },
+    outsideClick() {
       this.operatingElements = ELEMENTS.get("ALL");
-      this.getMaintainerOptions();
-      this.getApiScenario();
+    },
+    addComponent(type) {
+      switch (type) {
+        case ELEMENT_TYPE.IfController:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new IfController()) :
+            this.scenarioDefinition.push(new IfController());
+          break;
+        case ELEMENT_TYPE.ConstantTimer:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new ConstantTimer()) :
+            this.scenarioDefinition.push(new ConstantTimer());
+          break;
+        case ELEMENT_TYPE.JSR223Processor:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor()) :
+            this.scenarioDefinition.push(new JSR223Processor());
+          break;
+        case ELEMENT_TYPE.JSR223PreProcessor:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor({type: "JSR223PreProcessor"})) :
+            this.scenarioDefinition.push(new JSR223Processor({type: "JSR223PreProcessor"}));
+          break;
+        case ELEMENT_TYPE.JSR223PostProcessor:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor({type: "JSR223PostProcessor"})) :
+            this.scenarioDefinition.push(new JSR223Processor({type: "JSR223PostProcessor"}));
+          break;
+        case ELEMENT_TYPE.Assertions:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new Assertions()) :
+            this.scenarioDefinition.push(new Assertions());
+          break;
+        case ELEMENT_TYPE.Extract:
+          this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new Extract()) :
+            this.scenarioDefinition.push(new Extract());
+          break;
+        case ELEMENT_TYPE.CustomizeReq:
+          this.customizeRequest = {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false};
+          this.customizeVisible = true;
+          break;
+        case ELEMENT_TYPE.scenario:
+          this.scenarioVisible = true;
+          break;
+        default:
+          this.$refs.apiImport.open();
+          break;
+      }
+      this.sort();
+      this.reload();
     }
     ,
-    watch: {}
+    nodeClick(e) {
+      if (e.referenced != 'REF' && e.referenced != 'Deleted') {
+        this.operatingElements = ELEMENTS.get(e.type);
+      } else {
+        this.operatingElements = [];
+      }
+      this.selectedTreeNode = e;
+    }
     ,
-    computed: {
-      buttons() {
-        let buttons = [
-          {
-            title: this.$t('api_test.automation.api_list_import'),
-            show: this.showButton("HTTPSamplerProxy", "DubboSampler", "JDBCSampler", "TCPSampler"),
-            titleColor: "#F56C6C",
-            titleBgColor: "#FCF1F1",
-            icon: "api",
-            click: this.apiListImport
-          }, {
-            title: this.$t('api_test.automation.external_import'),
-            show: this.showButton("OT_IMPORT"),
-            titleColor: "#409EFF",
-            titleBgColor: "#EEF5FE",
-            icon: "next_plan",
-            click: () => {
-              this.addComponent('OT_IMPORT')
-            }
-          }, {
-            title: this.$t('api_test.automation.wait_controller'),
-            show: this.showButton("ConstantTimer"),
-            titleColor: "#67C23A",
-            titleBgColor: "#F2F9EE",
-            icon: "access_time",
-            click: () => {
-              this.addComponent('ConstantTimer')
-            }
-          }, {
-            title: this.$t('api_test.automation.if_controller'),
-            show: this.showButton("IfController"),
-            titleColor: "#E6A23C",
-            titleBgColor: "#FCF6EE",
-            icon: "alt_route",
-            click: () => {
-              this.addComponent('IfController')
-            }
-          }, {
-            title: this.$t('api_test.automation.scenario_import'),
-            show: this.operatingElements.indexOf('scenario') === 0,
-            titleColor: "#606266",
-            titleBgColor: "#F4F4F5",
-            icon: "movie",
-            click: () => {
-              this.addComponent('scenario')
-            }
-          }, {
-            title: this.$t('api_test.automation.customize_script'),
-            show: this.showButton("JSR223Processor"),
-            titleColor: "#7B4D12",
-            titleBgColor: "#F1EEE9",
-            icon: "code",
-            click: () => {
-              this.addComponent('JSR223Processor')
-            }
-          }, {
-            title: this.$t('api_test.automation.customize_req'),
-            show: this.showButton("CustomizeReq"),
-            titleColor: "#008080",
-            titleBgColor: "#EBF2F2",
-            icon: "tune",
-            click: () => {
-              this.addComponent('CustomizeReq')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.pre_script'),
-            show: this.showButton("JSR223PreProcessor"),
-            titleColor: "#B8741A",
-            titleBgColor: "#F9F1EA",
-            icon: "skip_previous",
-            click: () => {
-              this.addComponent('JSR223PreProcessor')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.post_script'),
-            show: this.showButton("JSR223PostProcessor"),
-            titleColor: "#783887",
-            titleBgColor: "#F2ECF3",
-            icon: "skip_next",
-            click: () => {
-              this.addComponent('JSR223PostProcessor')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.assertions_rule'),
-            show: this.showButton("Assertions"),
-            titleColor: "#A30014",
-            titleBgColor: "#F7E6E9",
-            icon: "fact_check",
-            click: () => {
-              this.addComponent('Assertions')
-            }
-          }, {
-            title: this.$t('api_test.definition.request.extract_param'),
-            show: this.showButton("Extract"),
-            titleColor: "#015478",
-            titleBgColor: "#E6EEF2",
-            icon: "colorize",
-            click: () => {
-              this.addComponent('Extract')
-            }
-          }
-        ];
-        return buttons.filter(btn => btn.show);
+    showAll() {
+      this.operatingElements = ELEMENTS.get("ALL");
+      this.selectedTreeNode = undefined;
+      this.reload();
+    }
+    ,
+    apiListImport() {
+      this.visibleRef = getUUID();
+      this.apiListVisible = true;
+    }
+    ,
+    recursiveSorting(arr) {
+      for (let i in arr) {
+        arr[i].index = Number(i) + 1;
+        if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
+          this.recursiveSorting(arr[i].hashTree);
+        }
       }
+    }
+    ,
+    sort() {
+      for (let i in this.scenarioDefinition) {
+        this.scenarioDefinition[i].index = Number(i) + 1;
+        if (this.scenarioDefinition[i].hashTree != undefined && this.scenarioDefinition[i].hashTree.length > 0) {
+          this.recursiveSorting(this.scenarioDefinition[i].hashTree);
+        }
+      }
+    }
+    ,
+    addCustomizeApi(request) {
+      this.customizeVisible = false;
+      request.enable === undefined ? request.enable = true : request.enable;
+      if (this.selectedTreeNode != undefined) {
+        this.selectedTreeNode.hashTree.push(request);
+      } else {
+        this.scenarioDefinition.push(request);
+      }
+      this.customizeRequest = {};
+      this.sort();
+      this.reload();
+    }
+    ,
+    addScenario(arr) {
+      if (arr && arr.length > 0) {
+        arr.forEach(item => {
+          if (item.id === this.currentScenario.id) {
+            this.$error("不能引用或复制自身！");
+            return;
+          }
+          item.enable === undefined ? item.enable = true : item.enable;
+          this.scenarioDefinition.push(item);
+        })
+      }
+      this.sort();
+      this.reload();
+      this.scenarioVisible = false;
+    }
+    ,
+    setApiParameter(item, refType, referenced) {
+      let request = {};
+      if (Object.prototype.toString.call(item.request).indexOf("String") > 0) {
+        request = JSON.parse(item.request);
+      } else {
+        request = item.request;
+      }
+      if (item.protocol) {
+        request.protocol = item.protocol;
+      }
+      request.id = item.id;
+      request.name = item.name;
+      request.refType = refType;
+      request.referenced = referenced;
+      request.enable === undefined ? request.enable = true : request.enable;
+      request.active = false;
+      request.resourceId = getUUID();
+      if (!request.url) {
+        request.url = "";
+      }
+      if (referenced === 'REF' || !request.hashTree) {
+        request.hashTree = [];
+      }
+      if (this.selectedTreeNode != undefined) {
+        this.selectedTreeNode.hashTree.push(request);
+      } else {
+        this.scenarioDefinition.push(request);
+      }
+    }
+    ,
+    pushApiOrCase(referenced) {
+      if (this.currentRow.cases.length === 0 && this.currentRow.apis.length === 0) {
+        this.$warning(this.$t('api_test.automation.reference_info'));
+        return;
+      }
+      this.currentRow.cases.forEach(item => {
+        this.setApiParameter(item, "CASE", referenced);
+      })
+      this.currentRow.apis.forEach(item => {
+        this.setApiParameter(item, "API", referenced);
+      })
+      this.apiListVisible = false;
+      this.currentRow.cases = [];
+      this.currentRow.apis = [];
+      this.sort();
+      this.reload();
+    }
+    ,
+    getMaintainerOptions() {
+      let workspaceId = localStorage.getItem(WORKSPACE_ID);
+      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.maintainerOptions = response.data;
+      });
+    }
+    ,
+    openTagConfig() {
+      if (!this.projectId) {
+        this.$error(this.$t('api_test.select_project'));
+        return;
+      }
+      this.$refs.tag.open();
     },
-    methods: {
-      getIdx(index) {
-        return -1 * index - 2.25; // 为了向下展示菜单
-      },
-      showButton(...names) {
-        for (const name of names) {
-          if (this.operatingElements.includes(name)) {
-            return true;
-          }
-        }
-        return false;
-      },
-      addComponent(type) {
-        switch (type) {
-          case ELEMENT_TYPE.IfController:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new IfController()) :
-              this.scenarioDefinition.push(new IfController());
-            break;
-          case ELEMENT_TYPE.ConstantTimer:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new ConstantTimer()) :
-              this.scenarioDefinition.push(new ConstantTimer());
-            break;
-          case ELEMENT_TYPE.JSR223Processor:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor()) :
-              this.scenarioDefinition.push(new JSR223Processor());
-            break;
-          case ELEMENT_TYPE.JSR223PreProcessor:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor({type: "JSR223PreProcessor"})) :
-              this.scenarioDefinition.push(new JSR223Processor({type: "JSR223PreProcessor"}));
-            break;
-          case ELEMENT_TYPE.JSR223PostProcessor:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new JSR223Processor({type: "JSR223PostProcessor"})) :
-              this.scenarioDefinition.push(new JSR223Processor({type: "JSR223PostProcessor"}));
-            break;
-          case ELEMENT_TYPE.Assertions:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new Assertions()) :
-              this.scenarioDefinition.push(new Assertions());
-            break;
-          case ELEMENT_TYPE.Extract:
-            this.selectedTreeNode != undefined ? this.selectedTreeNode.hashTree.push(new Extract()) :
-              this.scenarioDefinition.push(new Extract());
-            break;
-          case ELEMENT_TYPE.CustomizeReq:
-            this.customizeRequest = {protocol: "HTTP", type: "API", hashTree: [], referenced: 'Created', active: false};
-            this.customizeVisible = true;
-            break;
-          case ELEMENT_TYPE.scenario:
-            this.scenarioVisible = true;
-            break;
-          default:
-            this.$refs.apiImport.open();
-            break;
-        }
-        this.sort();
-        this.reload();
+    remove(row, node) {
+      const parent = node.parent
+      const hashTree = parent.data.hashTree || parent.data;
+      const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
+      hashTree.splice(index, 1);
+      this.sort();
+      this.reload();
+    }
+    ,
+    copyRow(row, node) {
+      const parent = node.parent
+      const hashTree = parent.data.hashTree || parent.data;
+      // 深度复制
+      let obj = JSON.parse(JSON.stringify(row));
+      obj.resourceId = getUUID();
+      hashTree.push(obj);
+      this.sort();
+      this.reload();
+    }
+    ,
+    reload() {
+      this.loading = true
+      this.$nextTick(() => {
+        this.loading = false
+      })
+    }
+    ,
+    runDebug() {
+      /*触发执行操作*/
+      if (!this.currentEnvironmentId) {
+        this.$error(this.$t('api_test.environment.select_environment'));
+        return;
       }
-      ,
-      nodeClick(e) {
-        if (e.referenced != 'REF' && e.referenced != 'Deleted') {
-          this.operatingElements = ELEMENTS.get(e.type);
-        } else {
-          this.operatingElements = [];
-        }
-        this.selectedTreeNode = e;
-      }
-      ,
-      showAll() {
-        this.operatingElements = ELEMENTS.get("ALL");
-        this.selectedTreeNode = undefined;
-        this.reload();
-      }
-      ,
-      apiListImport() {
-        this.visibleRef = getUUID();
-        this.apiListVisible = true;
-      }
-      ,
-      recursiveSorting(arr) {
-        for (let i in arr) {
-          arr[i].index = Number(i) + 1;
-          if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
-            this.recursiveSorting(arr[i].hashTree);
-          }
-        }
-      }
-      ,
-      sort() {
-        for (let i in this.scenarioDefinition) {
-          this.scenarioDefinition[i].index = Number(i) + 1;
-          if (this.scenarioDefinition[i].hashTree != undefined && this.scenarioDefinition[i].hashTree.length > 0) {
-            this.recursiveSorting(this.scenarioDefinition[i].hashTree);
-          }
-        }
-      }
-      ,
-      addCustomizeApi(request) {
-        this.customizeVisible = false;
-        request.enable === undefined ? request.enable = true : request.enable;
-        if (this.selectedTreeNode != undefined) {
-          this.selectedTreeNode.hashTree.push(request);
-        } else {
-          this.scenarioDefinition.push(request);
-        }
-        this.customizeRequest = {};
-        this.sort();
-        this.reload();
-      }
-      ,
-      addScenario(arr) {
-        if (arr && arr.length > 0) {
-          arr.forEach(item => {
-            if (item.id === this.currentScenario.id) {
-              this.$error("不能引用或复制自身！");
-              return;
+      this.debugData = {
+        id: this.currentScenario.id, name: this.currentScenario.name, type: "scenario",
+        variables: this.currentScenario.variables, referenced: 'Created', enableCookieShare: this.enableCookieShare,
+        environmentId: this.currentEnvironmentId, hashTree: this.scenarioDefinition
+      };
+      this.reportId = getUUID().substring(0, 8);
+    }
+    ,
+    getEnvironments() {
+      if (this.projectId) {
+        this.$get('/api/environment/list/' + this.projectId, response => {
+          this.environments = response.data;
+          this.environments.forEach(environment => {
+            parseEnvironment(environment);
+          });
+          let hasEnvironment = false;
+          for (let i in this.environments) {
+            if (this.environments[i].id === this.currentEnvironmentId) {
+              hasEnvironment = true;
+              break;
             }
-            item.enable === undefined ? item.enable = true : item.enable;
-            this.scenarioDefinition.push(item);
-          })
-        }
-        this.sort();
-        this.reload();
-        this.scenarioVisible = false;
-      }
-      ,
-      setApiParameter(item, refType, referenced) {
-        let request = {};
-        if (Object.prototype.toString.call(item.request).indexOf("String") > 0) {
-          request = JSON.parse(item.request);
-        } else {
-          request = item.request;
-        }
-        if (item.protocol) {
-          request.protocol = item.protocol;
-        }
-        request.id = item.id;
-        request.name = item.name;
-        request.refType = refType;
-        request.referenced = referenced;
-        request.enable === undefined ? request.enable = true : request.enable;
-        request.active = false;
-        request.resourceId = getUUID();
-        if (!request.url) {
-          request.url = "";
-        }
-        if (referenced === 'REF' || !request.hashTree) {
-          request.hashTree = [];
-        }
-        if (this.selectedTreeNode != undefined) {
-          this.selectedTreeNode.hashTree.push(request);
-        } else {
-          this.scenarioDefinition.push(request);
-        }
-      }
-      ,
-      pushApiOrCase(referenced) {
-        if (this.currentRow.cases.length === 0 && this.currentRow.apis.length === 0) {
-          this.$warning(this.$t('api_test.automation.reference_info'));
-          return;
-        }
-        this.currentRow.cases.forEach(item => {
-          this.setApiParameter(item, "CASE", referenced);
-        })
-        this.currentRow.apis.forEach(item => {
-          this.setApiParameter(item, "API", referenced);
-        })
-        this.apiListVisible = false;
-        this.currentRow.cases = [];
-        this.currentRow.apis = [];
-        this.sort();
-        this.reload();
-      }
-      ,
-      getMaintainerOptions() {
-        let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-          this.maintainerOptions = response.data;
+          }
+          if (!hasEnvironment) {
+            this.currentEnvironmentId = '';
+          }
         });
       }
-      ,
-      openTagConfig() {
-        if (!this.projectId) {
-          this.$error(this.$t('api_test.select_project'));
-          return;
-        }
-        this.$refs.tag.open();
-      },
-      remove(row, node) {
-        const parent = node.parent
-        const hashTree = parent.data.hashTree || parent.data;
-        const index = hashTree.findIndex(d => d.resourceId != undefined && row.resourceId != undefined && d.resourceId === row.resourceId)
-        hashTree.splice(index, 1);
-        this.sort();
-        this.reload();
+    }
+    ,
+    openEnvironmentConfig() {
+      if (!this.projectId) {
+        this.$error(this.$t('api_test.select_project'));
+        return;
       }
-      ,
-      copyRow(row, node) {
-        const parent = node.parent
-        const hashTree = parent.data.hashTree || parent.data;
-        // 深度复制
-        let obj = JSON.parse(JSON.stringify(row));
-        obj.resourceId = getUUID();
-        hashTree.push(obj);
-        this.sort();
-        this.reload();
+      this.$refs.environmentConfig.open(this.projectId);
+    }
+    ,
+    environmentConfigClose() {
+      this.getEnvironments();
+    }
+    ,
+    allowDrop(draggingNode, dropNode, dropType) {
+      if (dropType != "inner") {
+        return true;
+      } else if (dropType === "inner" && dropNode.data.referenced != 'REF' && dropNode.data.referenced != 'Deleted'
+        && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
+        return true;
       }
-      ,
-      reload() {
-        this.loading = true
-        this.$nextTick(() => {
-          this.loading = false
-        })
+      return false;
+    }
+    ,
+    allowDrag(draggingNode, dropNode, dropType) {
+      this.sort();
+      this.reload();
+    }
+    ,
+    nodeExpand(data) {
+      if (data.resourceId) {
+        this.expandedNode.push(data.resourceId);
       }
-      ,
-      runDebug() {
-        /*触发执行操作*/
-        if (!this.currentEnvironmentId) {
-          this.$error(this.$t('api_test.environment.select_environment'));
-          return;
-        }
-        this.debugData = {
-          id: this.currentScenario.id, name: this.currentScenario.name, type: "scenario",
-          variables: this.currentScenario.variables, referenced: 'Created', enableCookieShare: this.enableCookieShare,
-          environmentId: this.currentEnvironmentId, hashTree: this.scenarioDefinition
-        };
-        this.reportId = getUUID().substring(0, 8);
+    }
+    ,
+    nodeCollapse(data) {
+      if (data.resourceId) {
+        this.expandedNode.splice(this.expandedNode.indexOf(data.resourceId), 1);
       }
-      ,
-      getEnvironments() {
-        if (this.projectId) {
-          this.$get('/api/environment/list/' + this.projectId, response => {
-            this.environments = response.data;
-            this.environments.forEach(environment => {
-              parseEnvironment(environment);
-            });
-            let hasEnvironment = false;
-            for (let i in this.environments) {
-              if (this.environments[i].id === this.currentEnvironmentId) {
-                hasEnvironment = true;
-                break;
-              }
+    }
+    ,
+    getPath(id) {
+      if (id === null) {
+        return null;
+      }
+      let path = this.moduleOptions.filter(function (item) {
+        return item.id === id ? item.path : "";
+      });
+      return path[0].path;
+    }
+    ,
+    setFiles(item, bodyUploadFiles, obj) {
+      if (item.body) {
+        if (item.body.kvs) {
+          item.body.kvs.forEach(param => {
+            if (param.files) {
+              param.files.forEach(item => {
+                if (item.file) {
+                  if (!item.id) {
+                    let fileId = getUUID().substring(0, 12);
+                    item.name = item.file.name;
+                    item.id = fileId;
+                  }
+                  obj.bodyUploadIds.push(item.id);
+                  bodyUploadFiles.push(item.file);
+                }
+              });
             }
-            if (!hasEnvironment) {
-              this.currentEnvironmentId = '';
+          });
+        }
+        if (item.body.binary) {
+          item.body.binary.forEach(param => {
+            if (param.files) {
+              param.files.forEach(item => {
+                if (item.file) {
+                  if (!item.id) {
+                    let fileId = getUUID().substring(0, 12);
+                    item.name = item.file.name;
+                    item.id = fileId;
+                  }
+                  obj.bodyUploadIds.push(item.id);
+                  bodyUploadFiles.push(item.file);
+                }
+              });
             }
           });
         }
       }
-      ,
-      openEnvironmentConfig() {
-        if (!this.projectId) {
-          this.$error(this.$t('api_test.select_project'));
-          return;
+    }
+    ,
+    recursiveFile(arr, bodyUploadFiles, obj) {
+      arr.forEach(item => {
+        this.setFiles(item, bodyUploadFiles, obj);
+        if (item.hashTree != undefined && item.hashTree.length > 0) {
+          this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
         }
-        this.$refs.environmentConfig.open(this.projectId);
-      }
-      ,
-      environmentConfigClose() {
-        this.getEnvironments();
-      }
-      ,
-      allowDrop(draggingNode, dropNode, dropType) {
-        if (dropType != "inner") {
-          return true;
+      });
+    }
+    ,
+    getBodyUploadFiles(obj) {
+      let bodyUploadFiles = [];
+      obj.bodyUploadIds = [];
+      this.scenarioDefinition.forEach(item => {
+        this.setFiles(item, bodyUploadFiles, obj);
+        if (item.hashTree != undefined && item.hashTree.length > 0) {
+          this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
         }
-        else if (dropType === "inner" && dropNode.data.referenced != 'REF' && dropNode.data.referenced != 'Deleted'
-          && ELEMENTS.get(dropNode.data.type).indexOf(draggingNode.data.type) != -1) {
-          return true;
+      })
+      return bodyUploadFiles;
+    }
+    ,
+    editScenario() {
+      this.$refs['currentScenario'].validate((valid) => {
+        if (valid) {
+          this.setParameter();
+          let bodyFiles = this.getBodyUploadFiles(this.currentScenario);
+          this.$fileUpload(this.path, null, bodyFiles, this.currentScenario, response => {
+            this.$success(this.$t('commons.save_success'));
+            this.path = "/api/automation/update";
+            if (response.data) {
+              this.currentScenario.id = response.data.id;
+            }
+            if (this.currentScenario.tags instanceof String) {
+              this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
+            }
+            this.$emit('refresh');
+          })
         }
-        return false;
+      })
+    },
+    getApiScenario() {
+      if (this.currentScenario.tags != undefined && !(this.currentScenario.tags instanceof Array)) {
+        this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
       }
-      ,
-      allowDrag(draggingNode, dropNode, dropType) {
+      if (this.currentScenario.id) {
+        this.result = this.$get("/api/automation/getApiScenario/" + this.currentScenario.id, response => {
+          if (response.data) {
+            this.path = "/api/automation/update";
+            if (response.data.scenarioDefinition != null) {
+              let obj = JSON.parse(response.data.scenarioDefinition);
+              if (obj) {
+                this.currentEnvironmentId = obj.environmentId;
+                this.currentScenario.variables = obj.variables;
+                this.enableCookieShare = obj.enableCookieShare;
+                this.scenarioDefinition = obj.hashTree;
+              }
+            }
+            if (this.currentScenario.copy) {
+              this.path = "/api/automation/create";
+            }
+          }
+          this.getEnvironments();
+        })
+      }
+    }
+    ,
+    setParameter() {
+      this.currentScenario.stepTotal = this.scenarioDefinition.length;
+      this.currentScenario.projectId = getCurrentProjectID();
+      this.currentScenario.modulePath = this.getPath(this.currentScenario.apiScenarioModuleId);
+      // 构建一个场景对象 方便引用处理
+      let scenario = {
+        id: this.currentScenario.id,
+        enableCookieShare: this.enableCookieShare,
+        name: this.currentScenario.name,
+        variables: this.currentScenario.variables,
+        type: "scenario",
+        referenced: 'Created',
+        environmentId: this.currentEnvironmentId,
+        hashTree: this.scenarioDefinition
+      };
+      this.currentScenario.scenarioDefinition = scenario;
+      if (this.currentScenario.tags instanceof Array) {
+        this.currentScenario.tags = JSON.stringify(this.currentScenario.tags);
+      }
+      if (this.currentModule != null) {
+        this.currentScenario.modulePath = this.currentModule.method !== undefined ? this.currentModule.method : null;
+        this.currentScenario.apiScenarioModuleId = this.currentModule.id;
+      }
+      this.currentScenario.projectId = this.projectId;
+    }
+    ,
+    runRefresh() {
+      this.debugVisible = true;
+      this.loading = false;
+    }
+    ,
+    showScenarioParameters() {
+      this.$refs.scenarioParameters.open(this.currentScenario.variables);
+    }
+    ,
+    addParameters(data) {
+      this.currentScenario.variables = data;
+      this.reload();
+    }
+    ,
+    apiImport(importData) {
+      if (importData && importData.data) {
+        importData.data.forEach(item => {
+          this.setApiParameter(item, "API", "OT_IMPORT");
+        })
         this.sort();
         this.reload();
       }
-      ,
-      nodeExpand(data) {
-        if (data.resourceId) {
-          this.expandedNode.push(data.resourceId);
-        }
-      }
-      ,
-      nodeCollapse(data) {
-        if (data.resourceId) {
-          this.expandedNode.splice(this.expandedNode.indexOf(data.resourceId), 1);
-        }
-      }
-      ,
-      getPath(id) {
-        if (id === null) {
-          return null;
-        }
-        let path = this.moduleOptions.filter(function (item) {
-          return item.id === id ? item.path : "";
-        });
-        return path[0].path;
-      }
-      ,
-      setFiles(item, bodyUploadFiles, obj) {
-        if (item.body) {
-          if (item.body.kvs) {
-            item.body.kvs.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    if (!item.id) {
-                      let fileId = getUUID().substring(0, 12);
-                      item.name = item.file.name;
-                      item.id = fileId;
-                    }
-                    obj.bodyUploadIds.push(item.id);
-                    bodyUploadFiles.push(item.file);
-                  }
-                });
-              }
-            });
-          }
-          if (item.body.binary) {
-            item.body.binary.forEach(param => {
-              if (param.files) {
-                param.files.forEach(item => {
-                  if (item.file) {
-                    if (!item.id) {
-                      let fileId = getUUID().substring(0, 12);
-                      item.name = item.file.name;
-                      item.id = fileId;
-                    }
-                    obj.bodyUploadIds.push(item.id);
-                    bodyUploadFiles.push(item.file);
-                  }
-                });
-              }
-            });
-          }
-        }
-      }
-      ,
-      recursiveFile(arr, bodyUploadFiles, obj) {
-        arr.forEach(item => {
-          this.setFiles(item, bodyUploadFiles, obj);
-          if (item.hashTree != undefined && item.hashTree.length > 0) {
-            this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
-          }
-        });
-      }
-      ,
-      getBodyUploadFiles(obj) {
-        let bodyUploadFiles = [];
-        obj.bodyUploadIds = [];
-        this.scenarioDefinition.forEach(item => {
-          this.setFiles(item, bodyUploadFiles, obj);
-          if (item.hashTree != undefined && item.hashTree.length > 0) {
-            this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
-          }
-        })
-        return bodyUploadFiles;
-      }
-      ,
-      editScenario() {
-        this.$refs['currentScenario'].validate((valid) => {
-          if (valid) {
-            this.setParameter();
-            let bodyFiles = this.getBodyUploadFiles(this.currentScenario);
-            this.$fileUpload(this.path, null, bodyFiles, this.currentScenario, response => {
-              this.$success(this.$t('commons.save_success'));
-              this.path = "/api/automation/update";
-              if (response.data) {
-                this.currentScenario.id = response.data.id;
-              }
-              if (this.currentScenario.tags instanceof String) {
-                this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
-              }
-              this.$emit('refresh');
-            })
-          }
-        })
-      },
-      getApiScenario() {
-        if (this.currentScenario.tags != undefined && !(this.currentScenario.tags instanceof Array)) {
-          this.currentScenario.tags = JSON.parse(this.currentScenario.tags);
-        }
-        if (this.currentScenario.id) {
-          this.result = this.$get("/api/automation/getApiScenario/" + this.currentScenario.id, response => {
-            if (response.data) {
-              this.path = "/api/automation/update";
-              if (response.data.scenarioDefinition != null) {
-                let obj = JSON.parse(response.data.scenarioDefinition);
-                if (obj) {
-                  this.currentEnvironmentId = obj.environmentId;
-                  this.currentScenario.variables = obj.variables;
-                  this.enableCookieShare = obj.enableCookieShare;
-                  this.scenarioDefinition = obj.hashTree;
-                }
-              }
-              if (this.currentScenario.copy) {
-                this.path = "/api/automation/create";
-              }
-            }
-            this.getEnvironments();
-          })
-        }
-      }
-      ,
-      setParameter() {
-        this.currentScenario.stepTotal = this.scenarioDefinition.length;
-        this.currentScenario.projectId = getCurrentProjectID();
-        this.currentScenario.modulePath = this.getPath(this.currentScenario.apiScenarioModuleId);
-        // 构建一个场景对象 方便引用处理
-        let scenario = {
-          id: this.currentScenario.id, enableCookieShare: this.enableCookieShare, name: this.currentScenario.name, variables: this.currentScenario.variables,
-          type: "scenario", referenced: 'Created', environmentId: this.currentEnvironmentId, hashTree: this.scenarioDefinition
-        };
-        this.currentScenario.scenarioDefinition = scenario;
-        if (this.currentScenario.tags instanceof Array) {
-          this.currentScenario.tags = JSON.stringify(this.currentScenario.tags);
-        }
-        if (this.currentModule != null) {
-          this.currentScenario.modulePath = this.currentModule.method !== undefined ? this.currentModule.method : null;
-          this.currentScenario.apiScenarioModuleId = this.currentModule.id;
-        }
-        this.currentScenario.projectId = this.projectId;
-      }
-      ,
-      runRefresh() {
-        this.debugVisible = true;
-        this.loading = false;
-      }
-      ,
-      showScenarioParameters() {
-        this.$refs.scenarioParameters.open(this.currentScenario.variables);
-      }
-      ,
-      addParameters(data) {
-        this.currentScenario.variables = data;
-        this.reload();
-      }
-      ,
-      apiImport(importData) {
-        if (importData && importData.data) {
-          importData.data.forEach(item => {
-            this.setApiParameter(item, "API", "OT_IMPORT");
-          })
-          this.sort();
-          this.reload();
-        }
-      }
     }
   }
+}
 </script>
 
 <style scoped>
-  .ms-scenario-input {
-    width: 100%;
-  }
+.card-content {
+  height: calc(100vh - 196px);
+  overflow-y: auto;
+}
 
-  .ms-main-div {
-    background-color: white;
-  }
+.ms-scenario-input {
+  width: 100%;
+}
 
-  .ms-opt-btn {
-    float: right;
-    margin-right: 20px;
-  }
+.ms-main-div {
+  background-color: white;
+}
 
-  .ms-debug-div {
-    margin-left: 20px;
-    border: 1px #DCDFE6 solid;
-    border-radius: 4px;
-    margin-right: 10px;
-  }
+.ms-opt-btn {
+  float: right;
+  margin-right: 20px;
+}
 
-  .ms-scenario-button {
-    margin-left: 30%;
-    padding: 7px;
-  }
+.ms-debug-div {
+  border: 1px #DCDFE6 solid;
+  border-radius: 4px;
+  margin-right: 20px;
+}
 
-  .tip {
-    padding: 3px 5px;
-    font-size: 16px;
-    border-radius: 4px;
-    border-left: 4px solid #783887;
-  }
+.ms-scenario-button {
+  margin-left: 30%;
+  padding: 7px;
+}
 
-  .ms-api-col {
-    background-color: #7C3985;
-    border-color: #7C3985;
-    margin-right: 10px;
-    color: white;
-  }
+.tip {
+  padding: 3px 5px;
+  font-size: 16px;
+  border-radius: 4px;
+  border-left: 4px solid #783887;
+}
 
-  .ms-font {
-    color: #303133;
-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
-    font-size: 13px;
-  }
+.ms-api-col {
+  background-color: #7C3985;
+  border-color: #7C3985;
+  margin-right: 10px;
+  color: white;
+}
 
-  .ms-col-one {
-    margin-top: 5px;
-  }
+.ms-font {
+  color: #303133;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+  font-size: 13px;
+}
 
-  #fab {
-    bottom: unset;
-    right: 90px;
-    z-index: 5;
-  }
+.ms-col-one {
+  margin-top: 5px;
+}
 
-  /deep/ .el-tree-node__content {
-    height: 100%;
-    margin-top: 8px;
-    vertical-align: center;
-  }
+#fab {
+  right: 90px;
+  z-index: 5;
+}
 
-  /deep/ .el-card__body {
-    padding: 15px;
-  }
+/deep/ .el-tree-node__content {
+  height: 100%;
+  margin-top: 8px;
+  vertical-align: center;
+}
 
-  /deep/ .el-drawer__body {
-    overflow: auto;
-  }
+/deep/ .el-card__body {
+  padding: 15px;
+}
 
-  /deep/ .el-step__icon.is-text {
-    border: 1px solid;
-  }
+/deep/ .el-drawer__body {
+  overflow: auto;
+}
 
-  /deep/ .el-drawer__header {
-    margin-bottom: 0px;
-  }
+/deep/ .el-step__icon.is-text {
+  border: 1px solid;
+}
 
-  /deep/ .el-link {
-    font-weight: normal;
-  }
+/deep/ .el-drawer__header {
+  margin-bottom: 0px;
+}
 
-  /deep/ .el-checkbox {
-    color: #303133;
-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
-    font-size: 13px;
-    font-weight: normal;
-  }
+/deep/ .el-link {
+  font-weight: normal;
+}
 
-  /deep/ .el-checkbox__label {
-    padding-left: 5px;
-  }
+/deep/ .el-checkbox {
+  color: #303133;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+}
 
-  .head {
-    border-bottom: 1px solid #303133;
-    color: #303133;
-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
-    font-size: 13px;
-  }
+/deep/ .el-checkbox__label {
+  padding-left: 5px;
+}
+
+.head {
+  border-bottom: 1px solid #303133;
+  color: #303133;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", Arial, sans-serif;
+  font-size: 13px;
+}
 </style>
diff --git a/frontend/src/common/js/outside-click.js b/frontend/src/common/js/outside-click.js
new file mode 100644
index 0000000000..7431be960d
--- /dev/null
+++ b/frontend/src/common/js/outside-click.js
@@ -0,0 +1,31 @@
+const OutsideClick = {
+  // 初始化指令
+  bind(el, binding, vnode) {
+    function documentHandler(e) {
+      // 这里判断点击的元素是否是本身，是本身，则返回
+      if (el.contains(e.target)) {
+        return false;
+      }
+      // 判断指令中是否绑定了函数
+      if (binding.expression) {
+        // 如果绑定了函数 则调用那个函数，此处binding.value就是handleClose方法
+        binding.value(e);
+      }
+    }
+
+    // 给当前元素绑定个私有变量，方便在unbind中可以解除事件监听
+    el.__vueClickOutside__ = documentHandler;
+    document.addEventListener('click', documentHandler);
+  },
+  update() {
+  },
+  unbind(el, binding) {
+    // 解除事件监听
+    document.removeEventListener('click', el.__vueClickOutside__);
+    delete el.__vueClickOutside__;
+  },
+};
+
+export default OutsideClick;
+
+

From 79d38eb9d8d0ecc06879ea058b9ef5a497f01c22 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Thu, 24 Dec 2020 12:09:18 +0800
Subject: [PATCH 8/8] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 79 ++++++++++---------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 564b195bff..5b8acd388c 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-card class="card-content">
-    <div>
+  <el-card>
+    <div class="card-content">
       <div class="ms-main-div" @click="showAll">
         <el-row>
           <el-col>
@@ -14,28 +14,28 @@
         <el-form :model="currentScenario" label-position="right" label-width="80px" size="small" :rules="rules" ref="currentScenario" style="margin-right: 20px">
           <!-- 基础信息 -->
           <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('commons.name')" prop="name">
                 <el-input class="ms-scenario-input" size="small" v-model="currentScenario.name"/>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('test_track.module.module')" prop="apiScenarioModuleId">
                 <el-select class="ms-scenario-input" size="small" v-model="currentScenario.apiScenarioModuleId">
                   <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('commons.status')" prop="status">
                 <el-select class="ms-scenario-input" size="small" v-model="currentScenario.status">
                   <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+          </el-row>
+          <el-row>
+            <el-col :span="7">
               <el-form-item :label="$t('api_test.definition.request.responsible')" prop="principal">
                 <el-select v-model="currentScenario.principal"
                            :placeholder="$t('api_test.definition.request.responsible')" filterable size="small"
@@ -47,20 +47,16 @@
                     :value="item.id">
                   </el-option>
                 </el-select>
-
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('test_track.case.priority')" prop="level">
                 <el-select class="ms-scenario-input" size="small" v-model="currentScenario.level">
                   <el-option v-for="item in levels" :key="item.id" :label="item.label" :value="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('api_test.automation.follow_people')" prop="followPeople">
                 <el-select v-model="currentScenario.followPeople"
                            :placeholder="$t('api_test.automation.follow_people')" filterable size="small"
@@ -76,14 +72,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item label="Tag" prop="tags">
                 <ms-input-tag :currentScenario="currentScenario" ref="tag"/>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item :label="$t('commons.description')" prop="description">
                 <el-input class="ms-http-textarea"
                           v-model="currentScenario.description"
@@ -181,22 +176,21 @@
             </div>
           </el-col>
           <!-- 按钮列表 -->
-          <div>
-            <el-col :span="3">
-              <vue-fab id="fab" mainBtnColor="#783887" :click-auto-close="false">
-                <fab-item
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  :idx="getIdx(index)"
-                  :title="item.title"
-                  :title-bg-color="item.titleBgColor"
-                  :title-color="item.titleColor"
-                  :color="item.titleColor"
-                  :icon="item.icon"
-                  @clickItem="item.click"/>
-              </vue-fab>
-            </el-col>
-          </div>
+          <el-col :span="3">
+            <vue-fab id="fab" mainBtnColor="#783887" size="small" :global-options="globalOptions"
+                     :click-auto-close="false" v-outside-click="outsideClick">
+              <fab-item
+                v-for="(item, index) in buttons"
+                :key="index"
+                :idx="getIdx(index)"
+                :title="item.title"
+                :title-bg-color="item.titleBgColor"
+                :title-color="item.titleColor"
+                :color="item.titleColor"
+                :icon="item.icon"
+                @clickItem="item.click"/>
+            </vue-fab>
+          </el-col>
         </el-row>
       </div>
 
@@ -241,7 +235,6 @@
   import MsIfController from "./IfController";
   import MsApiAssertions from "../../definition/components/assertion/ApiAssertions";
   import MsApiExtract from "../../definition/components/extract/ApiExtract";
-  import MsApiDefinition from "./api/ApiDefinition";
   import MsApiComponent from "./ApiComponent";
   import {ELEMENTS, ELEMENT_TYPE} from "./Setting";
   import MsApiCustomize from "./ApiCustomize";
@@ -256,6 +249,7 @@
   import ApiImport from "../../definition/components/import/ApiImport";
   import InputTag from 'vue-input-tag'
   import "@/common/css/material-icons.css"
+  import OutsideClick from "@/common/js/outside-click";
   import ScenarioApiRelevance from "./api/ScenarioApiRelevance";
 
   export default {
@@ -321,6 +315,9 @@
         reportId: "",
         projectId: "",
         enableCookieShare: false,
+        globalOptions: {
+          spacing: 30
+        }
       }
     }
     ,
@@ -336,6 +333,7 @@
     ,
     watch: {}
     ,
+    directives: {OutsideClick},
     computed: {
       buttons() {
         let buttons = [
@@ -443,7 +441,7 @@
     },
     methods: {
       getIdx(index) {
-        return -1 * index - 2.25; // 为了向下展示菜单
+        return index - 0.33
       },
       showButton(...names) {
         for (const name of names) {
@@ -453,6 +451,9 @@
         }
         return false;
       },
+      outsideClick() {
+        this.operatingElements = ELEMENTS.get("ALL");
+      },
       addComponent(type) {
         switch (type) {
           case ELEMENT_TYPE.IfController:
@@ -881,6 +882,10 @@
 </script>
 
 <style scoped>
+  .card-content {
+    height: calc(100vh - 196px);
+    overflow-y: auto;
+  }
   .ms-scenario-input {
     width: 100%;
   }
@@ -895,10 +900,9 @@
   }
 
   .ms-debug-div {
-    margin-left: 20px;
     border: 1px #DCDFE6 solid;
     border-radius: 4px;
-    margin-right: 10px;
+    margin-right: 20px;
   }
 
   .ms-scenario-button {
@@ -931,7 +935,6 @@
   }
 
   #fab {
-    bottom: unset;
     right: 90px;
     z-index: 5;
   }