From 561c9fea715490b551dee8b418e054547f5c4ee7 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 1 Feb 2021 14:35:53 +0800
Subject: [PATCH 01/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/ApiScenarioModule.vue |  50 ++-
 .../scenario/common/ScenarioImport.vue        | 299 ++++++++++++++++++
 frontend/src/i18n/en-US.js                    |   2 +
 frontend/src/i18n/zh-CN.js                    |   6 +-
 frontend/src/i18n/zh-TW.js                    |   2 +
 5 files changed, 353 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 0e1401ebc6..8d6e06a246 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -15,11 +15,28 @@
       ref="nodeTree">
 
       <template v-slot:header>
-        <el-input :placeholder="$t('test_track.module.search')" v-model="condition.filterText" size="small">
+        <!--<el-input :placeholder="$t('test_track.module.search')" v-model="condition.filterText" size="small">-->
+        <!--<template v-slot:append>-->
+        <!--<el-button v-if="!isReadOnly" icon="el-icon-folder-add" @click="addScenario" v-tester/>-->
+        <!--</template>-->
+        <!--</el-input>-->
+
+        <el-input class="filter-input" :class="{'read-only': isReadOnly}" :placeholder="$t('test_track.module.search')" v-model="condition.filterText"
+                  size="small">
           <template v-slot:append>
-            <el-button v-if="!isReadOnly" icon="el-icon-folder-add" @click="addScenario" v-tester/>
+            <el-dropdown v-if="!isReadOnly" size="small" split-button type="primary" class="ms-api-button" @click="handleCommand('add-api')"
+                         v-tester
+                         @command="handleCommand">
+              <el-button icon="el-icon-folder-add" @click="addScenario"></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="add-scenario">{{ $t('api_test.automation.add_scenario') }}</el-dropdown-item>
+                <el-dropdown-item command="import">{{ $t('api_test.api_import.label') }}</el-dropdown-item>
+                <el-dropdown-item command="export">{{ $t('report.export') }}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-input>
+
         <module-trash-button v-if="!isReadOnly" :condition="condition" :exe="enableTrash"/>
       </template>
 
@@ -29,8 +46,9 @@
       @saveAsEdit="saveAsEdit"
       @refresh="refresh"
       ref="basisScenario"/>
-  </div>
 
+    <api-import ref="apiImport" :moduleOptions="moduleOptions" @refresh="$emit('refresh')"/>
+  </div>
 </template>
 
 <script>
@@ -40,6 +58,7 @@
   import MsNodeTree from "../../../track/common/NodeTree";
   import {buildNodePath} from "../../definition/model/NodeTree";
   import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
+  import ApiImport from "./common/ScenarioImport";
 
   export default {
     name: 'MsApiScenarioModule',
@@ -48,6 +67,7 @@
       MsNodeTree,
       MsAddBasisScenario,
       SelectMenu,
+      ApiImport
     },
     props: {
       isReadOnly: {
@@ -77,6 +97,7 @@
         projectId: "",
         data: [],
         currentModule: undefined,
+        moduleOptions: [],
       }
     },
     mounted() {
@@ -98,7 +119,28 @@
       }
     },
     methods: {
-
+      handleCommand(e) {
+        switch (e) {
+          case "add-scenario":
+            this.addScenario();
+            break;
+          case "import":
+            this.result = this.$get("/api/automation/module/list/" + getCurrentProjectID(), response => {
+              if (response.data != undefined && response.data != null) {
+                this.data = response.data;
+                let moduleOptions = [];
+                this.data.forEach(node => {
+                  buildNodePath(node, {path: ''}, moduleOptions);
+                });
+                this.moduleOptions = moduleOptions
+              }
+            });
+            this.$refs.apiImport.open(this.currentModule);
+            break;
+          case "export":
+            break;
+        }
+      },
       list() {
         let url = undefined;
         if (this.isPlanModel) {
diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
new file mode 100644
index 0000000000..bce49719e3
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -0,0 +1,299 @@
+<template>
+  <el-dialog :close-on-click-modal="false" :title="$t('api_test.api_import.title')" width="30%"
+             :visible.sync="visible" class="api-import" v-loading="result.loading" @close="close">
+
+    <div class="header-bar">
+      <div>{{ $t('api_test.api_import.data_format') }}</div>
+      <el-radio-group v-model="selectedPlatformValue">
+        <el-radio v-for="(item, index) in platforms" :key="index" :label="item.value">{{ item.name }}</el-radio>
+      </el-radio-group>
+
+      <div class="operate-button">
+        <el-button class="save-button" type="primary" plain @click="save">
+          {{ $t('commons.save') }}
+        </el-button>
+        <el-button class="cancel-button" type="warning" plain @click="visible = false">
+          {{ $t('commons.cancel') }}
+        </el-button>
+      </div>
+    </div>
+
+    <el-form :model="formData" :rules="rules" label-width="100px" v-loading="result.loading" ref="form">
+      <el-row>
+        <el-col :span="11">
+          <el-form-item :label="$t('commons.import_module')">
+            <el-select size="small" v-model="formData.moduleId" class="project-select" clearable>
+              <el-option v-for="item in moduleOptions" :key="item.id" :label="item.path" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('commons.import_mode')">
+            <el-select size="small" v-model="formData.modeId" class="project-select" clearable>
+              <el-option v-for="item in modeOptions" :key="item.id" :label="item.name" :value="item.id"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="1">
+          <el-divider direction="vertical"/>
+        </el-col>
+
+      </el-row>
+    </el-form>
+
+    <div class="format-tip">
+      <div>
+        <span>{{ $t('api_test.api_import.tip') }}：{{ selectedPlatform.tip }}</span>
+      </div>
+      <div>
+        <span>{{ $t('api_test.api_import.export_tip') }}：{{ selectedPlatform.exportTip }}</span>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+  import {listenGoBack, removeGoBackListener, getCurrentProjectID} from "@/common/js/utils";
+  import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
+
+  export default {
+    name: "ScenarioImport",
+    components: {MsDialogFooter},
+    props: {
+      saved: {
+        type: Boolean,
+        default: true,
+      },
+      moduleOptions: {}
+    },
+    data() {
+      return {
+        visible: false,
+        swaggerUrlEable: false,
+        swaggerSynchronization: false,
+        showEnvironmentSelect: true,
+        modeOptions: [{
+          id: 'fullCoverage',
+          name: this.$t('commons.cover')
+        },
+          {
+            id: 'incrementalMerge',
+            name: this.$t('commons.not_cover')
+          }],
+        protocol: "",
+        platforms: [
+          {
+            name: 'Metersphere',
+            value: 'Metersphere',
+            tip: this.$t('api_test.api_import.ms_tip'),
+            exportTip: this.$t('api_test.api_import.ms_export_tip'),
+            suffixes: new Set(['json'])
+          },
+          {
+            name: 'Postman',
+            value: 'Postman',
+            tip: this.$t('api_test.api_import.postman_tip'),
+            exportTip: this.$t('api_test.api_import.post_export_tip'),
+            suffixes: new Set(['json'])
+          },
+          {
+            name: 'Jmeter',
+            value: 'Jmeter',
+            tip: this.$t('api_test.api_import.jmeter_tip'),
+            exportTip: this.$t('api_test.api_import.jmeter_export_tip'),
+            suffixes: new Set(['json'])
+          }
+        ],
+        selectedPlatform: {},
+        selectedPlatformValue: 'Metersphere',
+        result: {},
+        projects: [],
+        environments: [],
+        useEnvironment: false,
+        formData: {
+          file: undefined,
+          swaggerUrl: '',
+          modeId: this.$t('commons.not_cover'),
+          moduleId: '',
+        },
+        rules: {},
+        currentModule: {},
+        fileList: []
+      }
+    },
+    activated() {
+      this.selectedPlatform = this.platforms[0];
+    },
+    watch: {
+      selectedPlatformValue() {
+        for (let i in this.platforms) {
+          if (this.platforms[i].value === this.selectedPlatformValue) {
+            this.selectedPlatform = this.platforms[i];
+            break;
+          }
+        }
+      },
+    },
+    methods: {
+      scheduleEdit() {
+        if (!this.formData.swaggerUrl) {
+          this.$warning(this.$t('commons.please_fill_path'));
+          this.swaggerSynchronization = !this.swaggerSynchronization
+        } else {
+          if (this.swaggerSynchronization) {
+            this.$refs.scheduleEdit.open(this.buildParam());
+          }
+        }
+      },
+      scheduleEditByText() {
+        this.$refs.scheduleEdit.open(this.buildParam());
+      },
+      open(module) {
+        this.currentModule = module;
+        this.visible = true;
+        listenGoBack(this.close);
+
+      },
+      upload(file) {
+        this.formData.file = file.file;
+      },
+      handleExceed(files, fileList) {
+        this.$warning(this.$t('test_track.case.import.upload_limit_count'));
+      },
+      handleRemove(file, fileList) {
+        this.formData.file = undefined;
+      },
+      uploadValidate(file, fileList) {
+        let suffix = file.name.substring(file.name.lastIndexOf('.') + 1);
+        if (this.selectedPlatform.suffixes && !this.selectedPlatform.suffixes.has(suffix)) {
+          this.$warning(this.$t('api_test.api_import.suffixFormatErr'));
+          return false;
+        }
+        if (file.size / 1024 / 1024 > 20) {
+          this.$warning(this.$t('test_track.case.import.upload_limit_size'));
+          return false;
+        }
+        return true;
+      },
+      save() {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            if ((this.selectedPlatformValue != 'Swagger2' || (this.selectedPlatformValue == 'Swagger2' && !this.swaggerUrlEable)) && !this.formData.file) {
+              this.$warning(this.$t('commons.please_upload'));
+              return;
+            }
+            let param = this.buildParam();
+            this.result = this.$fileUpload('/api/definition/import', param.file, null, this.buildParam(), response => {
+              let res = response.data;
+              this.$success(this.$t('test_track.case.import.success'));
+              this.visible = false;
+              this.$emit('refresh', res);
+            });
+          } else {
+            return false;
+          }
+        });
+      },
+      buildParam() {
+        let param = {};
+        Object.assign(param, this.formData);
+        param.platform = this.selectedPlatformValue;
+        param.saved = this.saved;
+        console.log(this.formData.moduleId)
+        if (this.currentModule) {
+          param.moduleId = this.formData.moduleId
+          this.moduleOptions.filter(item => {
+            if (item.id === this.formData.moduleId) {
+              param.modulePath = item.path
+            }
+          })
+          param.modeId = this.formData.modeId
+        }
+        param.projectId = getCurrentProjectID();
+        if (!this.swaggerUrlEable) {
+          param.swaggerUrl = undefined;
+        }
+        return param;
+      },
+      close() {
+        this.formData = {
+          file: undefined,
+          swaggerUrl: ''
+        };
+        this.fileList = [];
+        removeGoBackListener(this.close);
+        this.visible = false;
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  .api-import >>> .el-dialog {
+    min-width: 700px;
+  }
+
+  .format-tip {
+    background: #EDEDED;
+  }
+
+  .api-upload {
+    text-align: center;
+    margin: auto 0;
+  }
+
+  .api-upload >>> .el-upload {
+    width: 100%;
+    max-width: 350px;
+  }
+
+  .api-upload >>> .el-upload-dragger {
+    width: 100%;
+  }
+
+  .el-radio-group {
+    margin: 10px 0;
+  }
+
+  .header-bar, .format-tip, .el-form {
+    border: solid #E1E1E1 1px;
+    margin: 10px 0;
+    padding: 10px;
+    border-radius: 3px;
+  }
+
+  .header-bar {
+    padding: 10px 30px;
+  }
+
+  .api-import >>> .el-dialog__body {
+    padding: 15px 25px;
+  }
+
+  .operate-button {
+    float: right;
+  }
+
+  .save-button {
+    margin-left: 10px;
+  }
+
+  .el-form {
+    padding: 30px 10px;
+  }
+
+  .dialog-footer {
+    float: right;
+  }
+
+  .swagger-url-disable {
+    margin-top: 10px;
+
+    margin-left: 80px;
+  }
+
+  .el-divider {
+    height: 200px;
+  }
+
+</style>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index b57556fa94..26fa648f50 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -839,6 +839,8 @@ export default {
       postman_tip: "Only Postman Collection V2.1 json files are supported",
       postman_export_tip: "Export the test collection by Postman",
       swagger_export_tip: "Export jSON-formatted files via Swagger website",
+      jmeter_export_tip: "Generating JMX file through JMeter",
+      jmeter_tip: "JMX files supporting JMeter 5.2",
       suffixFormatErr: "The file format does not meet the requirements",
       swagger_url_import: "Import using URL",
       timing_synchronization: "Timing synchronization",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 01c88a49b7..e1ee5aa355 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -1,7 +1,7 @@
 export default {
   commons: {
-    cover:'覆盖',
-    not_cover:'不覆盖',
+    cover: '覆盖',
+    not_cover: '不覆盖',
     import_mode: '导入模式',
     import_module: '导入模块',
     please_fill_in_the_template: '请填写模版内容',
@@ -842,6 +842,8 @@ export default {
       swagger_tip: "支持 Swagger 2.0 与 3.0 版本的 json 文件",
       post_export_tip: "通过 Postman 导出测试集合",
       swagger_export_tip: "通过 Swagger 页面导出",
+      jmeter_export_tip: "通过 Jmeter 生成JMX文件",
+      jmeter_tip: "支持 Jmeter 5.2版本的JMX 文件",
       suffixFormatErr: "文件格式不符合要求",
       swagger_url_import: "使用URL导入",
       timing_synchronization: "定时同步",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6d81c01325..800d669171 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -841,6 +841,8 @@ export default {
       swagger_tip: "支持 Swagger 2.0 與 3.0 版本的 json 文件",
       post_export_tip: "通過 Postman 導出測試集合",
       swagger_export_tip: "通過 Swagger 頁面導出",
+      jmeter_export_tip: "通過 Jmeter 生成JMX文件",
+      jmeter_tip: "支持 Jmeter 5.2版本的JMX 文件",
       suffixFormatErr: "文件格式不符合要求",
       swagger_url_import: "使用URL導入",
       timing_synchronization: "定時同步",

From c74e88c3f35ded84389672565d2519e02146ec94 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 2 Feb 2021 17:46:00 +0800
Subject: [PATCH 02/23] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=20m?=
 =?UTF-8?q?s=EF=BC=8Cpostman=20=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAutomationController.java   |  17 +-
 .../dto/automation/parse/MsPostmanParser.java | 205 ++++++++++++++++++
 .../automation/parse/MsScenarioParser.java    |  65 ++++++
 .../dto/automation/parse/ScenarioImport.java  |  12 +
 .../parse/ScenarioImportAbstractParser.java   | 169 +++++++++++++++
 .../parse/ScenarioImportParser.java           |   9 +
 .../parse/ScenarioImportParserFactory.java    |  18 ++
 .../request/variable/ScenarioVariable.java    |   7 +
 .../api/service/ApiAutomationService.java     | 122 ++++++++++-
 .../api/service/ApiScenarioModuleService.java |  27 +++
 .../api/automation/ApiAutomation.vue          |  38 +++-
 .../automation/scenario/ApiScenarioModule.vue |   1 +
 .../scenario/common/ScenarioImport.vue        |  19 +-
 13 files changed, 689 insertions(+), 20 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/MsPostmanParser.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImport.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportAbstractParser.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParser.java
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index c23f768f05..85b20fa4e4 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -2,14 +2,15 @@ package io.metersphere.api.controller;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import io.metersphere.api.dto.ApiTestImportRequest;
 import io.metersphere.api.dto.JmxInfoDTO;
 import io.metersphere.api.dto.automation.*;
+import io.metersphere.api.dto.automation.parse.ScenarioImport;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.base.domain.ApiScenario;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.Schedule;
-import io.metersphere.commons.constants.ApiRunMode;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
@@ -43,6 +44,13 @@ public class ApiAutomationController {
         return PageUtils.setPageInfo(page, apiAutomationService.list(request));
     }
 
+    @PostMapping("/list/all")
+    @RequiresRoles(value = {RoleConstants.TEST_MANAGER, RoleConstants.TEST_USER, RoleConstants.TEST_VIEWER}, logical = Logical.OR)
+    public List<ApiScenarioWithBLOBs> list(@RequestBody ApiScenarioRequest request) {
+        request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId());
+        return apiAutomationService.get(request);
+    }
+
     @PostMapping(value = "/create")
     public ApiScenario create(@RequestPart("request") SaveApiScenarioRequest request, @RequestPart(value = "files") List<MultipartFile> bodyFiles) {
         return apiAutomationService.create(request, bodyFiles);
@@ -146,5 +154,12 @@ public class ApiAutomationController {
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileOperationRequest.getName() + "\"")
                 .body(bytes);
     }
+
+    @PostMapping(value = "/import", consumes = {"multipart/form-data"})
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public ScenarioImport scenarioImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
+        return apiAutomationService.scenarioImport(file, request);
+    }
+
 }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsPostmanParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsPostmanParser.java
new file mode 100644
index 0000000000..f88bfc339d
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsPostmanParser.java
@@ -0,0 +1,205 @@
+package io.metersphere.api.dto.automation.parse;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import io.metersphere.api.dto.ApiTestImportRequest;
+import io.metersphere.api.dto.definition.request.MsScenario;
+import io.metersphere.api.dto.definition.request.MsTestElement;
+import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
+import io.metersphere.api.dto.parse.postman.*;
+import io.metersphere.api.dto.scenario.Body;
+import io.metersphere.api.dto.scenario.KeyValue;
+import io.metersphere.base.domain.ApiScenarioModule;
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.commons.constants.MsRequestBodyType;
+import io.metersphere.commons.constants.PostmanRequestBodyMode;
+import io.metersphere.commons.constants.VariableTypeConstants;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+public class MsPostmanParser extends ScenarioImportAbstractParser {
+
+    @Override
+    public ScenarioImport parse(InputStream source, ApiTestImportRequest request) {
+        String testStr = getApiTestStr(source);
+        PostmanCollection postmanCollection = JSON.parseObject(testStr, PostmanCollection.class);
+        List<PostmanKeyValue> variables = postmanCollection.getVariable();
+        ScenarioImport scenarioImport = new ScenarioImport();
+        // 场景步骤
+        LinkedList<MsTestElement> apiScenarioWithBLOBs = new LinkedList<>();
+        PostmanCollectionInfo info = postmanCollection.getInfo();
+        ApiScenarioWithBLOBs scenario = new ApiScenarioWithBLOBs();
+        scenario.setName(info.getName());
+
+        MsScenario msScenario = new MsScenario();
+        msScenario.setName(info.getName());
+        this.projectId = request.getProjectId();
+        parseItem(postmanCollection.getItem(), variables, msScenario, apiScenarioWithBLOBs);
+        // 生成场景对象
+        List<ApiScenarioWithBLOBs> scenarioWithBLOBs = new LinkedList<>();
+        paseScenario(scenarioWithBLOBs, msScenario, request);
+        scenarioImport.setData(scenarioWithBLOBs);
+        return scenarioImport;
+    }
+
+    private void paseScenario(List<ApiScenarioWithBLOBs> scenarioWithBLOBsList, MsScenario msScenario, ApiTestImportRequest request) {
+        ApiScenarioModule module = buildModule(getSelectModule(request.getModuleId()), msScenario.getName());
+        ApiScenarioWithBLOBs scenarioWithBLOBs = new ApiScenarioWithBLOBs();
+        scenarioWithBLOBs.setName(msScenario.getName());
+        scenarioWithBLOBs.setProjectId(request.getProjectId());
+        if (msScenario != null && CollectionUtils.isNotEmpty(msScenario.getHashTree())) {
+            scenarioWithBLOBs.setStepTotal(msScenario.getHashTree().size());
+        }
+        if (module != null) {
+            scenarioWithBLOBs.setApiScenarioModuleId(module.getId());
+            scenarioWithBLOBs.setModulePath("/" + module.getName());
+        }
+        scenarioWithBLOBs.setId(UUID.randomUUID().toString());
+        scenarioWithBLOBs.setScenarioDefinition(JSON.toJSONString(msScenario));
+        scenarioWithBLOBsList.add(scenarioWithBLOBs);
+    }
+
+    private void parseItem(List<PostmanItem> items, List<PostmanKeyValue> variables, MsScenario scenario, LinkedList<MsTestElement> results) {
+        for (PostmanItem item : items) {
+            List<PostmanItem> childItems = item.getItem();
+            if (childItems != null) {
+                parseItem(childItems, variables, scenario, results);
+            } else {
+                MsHTTPSamplerProxy request = parsePostman(item);
+                if (request != null) {
+                    results.add(request);
+                }
+            }
+        }
+        scenario.setVariables(parseScenarioVariable(variables));
+        scenario.setHashTree(results);
+    }
+
+    private MsHTTPSamplerProxy parsePostman(PostmanItem requestItem) {
+        PostmanRequest requestDesc = requestItem.getRequest();
+        if (requestDesc == null) {
+            return null;
+        }
+        requestDesc.getAuth(); // todo 认证方式等待优化
+        PostmanUrl url = requestDesc.getUrl();
+        MsHTTPSamplerProxy request = buildRequest(requestItem.getName(), url.getRaw(), requestDesc.getMethod());
+        if (StringUtils.isNotBlank(request.getPath())) {
+            String path = request.getPath().split("\\?")[0];
+            path = path.replace("{{", "${");
+            path = path.replace("}}", "}");
+            request.setPath(path);
+        } else {
+            request.setPath("/");
+        }
+        parseBody(request.getBody(), requestDesc);
+        request.setArguments(parseKeyValue(url.getQuery()));
+        request.setHeaders(parseKeyValue(requestDesc.getHeader()));
+        addBodyHeader(request);
+        addPreScript(request, requestItem.getEvent());
+        return request;
+    }
+
+    private void addPreScript(MsHTTPSamplerProxy request, List<PostmanEvent> event) {
+        if (request != null && CollectionUtils.isNotEmpty(event)) {
+            StringBuilder scriptStr = new StringBuilder();
+            event = event.stream()
+                    .filter(item -> item.getScript() != null)
+                    .collect(Collectors.toList());
+            event.forEach(item -> {
+                PostmanScript script = item.getScript();
+                if (script != null) {
+                    List<String> exec = script.getExec();
+                    if (CollectionUtils.isNotEmpty(exec)) {
+                        exec.forEach(col -> {
+                            if (StringUtils.isNotEmpty(col)) {
+                                scriptStr.append(col + "/n");
+                            }
+                        });
+                    }
+                }
+            });
+            if (StringUtils.isNotBlank(scriptStr)) {
+                MsJSR223PreProcessor jsr223PreProcessor = new MsJSR223PreProcessor();
+                jsr223PreProcessor.setName("JSR223PreProcessor");
+                jsr223PreProcessor.setScriptLanguage("javascript");
+                jsr223PreProcessor.setScript(scriptStr.toString());
+                LinkedList<MsTestElement> hashTree = new LinkedList<>();
+                hashTree.add(jsr223PreProcessor);
+                request.setHashTree(hashTree);
+            }
+        }
+    }
+
+    private List<KeyValue> parseKeyValue(List<PostmanKeyValue> postmanKeyValues) {
+        if (postmanKeyValues == null) {
+            return null;
+        }
+        List<KeyValue> keyValues = new ArrayList<>();
+        postmanKeyValues.forEach(item -> keyValues.add(new KeyValue(item.getKey(), item.getValue(), item.getDescription(), item.getContentType())));
+        return keyValues;
+    }
+
+    private List<ScenarioVariable> parseScenarioVariable(List<PostmanKeyValue> postmanKeyValues) {
+        if (postmanKeyValues == null) {
+            return null;
+        }
+        List<ScenarioVariable> keyValues = new ArrayList<>();
+        postmanKeyValues.forEach(item -> keyValues.add(new ScenarioVariable(item.getKey(), item.getValue(), item.getDescription(), VariableTypeConstants.CONSTANT.name())));
+        return keyValues;
+    }
+
+    private void parseBody(Body body, PostmanRequest requestDesc) {
+        JSONObject postmanBody = requestDesc.getBody();
+        if (postmanBody == null) {
+            return;
+        }
+        String bodyMode = postmanBody.getString("mode");
+        if (StringUtils.isNotEmpty(bodyMode) && StringUtils.equals(bodyMode, PostmanRequestBodyMode.RAW.value())) {
+            parseRawBody(body, postmanBody, bodyMode);
+        } else if (StringUtils.isNotEmpty(bodyMode) && StringUtils.equalsAny(bodyMode, PostmanRequestBodyMode.FORM_DATA.value(), PostmanRequestBodyMode.URLENCODED.value())) {
+            List<PostmanKeyValue> postmanKeyValues = JSON.parseArray(postmanBody.getString(bodyMode), PostmanKeyValue.class);
+            body.setKvs(parseKeyValue(postmanKeyValues));
+            if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.FORM_DATA.value())) {
+                body.setType(Body.FORM_DATA);
+            } else if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.URLENCODED.value())) {
+                body.setType(Body.WWW_FROM);
+            }
+        } else if (StringUtils.equals(bodyMode, PostmanRequestBodyMode.FILE.value())) {
+            body.setType(Body.BINARY);
+            body.setKvs(new ArrayList<>());
+        }
+    }
+
+    private void parseRawBody(Body body, JSONObject postmanBody, String bodyMode) {
+        body.setRaw(postmanBody.getString(bodyMode));
+        body.setType(MsRequestBodyType.RAW.value());
+        JSONObject options = postmanBody.getJSONObject("options");
+        if (options != null) {
+            JSONObject raw = options.getJSONObject(PostmanRequestBodyMode.RAW.value());
+            if (raw != null && raw.getString("language") != null) {
+                String bodyType = "";
+                switch (raw.getString("language")) {
+                    case "json":
+                        bodyType = Body.JSON;
+                        break;
+                    case "xml":
+                        bodyType = Body.XML;
+                        break;
+                    default:
+                        bodyType = Body.RAW;
+                }
+                body.setType(bodyType);
+            }
+        }
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
new file mode 100644
index 0000000000..b3b5104971
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsScenarioParser.java
@@ -0,0 +1,65 @@
+package io.metersphere.api.dto.automation.parse;
+
+import com.alibaba.fastjson.JSON;
+import io.metersphere.api.dto.ApiTestImportRequest;
+import io.metersphere.base.domain.ApiScenarioModule;
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+public class MsScenarioParser extends ScenarioImportAbstractParser {
+
+    @Override
+    public ScenarioImport parse(InputStream source, ApiTestImportRequest request) {
+        String testStr = getApiTestStr(source);
+        this.projectId = request.getProjectId();
+        ScenarioImport scenarioImport = parseMsFormat(testStr, request);
+        return scenarioImport;
+    }
+
+    private ScenarioImport parseMsFormat(String testStr, ApiTestImportRequest importRequest) {
+        ScenarioImport apiDefinitionImport = JSON.parseObject(testStr, ScenarioImport.class);
+        List<ApiScenarioWithBLOBs> data = apiDefinitionImport.getData();
+        if (CollectionUtils.isNotEmpty(data)) {
+            data.forEach(item -> {
+                if (StringUtils.isBlank(item.getModulePath())) {
+                    item.setApiScenarioModuleId(null);
+                }
+                parseModule(item, importRequest);
+                item.setId(UUID.randomUUID().toString());
+                item.setProjectId(this.projectId);
+            });
+        }
+        return apiDefinitionImport;
+    }
+
+    private void parseModule(ApiScenarioWithBLOBs apiDefinition, ApiTestImportRequest importRequest) {
+        String modulePath = apiDefinition.getModulePath();
+        if (StringUtils.isEmpty(modulePath)) {
+            return;
+        }
+        if (modulePath.startsWith("/")) {
+            modulePath = modulePath.substring(1, modulePath.length());
+        }
+        if (modulePath.endsWith("/")) {
+            modulePath = modulePath.substring(0, modulePath.length() - 1);
+        }
+        List<String> modules = Arrays.asList(modulePath.split("/"));
+        ApiScenarioModule parent = getSelectModule(importRequest.getModuleId());
+        Iterator<String> iterator = modules.iterator();
+        while (iterator.hasNext()) {
+            String item = iterator.next();
+            parent = buildModule(parent, item);
+            if (!iterator.hasNext()) {
+                apiDefinition.setApiScenarioModuleId(parent.getId());
+            }
+        }
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImport.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImport.java
new file mode 100644
index 0000000000..81b6c08139
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImport.java
@@ -0,0 +1,12 @@
+package io.metersphere.api.dto.automation.parse;
+
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ScenarioImport {
+    private String projectid;
+    private List<ApiScenarioWithBLOBs> data;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportAbstractParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportAbstractParser.java
new file mode 100644
index 0000000000..3ba5bc40ac
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportAbstractParser.java
@@ -0,0 +1,169 @@
+package io.metersphere.api.dto.automation.parse;
+
+import io.metersphere.api.dto.automation.ApiScenarioModuleDTO;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.scenario.Body;
+import io.metersphere.api.dto.scenario.KeyValue;
+import io.metersphere.api.dto.scenario.request.RequestType;
+import io.metersphere.api.service.ApiScenarioModuleService;
+import io.metersphere.base.domain.ApiScenarioModule;
+import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LogUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public abstract class ScenarioImportAbstractParser implements ScenarioImportParser {
+    protected ApiScenarioModuleService apiModuleService;
+    protected String projectId;
+
+    protected ApiScenarioModule getSelectModule(String moduleId) {
+        apiModuleService = CommonBeanFactory.getBean(ApiScenarioModuleService.class);
+        if (StringUtils.isNotBlank(moduleId) && !StringUtils.equals("root", moduleId)) {
+            ApiScenarioModule module = new ApiScenarioModule();
+            ApiScenarioModuleDTO moduleDTO = apiModuleService.getNode(moduleId);
+            if (moduleDTO != null) {
+                BeanUtils.copyBean(module, moduleDTO);
+            }
+            return module;
+        }
+        return null;
+    }
+
+    protected ApiScenarioModule buildModule(ApiScenarioModule parentModule, String name) {
+        apiModuleService = CommonBeanFactory.getBean(ApiScenarioModuleService.class);
+        ApiScenarioModule module;
+        if (parentModule != null) {
+            module = apiModuleService.getNewModule(name, this.projectId, parentModule.getLevel() + 1);
+            module.setParentId(parentModule.getId());
+        } else {
+            module = apiModuleService.getNewModule(name, this.projectId, 1);
+        }
+        createModule(module);
+        return module;
+    }
+
+    protected void createModule(ApiScenarioModule module) {
+        List<ApiScenarioModule> apiModules = apiModuleService.selectSameModule(module);
+        if (CollectionUtils.isEmpty(apiModules)) {
+            apiModuleService.addNode(module);
+        } else {
+            module.setId(apiModules.get(0).getId());
+        }
+    }
+
+    protected String getApiTestStr(InputStream source) {
+        StringBuilder testStr = null;
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8))) {
+            testStr = new StringBuilder();
+            String inputStr;
+            while ((inputStr = bufferedReader.readLine()) != null) {
+                testStr.append(inputStr);
+            }
+        } catch (Exception e) {
+            MSException.throwException(e.getMessage());
+            LogUtil.error(e.getMessage(), e);
+        } finally {
+            try {
+                if (source != null) {
+                    source.close();
+                }
+            } catch (IOException e) {
+                MSException.throwException(e.getMessage());
+                LogUtil.error(e.getMessage(), e);
+            }
+        }
+        return testStr.toString();
+    }
+
+    private String formatPath(String url) {
+        try {
+            URL urlObject = new URL(url);
+            StringBuilder pathBuffer = new StringBuilder(urlObject.getPath());
+            if (StringUtils.isNotEmpty(urlObject.getQuery())) {
+                pathBuffer.append("?").append(urlObject.getQuery());
+            }
+            return pathBuffer.toString();
+        } catch (Exception ex) {
+            return url;
+        }
+    }
+
+    protected MsHTTPSamplerProxy buildRequest(String name, String path, String method) {
+        MsHTTPSamplerProxy request = new MsHTTPSamplerProxy();
+        request.setName(name);
+        // 路径去掉域名/IP 地址，保留方法名称及参数
+        request.setPath(formatPath(path));
+        request.setMethod(method);
+        request.setProtocol(RequestType.HTTP);
+        request.setId(UUID.randomUUID().toString());
+        request.setHeaders(new ArrayList<>());
+        request.setArguments(new ArrayList<>());
+        request.setRest(new ArrayList<>());
+        request.setAuthManager(null);
+        Body body = new Body();
+        body.initKvs();
+        body.initBinary();
+        request.setBody(body);
+        return request;
+    }
+
+    protected void addHeader(List<KeyValue> headers, String key, String value, String description, String contentType, boolean required) {
+        boolean hasContentType = false;
+        for (KeyValue header : headers) {
+            if (StringUtils.equalsIgnoreCase(header.getName(), key)) {
+                hasContentType = true;
+            }
+        }
+        if (!hasContentType) {
+            headers.add(new KeyValue(key, value, description, contentType, required));
+        }
+    }
+
+    protected void addHeader(List<KeyValue> headers, String key, String value) {
+        addHeader(headers, key, value, "", "", true);
+    }
+
+    protected void addContentType(List<KeyValue> headers, String contentType) {
+        addHeader(headers, "Content-Type", contentType);
+    }
+
+    protected void addBodyHeader(MsHTTPSamplerProxy request) {
+        String contentType = "";
+        if (request.getBody() != null && StringUtils.isNotBlank(request.getBody().getType())) {
+            switch (request.getBody().getType()) {
+                case Body.JSON:
+                    contentType = "application/json";
+                    break;
+                case Body.WWW_FROM:
+                    contentType = "application/x-www-form-urlencoded";
+                    break;
+                case Body.XML:
+                    contentType = "application/xml";
+                    break;
+                case Body.BINARY:
+                    contentType = "application/octet-stream";
+                    break;
+            }
+            List<KeyValue> headers = request.getHeaders();
+            if (headers == null) {
+                headers = new ArrayList<>();
+                request.setHeaders(headers);
+            }
+            addContentType(request.getHeaders(), contentType);
+
+        }
+    }
+
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParser.java
new file mode 100644
index 0000000000..4586440473
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParser.java
@@ -0,0 +1,9 @@
+package io.metersphere.api.dto.automation.parse;
+
+import io.metersphere.api.dto.ApiTestImportRequest;
+
+import java.io.InputStream;
+
+public interface ScenarioImportParser {
+    ScenarioImport parse(InputStream source, ApiTestImportRequest request);
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java
new file mode 100644
index 0000000000..f425fd1dd0
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java
@@ -0,0 +1,18 @@
+package io.metersphere.api.dto.automation.parse;
+
+import io.metersphere.commons.constants.ApiImportPlatform;
+import org.apache.commons.lang3.StringUtils;
+
+public class ScenarioImportParserFactory {
+    public static ScenarioImportParser getImportParser(String platform) {
+        if (StringUtils.equals(ApiImportPlatform.Metersphere.name(), platform)) {
+            return new MsScenarioParser();
+        } else if (StringUtils.equals(ApiImportPlatform.Postman.name(), platform)) {
+            return new MsPostmanParser();
+        }
+//        else if (StringUtils.equals(ApiImportPlatform.Swagger2.name(), platform)) {
+//            return new Swagger2Parser();
+//        }
+        return null;
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java
index 417711dfa2..9333699bc6 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/variable/ScenarioVariable.java
@@ -40,6 +40,13 @@ public class ScenarioVariable {
     private String minNumber;
     private String maxNumber;
 
+    public ScenarioVariable(String key, String value, String description, String type) {
+        this.name = key;
+        this.value = value;
+        this.description = description;
+        this.type = type;
+    }
+
     public boolean isConstantValid() {
         if (StringUtils.equals(this.type, VariableTypeConstants.CONSTANT.name()) && StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(value)) {
             return true;
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 7f15aff6e6..f9d1779d31 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -5,9 +5,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.ApiTestImportRequest;
 import io.metersphere.api.dto.DeleteAPIReportRequest;
 import io.metersphere.api.dto.JmxInfoDTO;
 import io.metersphere.api.dto.automation.*;
+import io.metersphere.api.dto.automation.parse.ScenarioImport;
+import io.metersphere.api.dto.automation.parse.ScenarioImportParser;
+import io.metersphere.api.dto.automation.parse.ScenarioImportParserFactory;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
 import io.metersphere.api.dto.definition.request.*;
@@ -86,23 +90,34 @@ public class ApiAutomationService {
     private TestPlanScenarioCaseService testPlanScenarioCaseService;
 
     public List<ApiScenarioDTO> list(ApiScenarioRequest request) {
-        request = this.initRequest(request,true,true);
+        request = this.initRequest(request, true, true);
         List<ApiScenarioDTO> list = extApiScenarioMapper.list(request);
         return list;
     }
 
+    public List<ApiScenarioWithBLOBs> get(ApiScenarioRequest request) {
+        ApiScenarioExample example = new ApiScenarioExample();
+        if (CollectionUtils.isNotEmpty(request.getIds())) {
+            example.createCriteria().andIdIn(request.getIds());
+        } else {
+            example.createCriteria().andProjectIdEqualTo(request.getProjectId());
+        }
+        return apiScenarioMapper.selectByExampleWithBLOBs(example);
+    }
+
     /**
      * 初始化部分参数
+     *
      * @param request
      * @param setDefultOrders
      * @param checkThisWeekData
      * @return
      */
-    private ApiScenarioRequest initRequest(ApiScenarioRequest request,boolean setDefultOrders, boolean checkThisWeekData) {
-        if(setDefultOrders){
+    private ApiScenarioRequest initRequest(ApiScenarioRequest request, boolean setDefultOrders, boolean checkThisWeekData) {
+        if (setDefultOrders) {
             request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         }
-        if(checkThisWeekData){
+        if (checkThisWeekData) {
             if (request.isSelectThisWeedData()) {
                 Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
                 Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
@@ -217,7 +232,7 @@ public class ApiAutomationService {
         ids.add(scenarioId);
         deleteApiScenarioReport(ids);
 
-        scheduleService.deleteScheduleAndJobByResourceId(scenarioId,ScheduleGroup.API_SCENARIO_TEST.name());
+        scheduleService.deleteScheduleAndJobByResourceId(scenarioId, ScheduleGroup.API_SCENARIO_TEST.name());
         TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
         example.createCriteria().andApiScenarioIdEqualTo(scenarioId);
         List<TestPlanApiScenario> testPlanApiScenarioList = testPlanApiScenarioMapper.selectByExample(example);
@@ -284,7 +299,7 @@ public class ApiAutomationService {
         extApiScenarioMapper.removeToGc(apiIds);
         //将这些场景的定时任务删除掉
         for (String id : apiIds) {
-            scheduleService.deleteScheduleAndJobByResourceId(id,ScheduleGroup.API_SCENARIO_TEST.name());
+            scheduleService.deleteScheduleAndJobByResourceId(id, ScheduleGroup.API_SCENARIO_TEST.name());
         }
     }
 
@@ -412,14 +427,14 @@ public class ApiAutomationService {
                 // 创建场景报告
                 if (reportIds != null) {
                     //如果是测试计划页面触发的执行方式，生成报告时createScenarioReport第二个参数需要特殊处理
-                    if(StringUtils.equals(request.getRunMode(),ApiRunMode.SCENARIO_PLAN.name())){
+                    if (StringUtils.equals(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
                         String testPlanScenarioId = item.getId();
-                        if(request.getScenarioTestPlanIdMap()!=null&&request.getScenarioTestPlanIdMap().containsKey(item.getId())){
+                        if (request.getScenarioTestPlanIdMap() != null && request.getScenarioTestPlanIdMap().containsKey(item.getId())) {
                             testPlanScenarioId = request.getScenarioTestPlanIdMap().get(item.getId());
                         }
                         createScenarioReport(group.getName(), testPlanScenarioId, item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
                                 request.getExecuteType(), item.getProjectId(), request.getReportUserID());
-                    }else{
+                    } else {
                         createScenarioReport(group.getName(), item.getId(), item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
                                 request.getExecuteType(), item.getProjectId(), request.getReportUserID());
                     }
@@ -635,10 +650,10 @@ public class ApiAutomationService {
     }
 
     private void addOrUpdateApiScenarioCronJob(Schedule request) {
-        if(StringUtils.equals(request.getGroup(),ScheduleGroup.TEST_PLAN_TEST.name())){
+        if (StringUtils.equals(request.getGroup(), ScheduleGroup.TEST_PLAN_TEST.name())) {
             scheduleService.addOrUpdateCronJob(
                     request, TestPlanTestJob.getJobKey(request.getResourceId()), TestPlanTestJob.getTriggerKey(request.getResourceId()), TestPlanTestJob.class);
-        }else{
+        } else {
             scheduleService.addOrUpdateCronJob(
                     request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class);
         }
@@ -712,4 +727,89 @@ public class ApiAutomationService {
             });
         }
     }
+
+    public List<ApiScenarioWithBLOBs> getWithBLOBs(ApiScenarioWithBLOBs request) {
+        ApiScenarioExample example = new ApiScenarioExample();
+        example.createCriteria().andNameEqualTo(request.getName()).andProjectIdEqualTo(request.getProjectId()).andStatusNotEqualTo("Trash").andIdNotEqualTo(request.getId());
+        return apiScenarioMapper.selectByExampleWithBLOBs(example);
+    }
+
+    private void _importCreate(List<ApiScenarioWithBLOBs> sameRequest, ApiScenarioMapper batchMapper, ApiScenarioWithBLOBs scenarioWithBLOBs, ApiTestImportRequest apiTestImportRequest) {
+        if (CollectionUtils.isEmpty(sameRequest)) {
+            scenarioWithBLOBs.setId(UUID.randomUUID().toString());
+            batchMapper.insert(scenarioWithBLOBs);
+        } else {
+            //如果存在则修改
+            scenarioWithBLOBs.setId(sameRequest.get(0).getId());
+            batchMapper.updateByPrimaryKeyWithBLOBs(scenarioWithBLOBs);
+        }
+    }
+
+    private ApiScenarioWithBLOBs importCreate(ApiScenarioWithBLOBs request, ApiScenarioMapper batchMapper, ApiTestImportRequest apiTestImportRequest) {
+        final ApiScenarioWithBLOBs scenarioWithBLOBs = new ApiScenarioWithBLOBs();
+        BeanUtils.copyBean(scenarioWithBLOBs, request);
+        scenarioWithBLOBs.setCreateTime(System.currentTimeMillis());
+        scenarioWithBLOBs.setUpdateTime(System.currentTimeMillis());
+        scenarioWithBLOBs.setStatus(APITestStatus.Underway.name());
+        scenarioWithBLOBs.setProjectId(apiTestImportRequest.getProjectId());
+        if (StringUtils.isEmpty(request.getPrincipal())) {
+            scenarioWithBLOBs.setPrincipal(Objects.requireNonNull(SessionUtils.getUser()).getId());
+        }
+        if (request.getUserId() == null) {
+            scenarioWithBLOBs.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
+        } else {
+            scenarioWithBLOBs.setUserId(request.getUserId());
+        }
+        scenarioWithBLOBs.setDescription(request.getDescription());
+
+        List<ApiScenarioWithBLOBs> sameRequest = getWithBLOBs(scenarioWithBLOBs);
+        if (StringUtils.equals("fullCoverage", apiTestImportRequest.getModeId())) {
+            _importCreate(sameRequest, batchMapper, scenarioWithBLOBs, apiTestImportRequest);
+        } else if (StringUtils.equals("incrementalMerge", apiTestImportRequest.getModeId())) {
+            if (CollectionUtils.isEmpty(sameRequest)) {
+                batchMapper.insert(scenarioWithBLOBs);
+            }
+
+        } else {
+            _importCreate(sameRequest, batchMapper, scenarioWithBLOBs, apiTestImportRequest);
+        }
+        return scenarioWithBLOBs;
+    }
+
+    private void editScenario(ApiTestImportRequest request, ScenarioImport apiImport) {
+        SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
+        ApiScenarioMapper batchMapper = sqlSession.getMapper(ApiScenarioMapper.class);
+        List<ApiScenarioWithBLOBs> data = apiImport.getData();
+        int num = 0;
+        if (!CollectionUtils.isEmpty(data) && data.get(0) != null && data.get(0).getProjectId() != null) {
+            num = getNextNum(data.get(0).getProjectId());
+        }
+        for (int i = 0; i < data.size(); i++) {
+            ApiScenarioWithBLOBs item = data.get(i);
+            if (item.getName().length() > 255) {
+                item.setName(item.getName().substring(0, 255));
+            }
+            item.setNum(num++);
+            importCreate(item, batchMapper, request);
+            if (i % 300 == 0) {
+                sqlSession.flushStatements();
+            }
+        }
+        sqlSession.flushStatements();
+    }
+
+    public ScenarioImport scenarioImport(MultipartFile file, ApiTestImportRequest request) {
+        ScenarioImportParser apiImportParser = ScenarioImportParserFactory.getImportParser(request.getPlatform());
+        ScenarioImport apiImport = null;
+        try {
+            apiImport = Objects.requireNonNull(apiImportParser).parse(file == null ? null : file.getInputStream(), request);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+            MSException.throwException(Translator.get("parse_data_error"));
+        }
+        if (apiImport != null) {
+            editScenario(request, apiImport);
+        }
+        return apiImport;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
index 6445f7d13a..6f4ffcb369 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioModuleService.java
@@ -215,6 +215,33 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
         return dto;
     }
 
+    public ApiScenarioModule getNewModule(String name, String projectId, int level) {
+        ApiScenarioModule node = new ApiScenarioModule();
+        node.setCreateTime(System.currentTimeMillis());
+        node.setUpdateTime(System.currentTimeMillis());
+        node.setId(UUID.randomUUID().toString());
+        node.setLevel(level);
+        node.setName(name);
+        node.setProjectId(projectId);
+        return node;
+    }
+
+    public List<ApiScenarioModule> selectSameModule(ApiScenarioModule node) {
+        ApiScenarioModuleExample example = new ApiScenarioModuleExample();
+        ApiScenarioModuleExample.Criteria criteria = example.createCriteria();
+        criteria.andNameEqualTo(node.getName())
+                .andProjectIdEqualTo(node.getProjectId());
+        if (StringUtils.isNotBlank(node.getParentId())) {
+            criteria.andParentIdEqualTo(node.getParentId());
+        } else {
+            criteria.andParentIdIsNull();
+        }
+        if (StringUtils.isNotBlank(node.getId())) {
+            criteria.andIdNotEqualTo(node.getId());
+        }
+        return apiScenarioModuleMapper.selectByExample(example);
+    }
+
     @Override
     public void updatePos(String id, Double pos) {
         extApiScenarioModuleMapper.updatePos(id, pos);
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index e806819a7c..05f048cdd0 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -1,5 +1,5 @@
 <template>
-  <ms-container v-if="renderComponent">
+  <ms-container v-if="renderComponent" v-loading="loading">
     <ms-aside-container>
       <ms-api-scenario-module
         @nodeSelectEvent="nodeChange"
@@ -8,6 +8,7 @@
         @setModuleOptions="setModuleOptions"
         @setNodeTree="setNodeTree"
         @enableTrash="enableTrash"
+        @exportAPI="exportAPI"
         :type="'edit'"
         ref="nodeTree"/>
     </ms-aside-container>
@@ -63,10 +64,11 @@
   import MsAsideContainer from "@/business/components/common/components/MsAsideContainer";
   import MsMainContainer from "@/business/components/common/components/MsMainContainer";
   import MsApiScenarioList from "@/business/components/api/automation/scenario/ApiScenarioList";
-  import {getUUID} from "@/common/js/utils";
+  import {getUUID, downloadFile} from "@/common/js/utils";
   import MsApiScenarioModule from "@/business/components/api/automation/scenario/ApiScenarioModule";
   import MsEditApiScenario from "./scenario/EditApiScenario";
   import {getCurrentProjectID} from "../../../../common/js/utils";
+  import {PROJECT_NAME} from "../../../../common/js/constants";
 
   export default {
     name: "ApiAutomation",
@@ -101,6 +103,7 @@
         currentModule: null,
         moduleOptions: [],
         tabs: [],
+        loading: false,
         trashEnable: false,
         selectNodeIds: [],
         nodeTree: []
@@ -126,6 +129,27 @@
       }
     },
     methods: {
+      exportAPI() {
+        let obj = {projectName: localStorage.getItem(PROJECT_NAME)}
+        let condition = {projectId: getCurrentProjectID(), ids: this.$refs.apiScenarioList.selection};
+        let url = "/api/automation/list/all";
+        this.loading = true;
+        this.$post(url, condition, response => {
+          obj.data = response.data;
+          this.buildApiPath(obj.data);
+          this.loading = false;
+          downloadFile("Metersphere_Scenario_" + localStorage.getItem(PROJECT_NAME) + ".json", JSON.stringify(obj));
+        });
+      },
+      buildApiPath(apis) {
+        apis.forEach((api) => {
+          this.moduleOptions.forEach(item => {
+            if (api.moduleId === item.id) {
+              api.modulePath = item.path;
+            }
+          });
+        });
+      },
       checkRedirectEditPage(redirectParam) {
         if (redirectParam != null) {
           let selectParamArr = redirectParam.split("edit:");
@@ -151,13 +175,13 @@
       },
       changeRedirectParam(redirectIDParam) {
         this.redirectID = redirectIDParam;
-        if(redirectIDParam!=null){
-          if(this.redirectFlag == "none"){
+        if (redirectIDParam != null) {
+          if (this.redirectFlag == "none") {
             this.activeName = "default";
             this.addListener();
             this.redirectFlag = "redirected";
           }
-        }else{
+        } else {
           this.redirectFlag = "none";
         }
       },
@@ -188,8 +212,8 @@
       },
       addListener() {
         let index = this.tabs.findIndex(item => item.name === this.activeName); //  找到当前选中tab的index
-        if(index != -1) {   //  为当前选中的tab添加监听
-          this.$nextTick(()=>{
+        if (index != -1) {   //  为当前选中的tab添加监听
+          this.$nextTick(() => {
             this.$refs.autoScenarioConfig[index].addListener();
           });
         }
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 8d6e06a246..142ed15141 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -138,6 +138,7 @@
             this.$refs.apiImport.open(this.currentModule);
             break;
           case "export":
+            this.$emit('exportAPI');
             break;
         }
       },
diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
index bce49719e3..f004db640a 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -35,6 +35,23 @@
         <el-col :span="1">
           <el-divider direction="vertical"/>
         </el-col>
+        <el-col :span="12">
+          <el-upload
+            class="api-upload"
+            drag
+            action=""
+            :http-request="upload"
+            :limit="1"
+            :beforeUpload="uploadValidate"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            :on-exceed="handleExceed"
+            multiple>
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text" v-html="$t('load_test.upload_tips')"></div>
+            <div class="el-upload__tip" slot="tip">{{ $t('api_test.api_import.file_size_limit') }}</div>
+          </el-upload>
+        </el-col>
 
       </el-row>
     </el-form>
@@ -182,7 +199,7 @@
               return;
             }
             let param = this.buildParam();
-            this.result = this.$fileUpload('/api/definition/import', param.file, null, this.buildParam(), response => {
+            this.result = this.$fileUpload('/api/automation/import', param.file, null, this.buildParam(), response => {
               let res = response.data;
               this.$success(this.$t('test_track.case.import.success'));
               this.visible = false;

From 8b3620337af3849ab987d9e0e499d19cdcd12e78 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 3 Feb 2021 10:03:07 +0800
Subject: [PATCH 03/23] =?UTF-8?q?refactor(=E6=8E=A5=E5=8F=A3=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E5=AF=BC=E5=85=A5=20j?=
 =?UTF-8?q?mx=20=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 224 ++++++++++++++++++
 1 file changed, 224 insertions(+)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
new file mode 100644
index 0000000000..62356b905c
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -0,0 +1,224 @@
+package io.metersphere.api.dto.automation.parse;
+
+import io.metersphere.api.dto.ApiTestImportRequest;
+import io.metersphere.commons.utils.LogUtil;
+import io.metersphere.commons.utils.ScriptEngineUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MsJmeterParser extends ScenarioImportAbstractParser {
+    private final static String HASH_TREE_ELEMENT = "hashTree";
+    private final static String STRING_PROP = "stringProp";
+    private final static String ARGUMENTS = "Arguments";
+    private final static String COLLECTION_PROP = "collectionProp";
+    private final static String HTTP_SAMPLER_PROXY = "HTTPSamplerProxy";
+    private final static String ELEMENT_PROP = "elementProp";
+
+    @Override
+    public ScenarioImport parse(InputStream inputSource, ApiTestImportRequest request) {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        try {
+            DocumentBuilder docBuilder = factory.newDocumentBuilder();
+            final Document document = docBuilder.parse(inputSource);
+            final Element jmeterTestPlan = document.getDocumentElement();
+            NodeList childNodes = jmeterTestPlan.getChildNodes();
+            for (int i = 0; i < childNodes.getLength(); i++) {
+                Node node = childNodes.item(i);
+                if (node instanceof Element) {
+                    Element ele = (Element) node;
+                    parseHashTree(ele);
+                }
+            }
+            return null;
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), e);
+            return null;
+        }
+    }
+    private static void parseHashTree(Element hashTree) {
+        if (invalid(hashTree)) {
+            return;
+        }
+
+        if (hashTree.getChildNodes().getLength() > 0) {
+            final NodeList childNodes = hashTree.getChildNodes();
+            for (int i = 0; i < childNodes.getLength(); i++) {
+                Node node = childNodes.item(i);
+                if (node instanceof Element) {
+                    Element ele = (Element) node;
+                    if (invalid(ele)) {
+                        continue;
+                    }
+                    if (nodeNameEquals(ele, HASH_TREE_ELEMENT)) {
+                        parseHashTree(ele);
+                    } else if (nodeNameEquals(ele, ARGUMENTS)) {
+                        processArguments(ele);
+                    } else if (nodeNameEquals(ele, HTTP_SAMPLER_PROXY)) {
+                        processHttpSamplerProxy(ele);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void processHttpSamplerProxy(Element ele) {
+        if (invalid(ele)) {
+            return;
+        }
+        NodeList childNodes = ele.getChildNodes();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node item = childNodes.item(i);
+            if (!(item instanceof Element)) {
+                continue;
+            }
+            Element element = (Element) item;
+            if (nodeNameEquals(element, ELEMENT_PROP) && "HTTPsampler.Arguments".equals(element.getAttribute("name"))) {
+                processArguments(element);
+            } else if ("HTTPSampler.path".equals(element.getAttribute("name"))) {
+                processStringProp(element);
+            }
+        }
+    }
+
+    private static void processArguments(Element ele) {
+        if (invalid(ele)) {
+            return;
+        }
+        NodeList childNodes = ele.getChildNodes();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node item = childNodes.item(i);
+            if (!(item instanceof Element)) {
+                continue;
+            }
+            Element element = (Element) item;
+            if (nodeNameEquals(item, COLLECTION_PROP) && "Arguments.arguments".equals(element.getAttribute("name"))) {
+                NodeList elementProps = item.getChildNodes();
+                for (int j = 0; j < elementProps.getLength(); j++) {
+                    Node elementProp = elementProps.item(j);
+                    if (!(elementProp instanceof Element)) {
+                        continue;
+                    }
+                    NodeList stringProps = elementProp.getChildNodes();
+                    for (int k = 0; k < stringProps.getLength(); k++) {
+                        Node stringProp = stringProps.item(k);
+                        if (!(stringProp instanceof Element)) {
+                            continue;
+                        }
+                        processStringProp((Element) stringProp);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void processStringProp(Element ele) {
+        String name = ele.getAttribute("name");
+        switch (name) {
+            case "HTTPSampler.path":
+                String path = ele.getTextContent();
+                Map<String, String> parser = parserUrl(path);
+                String url = parser.get("URL");
+                String params = parser.keySet().stream().filter(k -> !"URL".equals(k)).reduce("?", (u, k) -> {
+                    String v = parser.get(k);
+                    if (!StringUtils.equals("?", u)) {
+                        u += "&";
+                    }
+                    v = ScriptEngineUtils.calculate(v);
+                    // urlencoder
+                    try {
+                        v = URLEncoder.encode(v, "UTF-8");
+                    } catch (UnsupportedEncodingException e) {
+                        LogUtil.error(e);
+                    }
+                    u += k + "=" + v;
+                    return u;
+                });
+                //rest参数处理
+                if (url.contains("@")) {
+                    String vars[] = url.split("@");
+                    for (String item : vars) {
+                        if (item.endsWith("/")) {
+                            item = item.substring(0, item.length() - 1);
+                        }
+                        url = url.replace("@" + item, ScriptEngineUtils.calculate("@" + item));
+                    }
+                }
+                ele.setTextContent(url + ((params != null && !params.equals("?")) ? params : ""));
+                break;
+            case "Argument.value":
+                String textContent = ele.getTextContent();
+                if (StringUtils.startsWith(textContent, "@")) {
+                    ele.setTextContent(ScriptEngineUtils.calculate(textContent));
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    private static boolean nodeNameEquals(Node node, String desiredName) {
+        return desiredName.equals(node.getNodeName()) || desiredName.equals(node.getLocalName());
+    }
+
+    private static boolean invalid(Element ele) {
+        return !StringUtils.isBlank(ele.getAttribute("enabled")) && !Boolean.parseBoolean(ele.getAttribute("enabled"));
+    }
+
+    private static Map<String, String> parserUrl(String url) {
+//		传递的URL参数
+        Map<String, String> strUrlParas = new HashMap<>();
+
+        String strUrl;
+        String strUrlParams;
+
+
+//		解析访问地址
+        if (url.contains("?")) {
+            String[] strUrlPatten = url.split("\\?");
+            strUrl = strUrlPatten[0];
+            strUrlParams = strUrlPatten[1];
+
+        } else {
+            strUrl = url;
+            strUrlParams = url;
+        }
+
+        strUrlParas.put("URL", strUrl);
+//		解析参数
+        String[] params = null;
+
+        if (strUrlParams.contains("&")) {
+            params = strUrlParams.split("&");
+        } else {
+            params = new String[]{strUrlParams};
+        }
+
+//		保存参数到参数容器
+        for (String p : params) {
+            if (p.contains("=")) {
+                String[] param = p.split("=");
+                if (param.length == 1) {
+                    strUrlParas.put(param[0], "");
+                } else {
+
+                    String key = param[0];
+                    String value = param[1];
+
+                    strUrlParas.put(key, value);
+                }
+            }
+        }
+        return strUrlParas;
+    }
+}

From 935bcbfafe3624d14177a1d1bb3dd089d3fc66d6 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 4 Feb 2021 14:48:04 +0800
Subject: [PATCH 04/23] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89)?=
 =?UTF-8?q?:=20=E5=AF=BC=E5=85=A5Jmeter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 388 +++++++++---------
 .../parse/ScenarioImportParserFactory.java    |   5 +-
 .../dto/definition/request/MsScenario.java    |  16 +-
 .../dto/definition/request/MsTestElement.java |   8 +-
 .../request/unknown/MsJmeterElement.java      |  19 +
 .../commons/constants/ApiImportPlatform.java  |   2 +-
 6 files changed, 226 insertions(+), 212 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 62356b905c..7963944b20 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -1,224 +1,208 @@
 package io.metersphere.api.dto.automation.parse;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.metersphere.api.dto.ApiTestImportRequest;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.commons.utils.ScriptEngineUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import io.metersphere.api.dto.definition.request.MsScenario;
+import io.metersphere.api.dto.definition.request.MsTestElement;
+import io.metersphere.api.dto.definition.request.assertions.MsAssertions;
+import io.metersphere.api.dto.definition.request.controller.MsIfController;
+import io.metersphere.api.dto.definition.request.controller.MsLoopController;
+import io.metersphere.api.dto.definition.request.extract.MsExtract;
+import io.metersphere.api.dto.definition.request.processors.MsJSR223Processor;
+import io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor;
+import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
+import io.metersphere.api.dto.definition.request.sampler.MsDubboSampler;
+import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
+import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
+import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
+import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
+import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
+import io.metersphere.api.dto.scenario.Body;
+import io.metersphere.api.dto.scenario.KeyValue;
+import io.metersphere.api.dto.scenario.request.RequestType;
+import io.metersphere.base.domain.ApiScenarioModule;
+import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.base.domain.TestPlan;
+import io.metersphere.commons.utils.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.extractor.JSR223PostProcessor;
+import org.apache.jmeter.modifiers.JSR223PreProcessor;
+import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
+import org.apache.jmeter.protocol.http.util.HTTPFileArg;
+import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
+import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
+import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.collections.HashTree;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
 
 public class MsJmeterParser extends ScenarioImportAbstractParser {
-    private final static String HASH_TREE_ELEMENT = "hashTree";
-    private final static String STRING_PROP = "stringProp";
-    private final static String ARGUMENTS = "Arguments";
-    private final static String COLLECTION_PROP = "collectionProp";
-    private final static String HTTP_SAMPLER_PROXY = "HTTPSamplerProxy";
-    private final static String ELEMENT_PROP = "elementProp";
-
     @Override
     public ScenarioImport parse(InputStream inputSource, ApiTestImportRequest request) {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         try {
-            DocumentBuilder docBuilder = factory.newDocumentBuilder();
-            final Document document = docBuilder.parse(inputSource);
-            final Element jmeterTestPlan = document.getDocumentElement();
-            NodeList childNodes = jmeterTestPlan.getChildNodes();
-            for (int i = 0; i < childNodes.getLength(); i++) {
-                Node node = childNodes.item(i);
-                if (node instanceof Element) {
-                    Element ele = (Element) node;
-                    parseHashTree(ele);
-                }
-            }
-            return null;
+            Object scriptWrapper = SaveService.loadElement(inputSource);
+            HashTree testPlan = this.getHashTree(scriptWrapper);
+            MsScenario scenario = new MsScenario();
+            scenario.setHashTree(new LinkedList<>());
+            getTree(testPlan, scenario);
+
+
+            ScenarioImport scenarioImport = new ScenarioImport();
+            scenarioImport.setData(paseObj(scenario, request));
+            scenarioImport.setProjectid(request.getProjectId());
         } catch (Exception e) {
-            LogUtil.error(e.getMessage(), e);
-            return null;
+            e.printStackTrace();
         }
+        return null;
     }
-    private static void parseHashTree(Element hashTree) {
-        if (invalid(hashTree)) {
-            return;
-        }
 
-        if (hashTree.getChildNodes().getLength() > 0) {
-            final NodeList childNodes = hashTree.getChildNodes();
-            for (int i = 0; i < childNodes.getLength(); i++) {
-                Node node = childNodes.item(i);
-                if (node instanceof Element) {
-                    Element ele = (Element) node;
-                    if (invalid(ele)) {
-                        continue;
-                    }
-                    if (nodeNameEquals(ele, HASH_TREE_ELEMENT)) {
-                        parseHashTree(ele);
-                    } else if (nodeNameEquals(ele, ARGUMENTS)) {
-                        processArguments(ele);
-                    } else if (nodeNameEquals(ele, HTTP_SAMPLER_PROXY)) {
-                        processHttpSamplerProxy(ele);
-                    }
+    private List<ApiScenarioWithBLOBs> paseObj(MsScenario msScenario, ApiTestImportRequest request) {
+        List<ApiScenarioWithBLOBs> scenarioWithBLOBsList = new ArrayList<>();
+        ApiScenarioWithBLOBs scenarioWithBLOBs = new ApiScenarioWithBLOBs();
+        ApiScenarioModule module = buildModule(getSelectModule(request.getModuleId()), msScenario.getName());
+        scenarioWithBLOBs.setName(msScenario.getName());
+        scenarioWithBLOBs.setProjectId(request.getProjectId());
+        if (msScenario != null && CollectionUtils.isNotEmpty(msScenario.getHashTree())) {
+            scenarioWithBLOBs.setStepTotal(msScenario.getHashTree().size());
+        }
+        if (module != null) {
+            scenarioWithBLOBs.setApiScenarioModuleId(module.getId());
+            scenarioWithBLOBs.setModulePath("/" + module.getName());
+        }
+        scenarioWithBLOBs.setId(UUID.randomUUID().toString());
+        scenarioWithBLOBs.setScenarioDefinition(JSON.toJSONString(msScenario));
+        scenarioWithBLOBsList.add(scenarioWithBLOBs);
+        return scenarioWithBLOBsList;
+    }
+
+    private HashTree getHashTree(Object scriptWrapper) throws Exception {
+        Field field = scriptWrapper.getClass().getDeclaredField("testPlan");
+        field.setAccessible(true);
+        return (HashTree) field.get(scriptWrapper);
+    }
+
+    private void convertHttpSampler(MsHTTPSamplerProxy samplerProxy, HTTPSamplerProxy source) {
+        try {
+            BeanUtils.copyBean(samplerProxy, source);
+            if (source != null && source.getHTTPFiles().length > 0) {
+                samplerProxy.getBody().setBinary(new ArrayList<>());
+                samplerProxy.getBody().setType(Body.FORM_DATA);
+                List<KeyValue> keyValues = new LinkedList<>();
+                for (HTTPFileArg arg : source.getHTTPFiles()) {
+                    KeyValue keyValue = new KeyValue(arg.getProperty("Argument.name").toString(), arg.getProperty("Argument.value").toString());
+                    keyValue.setContentType(arg.getProperty("HTTPArgument.content_type").toString());
+                    keyValues.add(keyValue);
                 }
+                samplerProxy.getBody().setKvs(keyValues);
             }
-        }
-    }
-
-    private static void processHttpSamplerProxy(Element ele) {
-        if (invalid(ele)) {
-            return;
-        }
-        NodeList childNodes = ele.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node item = childNodes.item(i);
-            if (!(item instanceof Element)) {
-                continue;
-            }
-            Element element = (Element) item;
-            if (nodeNameEquals(element, ELEMENT_PROP) && "HTTPsampler.Arguments".equals(element.getAttribute("name"))) {
-                processArguments(element);
-            } else if ("HTTPSampler.path".equals(element.getAttribute("name"))) {
-                processStringProp(element);
-            }
-        }
-    }
-
-    private static void processArguments(Element ele) {
-        if (invalid(ele)) {
-            return;
-        }
-        NodeList childNodes = ele.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node item = childNodes.item(i);
-            if (!(item instanceof Element)) {
-                continue;
-            }
-            Element element = (Element) item;
-            if (nodeNameEquals(item, COLLECTION_PROP) && "Arguments.arguments".equals(element.getAttribute("name"))) {
-                NodeList elementProps = item.getChildNodes();
-                for (int j = 0; j < elementProps.getLength(); j++) {
-                    Node elementProp = elementProps.item(j);
-                    if (!(elementProp instanceof Element)) {
-                        continue;
-                    }
-                    NodeList stringProps = elementProp.getChildNodes();
-                    for (int k = 0; k < stringProps.getLength(); k++) {
-                        Node stringProp = stringProps.item(k);
-                        if (!(stringProp instanceof Element)) {
-                            continue;
-                        }
-                        processStringProp((Element) stringProp);
-                    }
-                }
-            }
-        }
-    }
-
-    private static void processStringProp(Element ele) {
-        String name = ele.getAttribute("name");
-        switch (name) {
-            case "HTTPSampler.path":
-                String path = ele.getTextContent();
-                Map<String, String> parser = parserUrl(path);
-                String url = parser.get("URL");
-                String params = parser.keySet().stream().filter(k -> !"URL".equals(k)).reduce("?", (u, k) -> {
-                    String v = parser.get(k);
-                    if (!StringUtils.equals("?", u)) {
-                        u += "&";
-                    }
-                    v = ScriptEngineUtils.calculate(v);
-                    // urlencoder
-                    try {
-                        v = URLEncoder.encode(v, "UTF-8");
-                    } catch (UnsupportedEncodingException e) {
-                        LogUtil.error(e);
-                    }
-                    u += k + "=" + v;
-                    return u;
+            samplerProxy.setProtocol(RequestType.HTTP);
+            if (source.getArguments() != null) {
+                List<KeyValue> keyValues = new LinkedList<>();
+                source.getArguments().getArgumentsAsMap().forEach((k, v) -> {
+                    KeyValue keyValue = new KeyValue(k, v);
+                    keyValues.add(keyValue);
                 });
-                //rest参数处理
-                if (url.contains("@")) {
-                    String vars[] = url.split("@");
-                    for (String item : vars) {
-                        if (item.endsWith("/")) {
-                            item = item.substring(0, item.length() - 1);
-                        }
-                        url = url.replace("@" + item, ScriptEngineUtils.calculate("@" + item));
-                    }
-                }
-                ele.setTextContent(url + ((params != null && !params.equals("?")) ? params : ""));
-                break;
-            case "Argument.value":
-                String textContent = ele.getTextContent();
-                if (StringUtils.startsWith(textContent, "@")) {
-                    ele.setTextContent(ScriptEngineUtils.calculate(textContent));
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    private static boolean nodeNameEquals(Node node, String desiredName) {
-        return desiredName.equals(node.getNodeName()) || desiredName.equals(node.getLocalName());
-    }
-
-    private static boolean invalid(Element ele) {
-        return !StringUtils.isBlank(ele.getAttribute("enabled")) && !Boolean.parseBoolean(ele.getAttribute("enabled"));
-    }
-
-    private static Map<String, String> parserUrl(String url) {
-//		传递的URL参数
-        Map<String, String> strUrlParas = new HashMap<>();
-
-        String strUrl;
-        String strUrlParams;
-
-
-//		解析访问地址
-        if (url.contains("?")) {
-            String[] strUrlPatten = url.split("\\?");
-            strUrl = strUrlPatten[0];
-            strUrlParams = strUrlPatten[1];
-
-        } else {
-            strUrl = url;
-            strUrlParams = url;
-        }
-
-        strUrlParas.put("URL", strUrl);
-//		解析参数
-        String[] params = null;
-
-        if (strUrlParams.contains("&")) {
-            params = strUrlParams.split("&");
-        } else {
-            params = new String[]{strUrlParams};
-        }
-
-//		保存参数到参数容器
-        for (String p : params) {
-            if (p.contains("=")) {
-                String[] param = p.split("=");
-                if (param.length == 1) {
-                    strUrlParas.put(param[0], "");
-                } else {
-
-                    String key = param[0];
-                    String value = param[1];
-
-                    strUrlParas.put(key, value);
+                if (CollectionUtils.isNotEmpty(keyValues)) {
+                    samplerProxy.setArguments(keyValues);
                 }
             }
+            samplerProxy.setPath(source.getPath());
+            samplerProxy.setMethod(source.getMethod());
+            if (source.getUrl() != null) {
+                samplerProxy.setUrl(source.getUrl().toString());
+            }
+            samplerProxy.setId(UUID.randomUUID().toString());
+            samplerProxy.setType("HTTPSamplerProxy");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void convertTCPSampler(MsTCPSampler msTCPSampler, TCPSampler tcpSampler) {
+        tcpSampler.setName(tcpSampler.getName());
+        msTCPSampler.setServer(tcpSampler.getServer());
+        msTCPSampler.setPort(tcpSampler.getPort() + "");
+        msTCPSampler.setCtimeout(tcpSampler.getConnectTimeout() + "");
+        msTCPSampler.setReUseConnection(tcpSampler.getProperty(TCPSampler.RE_USE_CONNECTION).getBooleanValue());
+        msTCPSampler.setNodelay(tcpSampler.getProperty(TCPSampler.NODELAY).getBooleanValue());
+        msTCPSampler.setCloseConnection(tcpSampler.isCloseConnection());
+        msTCPSampler.setSoLinger(tcpSampler.getSoLinger() + "");
+        msTCPSampler.setEolByte(tcpSampler.getEolByte() + "");
+        msTCPSampler.setRequest(tcpSampler.getRequestData());
+        msTCPSampler.setUsername(tcpSampler.getProperty(ConfigTestElement.USERNAME).getStringValue());
+        msTCPSampler.setPassword(tcpSampler.getProperty(ConfigTestElement.PASSWORD).getStringValue());
+    }
+
+    private void getTree(HashTree tree, MsScenario scenario) {
+        for (Object key : tree.keySet()) {
+            if (key instanceof TestPlan) {
+                scenario.setName(((TestPlan) key).getName());
+            } else if (key instanceof ThreadGroup) {
+                MsScenario msScenario = new MsScenario(((ThreadGroup) key).getName());
+                if (CollectionUtils.isEmpty(scenario.getHashTree())) {
+                    List<MsTestElement> msTestElementList = new LinkedList<>();
+                    msTestElementList.add(msScenario);
+                }
+                scenario.getHashTree().add(msScenario);
+            } else if (key instanceof HTTPSamplerProxy) {
+                MsHTTPSamplerProxy element = new MsHTTPSamplerProxy();
+                element.setBody(new Body());
+                HTTPSamplerProxy request = (HTTPSamplerProxy) key;
+                convertHttpSampler(element, request);
+                scenario.getHashTree().add(element);
+            } else if (key instanceof TCPSampler) {
+                MsTCPSampler msTCPSampler = new MsTCPSampler();
+                TCPSampler tcpSampler = (TCPSampler) key;
+                convertTCPSampler(msTCPSampler, tcpSampler);
+                scenario.getHashTree().add(msTCPSampler);
+            } else if (key instanceof MsDubboSampler) {
+
+            } else if (key instanceof MsJDBCSampler) {
+
+            } else if (key instanceof JSR223Sampler) {
+                JSR223Sampler jsr223Sampler = (JSR223Sampler) key;
+                MsJSR223Processor processor = new MsJSR223Processor();
+                BeanUtils.copyBean(processor, jsr223Sampler);
+                scenario.getHashTree().add(processor);
+            } else if (key instanceof JSR223PostProcessor) {
+                JSR223PostProcessor jsr223Sampler = (JSR223PostProcessor) key;
+                MsJSR223PostProcessor processor = new MsJSR223PostProcessor();
+                BeanUtils.copyBean(processor, jsr223Sampler);
+                scenario.getHashTree().add(processor);
+            } else if (key instanceof JSR223PreProcessor) {
+                JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
+                MsJSR223PreProcessor processor = new MsJSR223PreProcessor();
+                BeanUtils.copyBean(processor, jsr223Sampler);
+                scenario.getHashTree().add(processor);
+            } else if (key instanceof MsAssertions) {
+
+            } else if (key instanceof MsExtract) {
+
+            } else if (key instanceof MsConstantTimer) {
+
+            } else if (key instanceof MsIfController) {
+
+            } else if (key instanceof MsLoopController) {
+
+            } else {
+                MsJmeterElement jmeterElement = new MsJmeterElement();
+                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
+                jmeterElement.setName(jsonObject.get(TestElement.NAME) == null ? "" : jsonObject.get(TestElement.NAME).toString());
+                jmeterElement.setJmeterElement(key);
+                scenario.getHashTree().add(jmeterElement);
+            }
+            HashTree node = tree.get(key);
+            if (node != null) {
+                getTree(node, scenario);
+            }
         }
-        return strUrlParas;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java
index f425fd1dd0..fc251b0ddc 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/ScenarioImportParserFactory.java
@@ -9,10 +9,9 @@ public class ScenarioImportParserFactory {
             return new MsScenarioParser();
         } else if (StringUtils.equals(ApiImportPlatform.Postman.name(), platform)) {
             return new MsPostmanParser();
+        } else if (StringUtils.equals(ApiImportPlatform.Jmeter.name(), platform)) {
+            return new MsJmeterParser();
         }
-//        else if (StringUtils.equals(ApiImportPlatform.Swagger2.name(), platform)) {
-//            return new Swagger2Parser();
-//        }
         return null;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
index 71cbff9d69..de6e1b6356 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
@@ -34,8 +34,6 @@ import java.util.stream.Collectors;
 public class MsScenario extends MsTestElement {
 
     private String type = "scenario";
-    @JSONField(ordinal = 20)
-    private String name;
 
     @JSONField(ordinal = 21)
     private String referenced;
@@ -51,6 +49,16 @@ public class MsScenario extends MsTestElement {
 
     private static final String BODY_FILE_DIR = "/opt/metersphere/data/body";
 
+    public MsScenario() {
+    }
+
+    public MsScenario(String name) {
+        if (StringUtils.isEmpty(name)) {
+            this.setName("Scenario");
+        }
+        this.setName(name);
+    }
+
     @Override
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
         if (!this.isEnable()) {
@@ -72,7 +80,7 @@ public class MsScenario extends MsTestElement {
             }
         }
 
-        config.setStep(this.name);
+        config.setStep(this.getName());
         config.setStepType("SCENARIO");
         config.setEnableCookieShare(enableCookieShare);
         if (StringUtils.isNotEmpty(environmentId)) {
@@ -109,7 +117,7 @@ public class MsScenario extends MsTestElement {
     private Arguments arguments(ParameterConfig config) {
         Arguments arguments = new Arguments();
         arguments.setEnabled(true);
-        arguments.setName(name + "Variables");
+        arguments.setName(this.getName() + "Variables");
         arguments.setProperty(TestElement.TEST_CLASS, Arguments.class.getName());
         arguments.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("ArgumentsPanel"));
         if (CollectionUtils.isNotEmpty(this.getVariables())) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
index b328123763..69d573f617 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
@@ -22,6 +22,7 @@ import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
 import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
 import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
 import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
+import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
 import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
 import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
@@ -70,11 +71,12 @@ import java.util.stream.Collectors;
         @JsonSubTypes.Type(value = MsIfController.class, name = "IfController"),
         @JsonSubTypes.Type(value = MsScenario.class, name = "scenario"),
         @JsonSubTypes.Type(value = MsLoopController.class, name = "LoopController"),
+        @JsonSubTypes.Type(value = MsJmeterElement.class, name = "JmeterElement"),
 
 })
 @JSONType(seeAlso = {MsHTTPSamplerProxy.class, MsHeaderManager.class, MsJSR223Processor.class, MsJSR223PostProcessor.class,
         MsJSR223PreProcessor.class, MsTestPlan.class, MsThreadGroup.class, AuthManager.class, MsAssertions.class,
-        MsExtract.class, MsTCPSampler.class, MsDubboSampler.class, MsJDBCSampler.class, MsConstantTimer.class, MsIfController.class, MsScenario.class, MsLoopController.class}, typeKey = "type")
+        MsExtract.class, MsTCPSampler.class, MsDubboSampler.class, MsJDBCSampler.class, MsConstantTimer.class, MsIfController.class, MsScenario.class, MsLoopController.class, MsJmeterElement.class}, typeKey = "type")
 @Data
 public abstract class MsTestElement {
     private String type;
@@ -103,7 +105,9 @@ public abstract class MsTestElement {
 
     private static final String BODY_FILE_DIR = "/opt/metersphere/data/body";
 
-    // 公共环境逐层传递，如果自身有环境 以自身引用环境为准否则以公共环境作为请求环境
+    /**
+     * todo 公共环境逐层传递，如果自身有环境 以自身引用环境为准否则以公共环境作为请求环境
+     */
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
         for (MsTestElement el : hashTree) {
             el.toHashTree(tree, el.hashTree, config);
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java
new file mode 100644
index 0000000000..1e97f0758d
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java
@@ -0,0 +1,19 @@
+package io.metersphere.api.dto.definition.request.unknown;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import io.metersphere.api.dto.definition.request.MsTestElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 暂时存放所有未知的Jmeter Element对象
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@JSONType(typeName = "JmeterElement")
+public class MsJmeterElement extends MsTestElement {
+    private String type = "JmeterElement";
+
+    private Object jmeterElement;
+    
+}
diff --git a/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java b/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java
index ae9d45396f..7470f26b48 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ApiImportPlatform.java
@@ -1,5 +1,5 @@
 package io.metersphere.commons.constants;
 
 public enum ApiImportPlatform {
-    Metersphere, Postman, Swagger2, Plugin
+    Metersphere, Postman, Swagger2, Plugin, Jmeter
 }

From 38ce17b5832ca9fa17fbf49e6923dbc5474578f5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 5 Feb 2021 10:14:14 +0800
Subject: [PATCH 05/23] Merge branch 'master' of
 https://github.com/metersphere/metersphere

# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
---
 .../api/controller/APITestController.java     |    4 -
 .../controller/ApiDefinitionController.java   |    4 +-
 .../api/dto/definition/ApiBatchRequest.java   |    2 +
 .../dto/definition/request/MsScenario.java    |    2 +-
 .../dto/definition/request/MsTestElement.java |   13 +-
 .../request/assertions/MsAssertionJSR223.java |    4 +-
 .../request/assertions/MsAssertions.java      |    9 +-
 .../request/controller/MsIfController.java    |    8 +-
 .../request/controller/MsLoopController.java  |    4 +-
 .../definition/request/extract/MsExtract.java |    2 +-
 .../request/sampler/MsHTTPSamplerProxy.java   |   12 +-
 .../request/sampler/MsJDBCSampler.java        |    2 +-
 .../request/sampler/MsTCPSampler.java         |   10 +-
 .../api/jmeter/APIBackendListenerClient.java  |   20 +-
 .../io/metersphere/api/jmeter/TestResult.java |   12 +
 .../api/service/ApiAutomationService.java     |   26 +-
 .../api/service/ApiDefinitionService.java     |   13 +-
 .../api/service/ApiScenarioReportService.java |    8 +
 .../api/service/ApiTestCaseService.java       |    2 +-
 .../service/HistoricalDataUpgradeService.java |    4 +
 .../base/mapper/ext/ExtApiScenarioMapper.xml  |    2 +-
 .../ext/ExtApiScenarioReportMapper.java       |    3 +
 .../mapper/ext/ExtApiScenarioReportMapper.xml |   22 +
 .../mapper/ext/ExtTestPlanReportMapper.xml    |    6 +-
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |   11 +-
 .../commons/constants/ApiRunMode.java         |    2 +-
 .../commons/constants/ResourceStatusEnum.java |    6 +-
 .../job/sechedule/TestPlanTestJob.java        |    5 +-
 .../PerformanceReportController.java          |   11 +-
 .../performance/engine/AbstractEngine.java    |    6 +-
 .../xml/reader/jmx/JmeterDocumentParser.java  |    2 +-
 .../performance/service/ReportService.java    |   28 +-
 .../service/TestResourcePoolService.java      |   30 +-
 .../TestReviewTestCaseController.java         |   10 +-
 .../track/service/TestPlanService.java        |   51 +-
 .../service/TestReviewTestCaseService.java    |   46 +-
 .../api/automation/ApiAutomation.vue          |    4 +-
 .../api/automation/report/ApiReportList.vue   |    3 +-
 .../automation/scenario/AddBasisScenario.vue  |    2 +-
 .../automation/scenario/ApiScenarioList.vue   |  912 +++++++-------
 .../api/automation/scenario/DebugRun.vue      |   18 +
 .../automation/scenario/EditApiScenario.vue   |    5 +-
 .../automation/scenario/ImportApiScenario.vue |    2 +-
 .../automation/scenario/api/ApiRelevance.vue  |   49 +-
 .../scenario/api/RelevanceApiList.vue         |    3 +-
 .../scenario/api/RelevanceCaseList.vue        |   55 +-
 .../scenario/common/ApiBaseComponent.vue      |   70 +-
 .../scenario/component/ApiComponent.vue       |   43 +-
 .../scenario/component/ComponentConfig.vue    |    1 -
 .../scenario/component/LoopController.vue     |   12 +-
 .../scenario/testplan/TestPlanList.vue        |   62 +-
 .../scenario/variable/VariableList.vue        |   78 +-
 .../api/definition/ApiDefinition.vue          |   17 +-
 .../api/definition/components/ApiConfig.vue   |    3 +
 .../assertion/ApiJsonpathSuggest.vue          |   77 +-
 .../components/basis/AddBasisApi.vue          |    2 +-
 .../components/case/ApiCaseItem.vue           |    3 +
 .../components/case/ApiCaseList.vue           |   14 +-
 .../complete/EditCompleteHTTPApi.vue          |   38 +-
 .../components/debug/DebugTcpPage.vue         |    2 -
 .../components/list/ApiCaseSimpleList.vue     |   35 +-
 .../definition/components/list/ApiList.vue    | 1058 +++++++++--------
 .../components/module/ApiModule.vue           |    1 +
 .../components/module/ApiModuleHeader.vue     |    2 +-
 .../request/database/BasisParameters.vue      |    6 +-
 .../components/response/ResponseResult.vue    |   30 +-
 .../api/definition/model/ApiTestModel.js      |    9 +-
 .../components/api/report/ApiReportList.vue   |    2 +-
 .../components/api/test/ApiTestList.vue       |   48 +-
 .../business/components/api/test/Upgrade.vue  |    4 +-
 .../api/test/components/jar/JarConfig.vue     |   56 +-
 .../api/test/components/jar/JarSearchBar.vue  |   16 +-
 .../components/search/search-components.js    |   18 +
 .../components/common/head/HeaderOrgWs.vue    |  293 +++--
 .../common/json-schema/schema/editor/main.vue |    8 +-
 .../report/PerformanceReportView.vue          |    4 +-
 .../report/PerformanceTestReport.vue          |    4 +-
 .../components/PerformancePressureConfig.vue  |   93 +-
 .../performance/test/PerformanceTestList.vue  |    3 +-
 .../components/PerformanceAdvancedConfig.vue  |    2 +-
 .../organization/OrganizationWorkspace.vue    |    6 +-
 .../settings/personal/PersonSetting.vue       |    2 -
 .../components/settings/project/MsProject.vue |   56 +-
 .../components/settings/system/User.vue       |    2 -
 .../track/case/components/TestCaseList.vue    |   45 +-
 .../track/plan/components/TestPlanList.vue    |   27 +-
 .../comonents/api/TestPlanApiCaseList.vue     |    4 +-
 .../functional/FunctionalTestCaseList.vue     |   40 +-
 .../TestCaseFunctionalRelevance.vue           |   43 +-
 .../functional/TestPlanFunctional.vue         |    8 +-
 .../comonents/load/TestPlanLoadCaseList.vue   |    2 +-
 .../component/ApiFailureCasesList.vue         |   18 +-
 .../component/ScenarioFailureCasesList.vue    |   14 +-
 .../report/components/TestPlanReportList.vue  |    8 +-
 .../review/components/TestCaseReviewList.vue  |    3 +-
 .../view/components/TestReviewRelevance.vue   |   49 +-
 .../components/TestReviewTestCaseList.vue     |   41 +-
 frontend/src/common/css/main.css              |    4 +-
 frontend/src/common/js/tableUtils.js          |   71 ++
 frontend/src/common/js/utils.js               |   73 +-
 frontend/src/i18n/en-US.js                    |   28 +-
 frontend/src/i18n/zh-CN.js                    |   20 +-
 frontend/src/i18n/zh-TW.js                    |   20 +-
 frontend/src/login/Login.vue                  |    7 +-
 104 files changed, 2413 insertions(+), 1747 deletions(-)

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 78b90cec9f..82e2ec81e8 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -314,11 +314,7 @@ public class APITestController {
         apiCountResult.setThisWeekExecutedCount(executedInThisWeekCountNumber);
 
         //统计 失败 成功 以及总数
-//        List<ApiDataCountResult> api_allExecuteResult = apiReportService.countByProjectIdGroupByExecuteResult(projectId);
         List<ApiDataCountResult> allExecuteResult = apiScenarioReportService.countByProjectIdGroupByExecuteResult(projectId);
-//        List<ApiDataCountResult> allExecuteResult = new ArrayList<>();
-//        allExecuteResult.addAll(api_allExecuteResult);
-//        allExecuteResult.addAll(scene_allExecuteResult);
         apiCountResult.countScheduleExecute(allExecuteResult);
 
         long allCount = apiCountResult.getExecutedCount();
diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
index 2ce942c37f..254a6083c9 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -6,8 +6,6 @@ import io.metersphere.api.dto.APIReportResult;
 import io.metersphere.api.dto.ApiTestImportRequest;
 import io.metersphere.api.dto.automation.ApiScenarioRequest;
 import io.metersphere.api.dto.automation.ReferenceDTO;
-import io.metersphere.api.dto.datacount.request.ScheduleInfoRequest;
-import io.metersphere.api.dto.datacount.response.TaskInfoResult;
 import io.metersphere.api.dto.definition.*;
 import io.metersphere.api.dto.definition.parse.ApiDefinitionImport;
 import io.metersphere.api.dto.definition.request.ScheduleInfoSwaggerUrlRequest;
@@ -216,4 +214,6 @@ public class ApiDefinitionController {
     public String preview(@RequestBody String jsonSchema) {
         return JSONSchemaGenerator.getJson(jsonSchema);
     }
+
+
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/ApiBatchRequest.java b/backend/src/main/java/io/metersphere/api/dto/definition/ApiBatchRequest.java
index 8c28f72bbc..7566659b14 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/ApiBatchRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/ApiBatchRequest.java
@@ -33,4 +33,6 @@ public class ApiBatchRequest extends ApiDefinitionWithBLOBs {
 
     private List<String> unSelectIds;
 
+    private String moduleId;
+
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
index de6e1b6356..19515769ad 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
@@ -95,7 +95,7 @@ public class MsScenario extends MsTestElement {
         }
         // 场景变量和环境变量
         tree.add(arguments(config));
-        this.addCsvDataSet(tree, variables);
+        //this.addCsvDataSet(tree, variables);
         this.addCounter(tree, variables);
         this.addRandom(tree, variables);
         if (CollectionUtils.isNotEmpty(hashTree)) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
index 69d573f617..7052e1df60 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
@@ -100,6 +100,8 @@ public abstract class MsTestElement {
     private String refType;
     @JSONField(ordinal = 10)
     private LinkedList<MsTestElement> hashTree;
+    @JSONField(ordinal = 11)
+    private boolean customizeReq;
 
     private MsTestElement parent;
 
@@ -192,15 +194,16 @@ public abstract class MsTestElement {
                     csvDataSet.setEnabled(true);
                     csvDataSet.setProperty(TestElement.TEST_CLASS, CSVDataSet.class.getName());
                     csvDataSet.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
-                    csvDataSet.setName(item.getName());
-                    csvDataSet.setProperty("fileEncoding", item.getEncoding());
-                    csvDataSet.setProperty("variableNames", item.getName());
+                    csvDataSet.setName(StringUtils.isEmpty(item.getName()) ? "CSVDataSet" : item.getName());
+                    csvDataSet.setProperty("fileEncoding", StringUtils.isEmpty(item.getEncoding()) ? "UTF-8" : item.getEncoding());
                     if (CollectionUtils.isNotEmpty(item.getFiles())) {
                         csvDataSet.setProperty("filename", BODY_FILE_DIR + "/" + item.getFiles().get(0).getId() + "_" + item.getFiles().get(0).getName());
                     }
                     csvDataSet.setIgnoreFirstLine(false);
+                    csvDataSet.setRecycle(true);
+                    csvDataSet.setProperty("recycle", true);
                     csvDataSet.setProperty("delimiter", item.getDelimiter());
-                    csvDataSet.setComment(item.getDescription());
+                    csvDataSet.setComment(StringUtils.isEmpty(item.getDescription()) ? "" : item.getDescription());
                     tree.add(csvDataSet);
                 });
             }
@@ -222,7 +225,7 @@ public abstract class MsTestElement {
                     counterConfig.setVarName(item.getName());
                     counterConfig.setIncrement(item.getIncrement());
                     counterConfig.setFormat(item.getValue());
-                    counterConfig.setComment(item.getDescription());
+                    counterConfig.setComment(StringUtils.isEmpty(item.getDescription()) ? "" : item.getDescription());
                     tree.add(counterConfig);
                 });
             }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertionJSR223.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertionJSR223.java
index 110741291c..1b523ed774 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertionJSR223.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertionJSR223.java
@@ -13,13 +13,13 @@ public class MsAssertionJSR223 extends MsAssertionType {
     private String desc;
     private String name;
     private String script;
-    private String language;
+    private String scriptLanguage;
 
     public MsAssertionJSR223() {
         setType(MsAssertionType.JSR223);
     }
 
     public boolean isValid() {
-        return StringUtils.isNotBlank(script) && StringUtils.isNotBlank(language);
+        return StringUtils.isNotBlank(script) && StringUtils.isNotBlank(scriptLanguage);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
index 842e0acab8..032e6fe607 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/assertions/MsAssertions.java
@@ -6,6 +6,7 @@ import io.metersphere.api.dto.definition.request.ParameterConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
@@ -89,7 +90,7 @@ public class MsAssertions extends MsTestElement {
     private JSONPathAssertion jsonPathAssertion(MsAssertionJsonPath assertionJsonPath) {
         JSONPathAssertion assertion = new JSONPathAssertion();
         assertion.setEnabled(true);
-        assertion.setName(assertionJsonPath.getDescription());
+        assertion.setName(StringUtils.isEmpty(assertionJsonPath.getDescription()) ? "JSONPathAssertion" : assertionJsonPath.getDescription());
         assertion.setProperty(TestElement.TEST_CLASS, JSONPathAssertion.class.getName());
         assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("JSONPathAssertionGui"));
         assertion.setJsonPath(assertionJsonPath.getExpression());
@@ -104,7 +105,7 @@ public class MsAssertions extends MsTestElement {
     private XPath2Assertion xPath2Assertion(MsAssertionXPath2 assertionXPath2) {
         XPath2Assertion assertion = new XPath2Assertion();
         assertion.setEnabled(true);
-        assertion.setName(assertionXPath2.getExpression());
+        assertion.setName(StringUtils.isEmpty(assertionXPath2.getExpression()) ? "XPath2Assertion" : assertionXPath2.getExpression());
         assertion.setProperty(TestElement.TEST_CLASS, XPath2Assertion.class.getName());
         assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("XPath2AssertionGui"));
         assertion.setXPathString(assertionXPath2.getExpression());
@@ -125,11 +126,11 @@ public class MsAssertions extends MsTestElement {
     private JSR223Assertion jsr223Assertion(MsAssertionJSR223 assertionJSR223) {
         JSR223Assertion assertion = new JSR223Assertion();
         assertion.setEnabled(true);
-        assertion.setName(assertionJSR223.getDesc());
+        assertion.setName(StringUtils.isEmpty(assertionJSR223.getDesc()) ? "JSR223Assertion" : assertionJSR223.getDesc());
         assertion.setProperty(TestElement.TEST_CLASS, JSR223Assertion.class.getName());
         assertion.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         assertion.setProperty("cacheKey", "true");
-        assertion.setProperty("scriptLanguage", assertionJSR223.getLanguage());
+        assertion.setProperty("scriptLanguage", assertionJSR223.getScriptLanguage());
         assertion.setProperty("script", assertionJSR223.getScript());
         return assertion;
     }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsIfController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsIfController.java
index 61a22081cf..acbfa04709 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsIfController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsIfController.java
@@ -42,10 +42,10 @@ public class MsIfController extends MsTestElement {
     private IfController ifController() {
         IfController ifController = new IfController();
         ifController.setEnabled(true);
-        ifController.setName(this.getLabelName());
-        ifController.setCondition(this.getCondition());
+        ifController.setName(StringUtils.isEmpty(this.getName()) ? "IfController" : this.getName());
         ifController.setProperty(TestElement.TEST_CLASS, IfController.class.getName());
         ifController.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("IfControllerPanel"));
+        ifController.setCondition(this.getCondition());
         ifController.setEvaluateAll(false);
         ifController.setUseExpression(true);
         return ifController;
@@ -79,13 +79,13 @@ public class MsIfController extends MsTestElement {
         }
 
         if (StringUtils.equals(operator, "is empty")) {
-            variable = "empty(" + variable + ")";
+            variable = "!empty(" + variable + ")";
             operator = "";
             value = "";
         }
 
         if (StringUtils.equals(operator, "is not empty")) {
-            variable = "!empty(" + variable + ")";
+            variable = "empty(" + variable + ")";
             operator = "";
             value = "";
         }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
index e82c9b07bb..3d05319d2b 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
@@ -123,13 +123,13 @@ public class MsLoopController extends MsTestElement {
         }
 
         if (StringUtils.equals(operator, "is empty")) {
-            variable = "empty(" + variable + ")";
+            variable = "!empty(" + variable + ")";
             operator = "";
             value = "";
         }
 
         if (StringUtils.equals(operator, "is not empty")) {
-            variable = "!empty(" + variable + ")";
+            variable = "empty(" + variable + ")";
             operator = "";
             value = "";
         }
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
index 295890e786..28a78a6e4c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/extract/MsExtract.java
@@ -57,7 +57,7 @@ public class MsExtract extends MsTestElement {
         if (Optional.ofNullable(extract).orElse(extract).length() > 0) {
             JSR223PostProcessor shell = new JSR223PostProcessor();
             shell.setEnabled(true);
-            shell.setName(this.getName());
+            shell.setName(StringUtils.isEmpty(this.getName()) ? "JSR223PostProcessor" : this.getName());
             shell.setProperty(TestElement.TEST_CLASS, JSR223PostProcessor.class.getName());
             shell.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
             shell.setProperty("script", "io.metersphere.api.jmeter.JMeterVars.addVars(prev.hashCode(),vars," + "\"" + extract.toString() + "\"" + ");");
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 702d3326a4..4e35756c1a 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -207,14 +207,17 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         }
 
         final HashTree httpSamplerTree = tree.add(sampler);
+
+        // 注意顺序，放在config前面，会优先于环境的请求头生效
+        if (CollectionUtils.isNotEmpty(this.headers)) {
+            setHeader(httpSamplerTree, this.headers);
+        }
+
         // 通用请求Headers
         if (config != null && config.getConfig() != null && config.getConfig().getHttpConfig() != null
                 && CollectionUtils.isNotEmpty(config.getConfig().getHttpConfig().getHeaders())) {
             setHeader(httpSamplerTree, config.getConfig().getHttpConfig().getHeaders());
         }
-        if (CollectionUtils.isNotEmpty(this.headers)) {
-            setHeader(httpSamplerTree, this.headers);
-        }
 
         //判断是否要开启DNS
         if (config != null && config.getConfig() != null && config.getConfig().getCommonConfig() != null
@@ -287,6 +290,9 @@ public class MsHTTPSamplerProxy extends MsTestElement {
         Arguments arguments = new Arguments();
         list.stream().filter(KeyValue::isValid).filter(KeyValue::isEnable).forEach(keyValue -> {
                     HTTPArgument httpArgument = new HTTPArgument(keyValue.getName(), StringUtils.isNotEmpty(keyValue.getValue()) && keyValue.getValue().startsWith("@") ? ScriptEngineUtils.calculate(keyValue.getValue()) : keyValue.getValue());
+                    if (keyValue.getValue() == null) {
+                        httpArgument.setValue("");
+                    }
                     httpArgument.setAlwaysEncoded(keyValue.isEncode());
                     if (StringUtils.isNotBlank(keyValue.getContentType())) {
                         httpArgument.setContentType(keyValue.getContentType());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
index 3eb20a8b99..dcd0bb5f19 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsJDBCSampler.java
@@ -96,7 +96,7 @@ public class MsJDBCSampler extends MsTestElement {
 
     private Arguments arguments(String name, List<KeyValue> variables) {
         Arguments arguments = new Arguments();
-        if (!variables.isEmpty()) {
+        if (CollectionUtils.isNotEmpty(variables)) {
             arguments.setEnabled(true);
             arguments.setName(name);
             arguments.setProperty(TestElement.TEST_CLASS, Arguments.class.getName());
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
index 50c790534b..0e0031ace9 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsTCPSampler.java
@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.modifiers.UserParameters;
 import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
@@ -79,6 +80,13 @@ public class MsTCPSampler extends MsTestElement {
         }
         config.setConfig(getEnvironmentConfig(useEnvironment));
         parseEnvironment(config.getConfig());
+
+        // 添加环境中的公共变量
+        Arguments arguments = this.addArguments(config);
+        if (arguments != null) {
+            tree.add(this.addArguments(config));
+        }
+
         final HashTree samplerHashTree = new ListedHashTree();
         samplerHashTree.add(tcpConfig());
         tree.set(tcpSampler(config), samplerHashTree);
@@ -94,7 +102,7 @@ public class MsTCPSampler extends MsTestElement {
     }
 
     private void parseEnvironment(EnvironmentConfig config) {
-        if (config != null && config.getTcpConfig() != null) {
+        if (!isCustomizeReq() && config != null && config.getTcpConfig() != null) {
             this.server = config.getTcpConfig().getServer();
             this.port = config.getTcpConfig().getPort();
         }
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
index 262036e359..3923ea49e6 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -2,6 +2,7 @@ package io.metersphere.api.jmeter;
 
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.api.service.*;
+import io.metersphere.base.domain.ApiDefinitionExecResult;
 import io.metersphere.base.domain.ApiScenarioReport;
 import io.metersphere.base.domain.ApiTestReport;
 import io.metersphere.commons.constants.*;
@@ -177,10 +178,17 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         } else if (StringUtils.equals(this.runMode, ApiRunMode.JENKINS.name())) {
             apiDefinitionService.addResult(testResult);
             apiDefinitionExecResultService.saveApiResult(testResult, ApiRunMode.DEFINITION.name());
-            apiTestService.changeStatus(testId, APITestStatus.Completed);
-            report = apiReportService.getRunningReport(testResult.getTestId());
-            apiReportService.complete(testResult, report);
+
+        } else if (StringUtils.equals(this.runMode, ApiRunMode.JENKINS_API_PLAN.name())) {
+            apiDefinitionService.addResult(testResult);
             apiDefinitionExecResultService.saveApiResult(testResult, ApiRunMode.API_PLAN.name());
+            ApiDefinitionExecResult result = new ApiDefinitionExecResult();
+            result = apiDefinitionService.getResultByJenkins(debugReportId, ApiRunMode.API_PLAN.name());
+            report = new ApiTestReport();
+            report.setStatus(result.getStatus());
+            report.setId(result.getId());
+            report.setTriggerMode(ApiRunMode.API.name());
+            report.setName(apiDefinitionService.getApiCaseInfo(testId).getName());
         } else if (StringUtils.equalsAny(this.runMode, ApiRunMode.API_PLAN.name(), ApiRunMode.SCHEDULE_API_PLAN.name())) {
             apiDefinitionService.addResult(testResult);
 
@@ -264,9 +272,15 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         if (StringUtils.equals("Success", report.getStatus())) {
             event = NoticeConstants.Event.EXECUTE_SUCCESSFUL;
         }
+        if (StringUtils.equals("success", report.getStatus())) {
+            event = NoticeConstants.Event.EXECUTE_SUCCESSFUL;
+        }
         if (StringUtils.equals("Error", report.getStatus())) {
             event = NoticeConstants.Event.EXECUTE_FAILED;
         }
+        if (StringUtils.equals("error", report.getStatus())) {
+            event = NoticeConstants.Event.EXECUTE_FAILED;
+        }
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("testName", report.getName());
         paramMap.put("id", report.getId());
diff --git a/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java b/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
index c8914871e7..77cdebca8b 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/TestResult.java
@@ -60,6 +60,18 @@ public class TestResult {
                     item.getSubRequestResults().forEach(subItem -> {
                         subItem.setName(item.getName());
                     });
+                } else {
+                    if (requestResultMap.containsKey(result.getName())) {
+                        requestResultMap.get(result.getName()).add(item);
+                    } else {
+                        List<RequestResult> requestResults = new LinkedList<>();
+                        requestResults.add(item);
+                        requestResultMap.put(result.getName(), requestResults);
+                    }
+                    item.getSubRequestResults().forEach(subItem -> {
+                        subItem.setName(item.getName());
+                    });
+
                 }
             });
         }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index f9d1779d31..2decf1ba4a 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -117,6 +117,15 @@ public class ApiAutomationService {
         if (setDefultOrders) {
             request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         }
+        if (StringUtils.isNotEmpty(request.getExecuteStatus())) {
+            Map<String, List<String>> statusFilter = new HashMap<>();
+            List<String> list = new ArrayList<>();
+            list.add("Prepare");
+            list.add("Underway");
+            list.add("Completed");
+            statusFilter.put("status", list);
+            request.setFilters(statusFilter);
+        }
         if (checkThisWeekData) {
             if (request.isSelectThisWeedData()) {
                 Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
@@ -387,7 +396,7 @@ public class ApiAutomationService {
         try {
             boolean isFirst = true;
             for (ApiScenarioWithBLOBs item : apiScenarios) {
-                if (item.getStepTotal() == 0) {
+                if (item.getStepTotal() == null || item.getStepTotal() == 0) {
                     // 只有一个场景且没有测试步骤，则提示
                     if (apiScenarios.size() == 1) {
                         MSException.throwException((item.getName() + "，" + Translator.get("automation_exec_info")));
@@ -464,6 +473,8 @@ public class ApiAutomationService {
             ids = this.getAllScenarioIdsByFontedSelect(
                     request.getModuleIds(), request.getName(), request.getProjectId(), request.getFilters(), request.getUnSelectIds());
         }
+        //检查是否有正在执行中的情景
+        this.checkScenarioIsRunnng(ids);
         List<ApiScenarioWithBLOBs> apiScenarios = extApiScenarioMapper.selectIds(ids);
 
         String runMode = ApiRunMode.SCENARIO.name();
@@ -480,6 +491,15 @@ public class ApiAutomationService {
         return request.getId();
     }
 
+    public void checkScenarioIsRunnng(List<String> ids) {
+        List<ApiScenarioReport> lastReportStatusByIds = apiReportService.selectLastReportByIds(ids);
+        for (ApiScenarioReport report : lastReportStatusByIds) {
+            if (StringUtils.equals(report.getStatus(), APITestStatus.Running.name())) {
+                MSException.throwException(report.getName() + " Is Running!");
+            }
+        }
+    }
+
     /**
      * 获取前台查询条件查询的所有(未经分页筛选)数据ID
      *
@@ -722,7 +742,9 @@ public class ApiAutomationService {
             apiScenarios.forEach(item -> {
                 JSONObject object = JSONObject.parseObject(item.getScenarioDefinition());
                 object.put("environmentId", request.getEnvironmentId());
-                item.setScenarioDefinition(JSONObject.toJSONString(object));
+                if (object != null) {
+                    item.setScenarioDefinition(JSONObject.toJSONString(object));
+                }
                 apiScenarioMapper.updateByPrimaryKeySelective(item);
             });
         }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
index 390043a1ff..66143cb04d 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -82,6 +82,8 @@ public class ApiDefinitionService {
     private ExtSwaggerUrlScheduleMapper extSwaggerUrlScheduleMapper;
     @Resource
     private ScheduleMapper scheduleMapper;
+    @Resource
+    private ApiTestCaseMapper apiTestCaseMapper;
 
     private static Cache cache = Cache.newHardMemoryCache(0, 3600 * 24);
 
@@ -348,7 +350,8 @@ public class ApiDefinitionService {
     private String setImportHashTree(ApiDefinitionWithBLOBs apiDefinition) {
         String request = apiDefinition.getRequest();
         MsHTTPSamplerProxy msHTTPSamplerProxy = JSONObject.parseObject(request, MsHTTPSamplerProxy.class);
-        msHTTPSamplerProxy.setHashTree(null);
+        msHTTPSamplerProxy.setId(apiDefinition.getId());
+        msHTTPSamplerProxy.setHashTree(new LinkedList<>());
         apiDefinition.setRequest(JSONObject.toJSONString(msHTTPSamplerProxy));
         return request;
     }
@@ -468,6 +471,14 @@ public class ApiDefinitionService {
         return buildAPIReportResult(result);
     }
 
+    public ApiDefinitionExecResult getResultByJenkins(String testId, String type) {
+        return extApiDefinitionExecResultMapper.selectMaxResultByResourceIdAndType(testId, type);
+    }
+
+    public ApiTestCaseWithBLOBs getApiCaseInfo(String apiCaseId) {
+        return apiTestCaseMapper.selectByPrimaryKey(apiCaseId);
+    }
+
 
     public ApiDefinitionImport apiTestImport(MultipartFile file, ApiTestImportRequest request) {
         ApiImportParser apiImportParser = ApiImportParserFactory.getApiImportParser(request.getPlatform());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
index 6c945f5d2e..7469f8a987 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
@@ -415,4 +415,12 @@ public class ApiScenarioReportService {
     public List<ApiDataCountResult> countByProjectIdGroupByExecuteResult(String projectId) {
         return extApiScenarioReportMapper.countByProjectIdGroupByExecuteResult(projectId);
     }
+
+    public List<ApiScenarioReport> selectLastReportByIds(List<String> ids) {
+        if(!ids.isEmpty()){
+            return extApiScenarioReportMapper.selectLastReportByIds(ids);
+        }else {
+            return new ArrayList<>(0);
+        }
+    }
 }
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 f612b84f64..6ccaf75c36 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
@@ -473,7 +473,7 @@ public class ApiTestCaseService {
                 String runMode = ApiRunMode.JENKINS.name();
 */
                 // 调用执行方法
-                jMeterService.runDefinition(request.getReportId(), jmeterHashTree, request.getReportId(), request.getRunMode());
+                jMeterService.runDefinition(request.getCaseId(), jmeterHashTree, request.getReportId(), request.getRunMode());
 
             } catch (Exception ex) {
                 LogUtil.error(ex.getMessage());
diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
index 0e0d55f483..0033018d34 100644
--- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
+++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
@@ -171,12 +171,16 @@ public class HistoricalDataUpgradeService {
                 element = new MsJDBCSampler();
                 SqlRequest request1 = (SqlRequest) request;
                 BeanUtils.copyBean(element, request1);
+
                 EnvironmentDTO dto = environmentDTOMap.get(request1.getDataSource());
                 if (dto != null) {
                     ((MsJDBCSampler) element).setEnvironmentId(dto.getEnvironmentId());
                     ((MsJDBCSampler) element).setDataSourceId(dto.getDatabaseConfig().getId());
                     ((MsJDBCSampler) element).setDataSource(dto.getDatabaseConfig());
                 }
+                if (CollectionUtils.isEmpty(request1.getVariables())) {
+                    ((MsJDBCSampler) element).setVariables(new ArrayList<>());
+                }
                 element.setType("JDBCSampler");
             }
             if (request instanceof TCPRequest) {
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
index 415d22029b..7dce263d4f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioMapper.xml
@@ -304,7 +304,7 @@
 
     <select id="countRunResultByProjectID" resultType="io.metersphere.api.dto.datacount.ApiDataCountResult">
         SELECT count(id) AS countNumber, if(last_result is null,"notRun",last_result) AS groupField  FROM api_scenario
-        WHERE project_id = #{0}
+        WHERE project_id = #{0} AND status != 'Trash'
         GROUP BY groupField
     </select>
 
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java
index 425ec646de..8fd7e161be 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.java
@@ -3,6 +3,7 @@ package io.metersphere.base.mapper.ext;
 import io.metersphere.api.dto.QueryAPIReportRequest;
 import io.metersphere.api.dto.automation.APIScenarioReportResult;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
+import io.metersphere.base.domain.ApiScenarioReport;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -20,4 +21,6 @@ public interface ExtApiScenarioReportMapper {
     long countByProjectIdAndCreateAndByScheduleInThisWeek(@Param("projectId") String projectId, @Param("firstDayTimestamp") long firstDayTimestamp, @Param("lastDayTimestamp") long lastDayTimestamp);
 
     List<ApiDataCountResult> countByProjectIdGroupByExecuteResult(String projectId);
+
+    List<ApiScenarioReport> selectLastReportByIds(@Param("scenarioIdList") List<String> ids);
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
index 8acd2c9948..5a552d03e3 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml
@@ -194,4 +194,26 @@
         WHERE acr.project_id = #{projectId} AND ar.trigger_mode = 'SCHEDULE'
         GROUP BY groupField;
     </select>
+    <select id="selectLastReportByIds" resultType="io.metersphere.base.domain.ApiScenarioReport">
+        SELECT report.* FROM api_scenario_report  report
+        INNER JOIN (
+        SELECT a.id,a.createTime,a.scenario_id FROM
+            (
+                SELECT id AS id,create_time AS createTime, scenario_id AS scenario_id FROM api_scenario_report
+                WHERE scenario_id in
+                    <foreach collection="scenarioIdList" item="value" separator="," open="(" close=")">
+                        #{value}
+                    </foreach>
+                UNION
+                SELECT report.id AS id,report.create_time AS createTime,planScenario.api_scenario_id AS scenario_id FROM api_scenario_report report
+                INNER JOIN test_plan_api_scenario planScenario ON report.scenario_id = planScenario.id
+                WHERE planScenario.api_scenario_id in
+                    <foreach collection="scenarioIdList" item="value" separator="," open="(" close=")">
+                        #{value}
+                    </foreach>
+                ORDER BY createTime DESC
+            ) a GROUP BY a.scenario_id
+        ) orderData ON orderData.id = report.id;
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml
index fb5e0b81ba..c1676447e5 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanReportMapper.xml
@@ -4,10 +4,12 @@
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanReportDTO"
             parameterType="io.metersphere.track.request.report.QueryTestPlanReportRequest">
-        SELECT tpr.id AS id, tpr.`name` AS `name`, tp.`name` AS testPlanName, u.name AS creator, tpr.create_time AS createTime,tpr.trigger_Mode AS triggerMode,tpr.status AS status
+        SELECT tpr.id AS id, tpr.`name` AS `name`, tp.`name` AS testPlanName,
+        IF(u.name is null,tpr.creator,u.name)AS creator,
+        tpr.create_time AS createTime,tpr.trigger_Mode AS triggerMode,tpr.status AS status
         FROM test_plan tp
         INNER JOIN test_plan_report tpr on tp.id = tpr.test_plan_id
-        INNER JOIN user u on tpr.creator = u.id
+        LEFT JOIN user u on tpr.creator = u.id
         <where>
             <if test="name != null">
                 and tpr.name like CONCAT('%', #{name},'%')
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index fabf6ce1da..854373e172 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -339,7 +339,8 @@
         where plan_id = #{planId}
     </select>
     <select id="listByPlanId" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
-        SELECT test_plan_api_case.api_case_id as id,"definition" as type,api_test_case.name,test_plan_api_case.status
+        SELECT test_plan_api_case.id as reportId,test_plan_api_case.api_case_id as id,"definition" as
+        type,api_test_case.name,test_plan_api_case.status
         from test_plan_api_case left join api_test_case on test_plan_api_case.api_case_id=api_test_case.id
         inner join
         api_definition a
@@ -352,7 +353,7 @@
             </if>
         </where>
         UNION ALL
-        SELECT test_plan_api_scenario.api_scenario_id as id,"scenario" as
+        SELECT test_plan_api_scenario.id as reportId,test_plan_api_scenario.api_scenario_id as id,"scenario" as
         type,api_scenario.name,test_plan_api_scenario.status
         from test_plan_api_scenario
         left join
@@ -366,7 +367,8 @@
             </if>
         </where>
         UNION ALL
-        select load_test.id as id,"perform" as type,load_test.name as name,test_plan_load_case.status from test_plan_load_case inner join
+        select test_plan_load_case.id as reportId,load_test.id as id,"perform" as type,load_test.name as
+        name,test_plan_load_case.status from test_plan_load_case inner join
         load_test on
         test_plan_load_case.load_case_id =load_test.id
         <where>
@@ -375,7 +377,8 @@
             </if>
         </where>
         UNION ALL
-        SELECT test_case.test_id as id,test_case.type as type,test_case.name,test_plan_test_case.status
+        SELECT test_case.id as reportId,test_case.test_id as id,test_case.type as
+        type,test_case.name,test_plan_test_case.status
         from test_plan_test_case left join test_case on test_plan_test_case.case_id =test_case.id
         <where>
             <if test="request.planId != null">
diff --git a/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java b/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java
index 6497517644..b4a04a77cc 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ApiRunMode.java
@@ -1,5 +1,5 @@
 package io.metersphere.commons.constants;
 
 public enum ApiRunMode {
-    RUN, DEBUG, DEFINITION, SCENARIO, API_PLAN, JENKINS, SCENARIO_PLAN, API, SCHEDULE_API_PLAN, SCHEDULE_SCENARIO_PLAN, SCHEDULE_PERFORMANCE_TEST
+    RUN, DEBUG, DEFINITION, SCENARIO, API_PLAN, JENKINS_API_PLAN, JENKINS, SCENARIO_PLAN, API, SCHEDULE_API_PLAN, SCHEDULE_SCENARIO_PLAN, SCHEDULE_PERFORMANCE_TEST
 }
diff --git a/backend/src/main/java/io/metersphere/commons/constants/ResourceStatusEnum.java b/backend/src/main/java/io/metersphere/commons/constants/ResourceStatusEnum.java
index 7830ac83a8..812148daac 100644
--- a/backend/src/main/java/io/metersphere/commons/constants/ResourceStatusEnum.java
+++ b/backend/src/main/java/io/metersphere/commons/constants/ResourceStatusEnum.java
@@ -11,5 +11,9 @@ public enum ResourceStatusEnum {
     /**
      * 有效
      */
-    VALID
+    VALID,
+    /**
+     * 删除
+     */
+    DELETE
 }
diff --git a/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java b/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
index facd021288..9937fa90ac 100644
--- a/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
+++ b/backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java
@@ -29,7 +29,7 @@ public class TestPlanTestJob extends MsScheduleJob {
     private String projectID;
 
 
-//    private PerformanceTestService performanceTestService;
+    //    private PerformanceTestService performanceTestService;
 //    private TestPlanScenarioCaseService testPlanScenarioCaseService;
 //    private TestPlanApiCaseService testPlanApiCaseService;
 //    private ApiTestCaseService apiTestCaseService;
@@ -66,13 +66,12 @@ public class TestPlanTestJob extends MsScheduleJob {
         this.projectID = jobDataMap.getString("projectId");
 
 
-
         businessExecute(context);
     }
 
     @Override
     void businessExecute(JobExecutionContext context) {
-        testPlanService.run(this.resourceId,this.projectID,this.userId,ReportTriggerMode.SCHEDULE.name());
+        testPlanService.run(this.resourceId, this.projectID, this.userId, ReportTriggerMode.SCHEDULE.name());
     }
 
     public static JobKey getJobKey(String testId) {
diff --git a/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
index 828cd04e5a..5031c4e889 100644
--- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
+++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java
@@ -16,9 +16,6 @@ import io.metersphere.performance.controller.request.ReportRequest;
 import io.metersphere.performance.service.ReportService;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -137,11 +134,7 @@ public class PerformanceReportController {
     }
 
     @GetMapping("/jtl/download/{reportId}")
-    public ResponseEntity<byte[]> downloadJtl(@PathVariable String reportId) {
-        byte[] bytes = reportService.downloadJtl(reportId);
-        return ResponseEntity.ok()
-                .contentType(MediaType.parseMediaType("application/octet-stream"))
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + reportId + ".jtl\"")
-                .body(bytes);
+    public void downloadJtlZip(@PathVariable String reportId, HttpServletResponse response) {
+        reportService.downloadJtlZip(reportId, response);
     }
 }
diff --git a/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java b/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java
index f6eda2e823..73b3b50833 100644
--- a/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java
+++ b/backend/src/main/java/io/metersphere/performance/engine/AbstractEngine.java
@@ -8,6 +8,7 @@ import io.metersphere.base.domain.TestResource;
 import io.metersphere.base.domain.TestResourcePool;
 import io.metersphere.commons.constants.PerformanceTestStatus;
 import io.metersphere.commons.constants.ResourcePoolTypeEnum;
+import io.metersphere.commons.constants.ResourceStatusEnum;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.config.JmeterProperties;
@@ -55,13 +56,16 @@ public abstract class AbstractEngine implements Engine {
             MSException.throwException("Resource Pool ID is empty");
         }
         TestResourcePool resourcePool = testResourcePoolService.getResourcePool(resourcePoolId);
-        if (resourcePool == null) {
+        if (resourcePool == null || StringUtils.equals(resourcePool.getStatus(), ResourceStatusEnum.DELETE.name())) {
             MSException.throwException("Resource Pool is empty");
         }
         if (!ResourcePoolTypeEnum.K8S.name().equals(resourcePool.getType())
                 && !ResourcePoolTypeEnum.NODE.name().equals(resourcePool.getType())) {
             MSException.throwException("Invalid Resource Pool type.");
         }
+        if (!StringUtils.equals(resourcePool.getStatus(), ResourceStatusEnum.VALID.name())) {
+            MSException.throwException("Resource Pool Status is not VALID");
+        }
         // image
         String image = resourcePool.getImage();
         if (StringUtils.isNotEmpty(image)) {
diff --git a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
index 3d60763613..73f401036e 100644
--- a/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
+++ b/backend/src/main/java/io/metersphere/performance/parse/xml/reader/jmx/JmeterDocumentParser.java
@@ -387,7 +387,7 @@ public class JmeterDocumentParser implements DocumentParser {
         element.appendChild(createStringProp(document, "HTTPSampler.contentEncoding", ""));
         element.appendChild(createStringProp(document, "HTTPSampler.path", ""));
         element.appendChild(createStringProp(document, "HTTPSampler.concurrentPool", "6"));
-        element.appendChild(createStringProp(document, "HTTPSampler.connect_timeout", ""));
+        element.appendChild(createStringProp(document, "HTTPSampler.connect_timeout", "60000"));
         element.appendChild(createStringProp(document, "HTTPSampler.response_timeout", ""));
         hashTree.appendChild(element);
         // 空的 hashTree
diff --git a/backend/src/main/java/io/metersphere/performance/service/ReportService.java b/backend/src/main/java/io/metersphere/performance/service/ReportService.java
index f6e9d65882..d453cf6d1d 100644
--- a/backend/src/main/java/io/metersphere/performance/service/ReportService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/ReportService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
+import io.metersphere.base.mapper.ext.ExtFileContentMapper;
 import io.metersphere.base.mapper.ext.ExtLoadTestReportMapper;
 import io.metersphere.commons.constants.PerformanceTestStatus;
 import io.metersphere.commons.constants.ReportKeys;
@@ -23,11 +24,15 @@ import io.metersphere.performance.engine.EngineFactory;
 import io.metersphere.service.FileService;
 import io.metersphere.service.TestResourceService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +57,8 @@ public class ReportService {
     private LoadTestReportDetailMapper loadTestReportDetailMapper;
     @Resource
     private FileService fileService;
+    @Resource
+    private SqlSessionFactory sqlSessionFactory;
 
     public List<ReportDTO> getRecentReportList(ReportRequest request) {
         List<OrderRequest> orders = new ArrayList<>();
@@ -284,11 +291,28 @@ public class ReportService {
         return JSON.parseArray(content, ChartsData.class);
     }
 
-    public byte[] downloadJtl(String reportId) {
+    /**
+     * 流下载 jtl zip
+     */
+    public void downloadJtlZip(String reportId, HttpServletResponse response) {
         LoadTestReportWithBLOBs report = getReport(reportId);
         if (StringUtils.isBlank(report.getFileId())) {
             throw new RuntimeException(Translator.get("load_test_report_file_not_exist"));
         }
-        return fileService.loadFileAsBytes(report.getFileId());
+        response.setHeader("Content-Disposition", "attachment;fileName=" + reportId + ".zip");
+        try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+            ExtFileContentMapper mapper = sqlSession.getMapper(ExtFileContentMapper.class);
+            try (InputStream inputStream = mapper.selectZipBytes(report.getFileId())) {
+                ServletOutputStream outputStream = response.getOutputStream();
+                byte[] buffer = new byte[1024 * 4];
+                int read;
+                while ((read = inputStream.read(buffer)) > -1) {
+                    outputStream.write(buffer, 0, read);
+                }
+            } catch (Exception e) {
+                LogUtil.error(e);
+                MSException.throwException(e);
+            }
+        }
     }
 }
diff --git a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
index b76bd9021d..bca5686ebd 100644
--- a/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
+++ b/backend/src/main/java/io/metersphere/service/TestResourcePoolService.java
@@ -24,8 +24,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static io.metersphere.commons.constants.ResourceStatusEnum.INVALID;
-import static io.metersphere.commons.constants.ResourceStatusEnum.VALID;
+import static io.metersphere.commons.constants.ResourceStatusEnum.*;
 
 /**
  * @author dongbin
@@ -39,8 +38,6 @@ public class TestResourcePoolService {
     @Resource
     private TestResourceMapper testResourceMapper;
     @Resource
-    private LoadTestMapper loadTestMapper;
-    @Resource
     private NodeResourcePoolService nodeResourcePoolService;
 
     public TestResourcePoolDTO addTestResourcePool(TestResourcePoolDTO testResourcePool) {
@@ -55,25 +52,7 @@ public class TestResourcePoolService {
     }
 
     public void deleteTestResourcePool(String testResourcePoolId) {
-        // check test is Running Starting Error
-        checkTestStatus(testResourcePoolId);
-        deleteTestResource(testResourcePoolId);
-        testResourcePoolMapper.deleteByPrimaryKey(testResourcePoolId);
-    }
-
-    public void checkTestStatus(String testResourcePoolId) {
-        LoadTestExample example = new LoadTestExample();
-        example.createCriteria()
-                .andTestResourcePoolIdEqualTo(testResourcePoolId);
-        List<LoadTest> loadTests = loadTestMapper.selectByExample(example);
-        StringBuilder loadTestNames = new StringBuilder();
-        if (loadTests.size() > 0) {
-            for (LoadTest loadTest : loadTests) {
-                loadTestNames = loadTestNames.append(loadTest.getName()).append(",");
-            }
-            String str = loadTestNames.substring(0, loadTestNames.length() - 1);
-            MSException.throwException(Translator.get("load_test") + " " + str + " " + Translator.get("test_resource_pool_is_use"));
-        }
+        updateTestResourcePoolStatus(testResourcePoolId, DELETE.name());
     }
 
     public void updateTestResourcePool(TestResourcePoolDTO testResourcePool) {
@@ -109,8 +88,8 @@ public class TestResourcePoolService {
         }
         testResourcePool.setUpdateTime(System.currentTimeMillis());
         testResourcePool.setStatus(status);
-        // 禁用资源池
-        if (INVALID.name().equals(status)) {
+        // 禁用/删除 资源池
+        if (INVALID.name().equals(status) || DELETE.name().equals(status)) {
             testResourcePoolMapper.updateByPrimaryKeySelective(testResourcePool);
             return;
         }
@@ -140,6 +119,7 @@ public class TestResourcePoolService {
         if (StringUtils.isNotBlank(request.getStatus())) {
             criteria.andStatusEqualTo(request.getStatus());
         }
+        criteria.andStatusNotEqualTo(DELETE.name());
         example.setOrderByClause("update_time desc");
         List<TestResourcePool> testResourcePools = testResourcePoolMapper.selectByExample(example);
         List<TestResourcePoolDTO> testResourcePoolDTOS = new ArrayList<>();
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
index 8d125d5523..58cc38f0f0 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestReviewTestCaseController.java
@@ -39,8 +39,14 @@ public class TestReviewTestCaseController {
 
     @PostMapping("/batch/delete")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public void deleteTestCaseBath(@RequestBody TestReviewCaseBatchRequest request) {
-        testReviewTestCaseService.deleteTestCaseBath(request);
+    public void deleteTestCaseBatch(@RequestBody TestReviewCaseBatchRequest request) {
+        testReviewTestCaseService.deleteTestCaseBatch(request);
+    }
+
+    @PostMapping("/batch/edit/status")
+    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+    public void editTestCaseBatch(@RequestBody TestReviewCaseBatchRequest request) {
+        testReviewTestCaseService.editTestCaseBatchStatus(request);
     }
 
     @PostMapping("/list/all")
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
index 57078d9673..3618019da1 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -39,7 +39,6 @@ import io.metersphere.track.request.testplan.LoadCaseRequest;
 import io.metersphere.track.request.testplan.RunTestPlanRequest;
 import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -179,8 +178,7 @@ public class TestPlanService {
                 else if (res.getStatus().equals(TestPlanStatus.Completed.name())) {
                     testPlan.setActualEndTime(null);
                 }   //  已完成->进行中，结束时间置空
-            }
-            else if (!res.getStatus().equals(TestPlanStatus.Prepare.name()) &&
+            } else if (!res.getStatus().equals(TestPlanStatus.Prepare.name()) &&
                     testPlan.getStatus().equals(TestPlanStatus.Prepare.name())) {
                 testPlan.setActualStartTime(null);
                 testPlan.setActualEndTime(null);
@@ -338,7 +336,7 @@ public class TestPlanService {
         testPlanScenarioCaseService.deleteByPlanId(planId);
 
         //删除定时任务
-        scheduleService.deleteScheduleAndJobByResourceId(planId,ScheduleGroup.TEST_PLAN_TEST.name());
+        scheduleService.deleteScheduleAndJobByResourceId(planId, ScheduleGroup.TEST_PLAN_TEST.name());
 
         int num = testPlanMapper.deleteByPrimaryKey(planId);
         List<String> relatedUsers = new ArrayList<>();
@@ -437,7 +435,7 @@ public class TestPlanService {
     }
 
     public List<TestPlanDTOWithMetric> listTestPlanByProject(QueryTestPlanRequest request) {
-        List<TestPlanDTOWithMetric> testPlans=extTestPlanMapper.list(request);
+        List<TestPlanDTOWithMetric> testPlans = extTestPlanMapper.list(request);
         return testPlans;
     }
 
@@ -784,12 +782,13 @@ public class TestPlanService {
         }
         return issues;
     }
-    public List<TestPlanDTO> selectTestPlanByRelevancy(QueryTestPlanRequest params){
-        return  extTestPlanMapper.selectTestPlanByRelevancy(params);
+
+    public List<TestPlanDTO> selectTestPlanByRelevancy(QueryTestPlanRequest params) {
+        return extTestPlanMapper.selectTestPlanByRelevancy(params);
     }
 
     public String findTestProjectNameByTestPlanID(String testPlanId) {
-        return  extTestPlanMapper.findTestProjectNameByTestPlanID(testPlanId);
+        return extTestPlanMapper.findTestProjectNameByTestPlanID(testPlanId);
     }
 
     public String findScheduleCreateUserById(String testPlanId) {
@@ -877,23 +876,23 @@ public class TestPlanService {
         return request.getId();
     }
 
-    public void run(String testPlanID,String projectID,String userId,String triggerMode){
-        Map<String,String> planScenarioIdMap;
-        Map<String,String> apiTestCaseIdMap;
-        Map<String,String> performanceIdMap;
+    public void run(String testPlanID, String projectID, String userId, String triggerMode) {
+        Map<String, String> planScenarioIdMap;
+        Map<String, String> apiTestCaseIdMap;
+        Map<String, String> performanceIdMap;
 
         planScenarioIdMap = new LinkedHashMap<>();
         apiTestCaseIdMap = new LinkedHashMap<>();
         performanceIdMap = new LinkedHashMap<>();
 
         List<TestPlanApiScenario> testPlanApiScenarioList = testPlanScenarioCaseService.getCasesByPlanId(testPlanID);
-        for (TestPlanApiScenario model :testPlanApiScenarioList) {
-            planScenarioIdMap.put(model.getApiScenarioId(),model.getId());
+        for (TestPlanApiScenario model : testPlanApiScenarioList) {
+            planScenarioIdMap.put(model.getApiScenarioId(), model.getId());
         }
         List<TestPlanApiCase> testPlanApiCaseList = testPlanApiCaseService.getCasesByPlanId(testPlanID);
         for (TestPlanApiCase model :
                 testPlanApiCaseList) {
-            apiTestCaseIdMap.put(model.getApiCaseId(),model.getId());
+            apiTestCaseIdMap.put(model.getApiCaseId(), model.getId());
         }
 
         LoadCaseRequest loadCaseRequest = new LoadCaseRequest();
@@ -901,24 +900,24 @@ public class TestPlanService {
         loadCaseRequest.setProjectId(projectID);
         List<TestPlanLoadCaseDTO> testPlanLoadCaseDTOList = testPlanLoadCaseService.list(loadCaseRequest);
         for (TestPlanLoadCaseDTO dto : testPlanLoadCaseDTOList) {
-            performanceIdMap.put(dto.getId(),dto.getLoadCaseId());
+            performanceIdMap.put(dto.getId(), dto.getLoadCaseId());
         }
 
         LogUtil.info("-------------- start testplan schedule ----------");
         TestPlanReportService testPlanReportService = CommonBeanFactory.getBean(TestPlanReportService.class);
         //首先创建testPlanReport，然后返回的ID重新赋值为resourceID，作为后续的参数
-        TestPlanReport testPlanReport = testPlanReportService.genTestPlanReport(testPlanID,userId,triggerMode);
+        TestPlanReport testPlanReport = testPlanReportService.genTestPlanReport(testPlanID, userId, triggerMode);
         //执行接口案例任务
-        for (Map.Entry<String,String> entry: apiTestCaseIdMap.entrySet()) {
+        for (Map.Entry<String, String> entry : apiTestCaseIdMap.entrySet()) {
             String apiCaseID = entry.getKey();
             String planCaseID = entry.getValue();
             ApiTestCaseWithBLOBs blobs = apiTestCaseService.get(apiCaseID);
             //需要更新这里来保证PlanCase的状态能正常更改
-            apiTestCaseService.run(blobs,UUID.randomUUID().toString(),testPlanReport.getId(),testPlanID,ApiRunMode.SCHEDULE_API_PLAN.name());
+            apiTestCaseService.run(blobs, UUID.randomUUID().toString(), testPlanReport.getId(), testPlanID, ApiRunMode.SCHEDULE_API_PLAN.name());
         }
 
         //执行场景执行任务
-        if(!planScenarioIdMap.isEmpty()){
+        if (!planScenarioIdMap.isEmpty()) {
             LogUtil.info("-------------- testplan schedule ---------- api case over -----------------");
             SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
             String senarionReportID = UUID.randomUUID().toString();
@@ -927,7 +926,7 @@ public class TestPlanService {
             scenarioRequest.setProjectId(projectID);
             scenarioRequest.setTriggerMode(ReportTriggerMode.SCHEDULE.name());
             scenarioRequest.setExecuteType(ExecuteType.Saved.name());
-            Map<String, Map<String,String>> testPlanScenarioIdMap = new HashMap<>();
+            Map<String, Map<String, String>> testPlanScenarioIdMap = new HashMap<>();
             testPlanScenarioIdMap.put(testPlanID, planScenarioIdMap);
             scenarioRequest.setTestPlanScenarioIDMap(testPlanScenarioIdMap);
             scenarioRequest.setReportUserID(userId);
@@ -939,7 +938,7 @@ public class TestPlanService {
         }
         //执行性能测试任务
         List<String> performaneReportIDList = new ArrayList<>();
-        for (Map.Entry<String,String> entry: performanceIdMap.entrySet()) {
+        for (Map.Entry<String, String> entry : performanceIdMap.entrySet()) {
             String id = entry.getKey();
             String caseID = entry.getValue();
             RunTestPlanRequest performanceRequest = new RunTestPlanRequest();
@@ -949,7 +948,7 @@ public class TestPlanService {
             String reportId = null;
             try {
                 reportId = performanceTestService.run(performanceRequest);
-                if(reportId!=null){
+                if (reportId != null) {
                     performaneReportIDList.add(reportId);
 
                     TestPlanLoadCase testPlanLoadCase = new TestPlanLoadCase();
@@ -957,7 +956,7 @@ public class TestPlanService {
                     testPlanLoadCase.setLoadReportId(reportId);
                     testPlanLoadCaseService.update(testPlanLoadCase);
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 e.printStackTrace();
             }
             //更新关联处的报告
@@ -967,9 +966,9 @@ public class TestPlanService {
             testPlanLoadCaseService.update(loadCase);
         }
 
-        if(!performaneReportIDList.isEmpty()){
+        if (!performaneReportIDList.isEmpty()) {
             //性能测试时保存性能测试报告ID，在结果返回时用于捕捉并进行
-            testPlanReportService.updatePerformanceInfo(testPlanReport,performaneReportIDList,ReportTriggerMode.SCHEDULE.name());
+            testPlanReportService.updatePerformanceInfo(testPlanReport, performaneReportIDList, ReportTriggerMode.SCHEDULE.name());
         }
     }
 }
diff --git a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
index 21f63600ff..067001fbd1 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -18,6 +18,7 @@ import io.metersphere.track.request.testreview.QueryCaseReviewRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -97,7 +98,7 @@ public class TestReviewTestCaseService {
         }
     }
 
-    public void deleteTestCaseBath(TestReviewCaseBatchRequest request) {
+    public void deleteTestCaseBatch(TestReviewCaseBatchRequest request) {
         checkReviewer(request.getReviewId());
         TestCaseReviewTestCaseExample example = new TestCaseReviewTestCaseExample();
         example.createCriteria().andIdIn(request.getIds());
@@ -105,15 +106,7 @@ public class TestReviewTestCaseService {
     }
 
     public void editTestCase(TestCaseReviewTestCase testCaseReviewTestCase) {
-        String currentUserId = SessionUtils.getUser().getId();
-        String reviewId = testCaseReviewTestCase.getReviewId();
-        TestCaseReviewUsersExample testCaseReviewUsersExample = new TestCaseReviewUsersExample();
-        testCaseReviewUsersExample.createCriteria().andReviewIdEqualTo(reviewId);
-        List<TestCaseReviewUsers> testCaseReviewUsers = testCaseReviewUsersMapper.selectByExample(testCaseReviewUsersExample);
-        List<String> reviewIds = testCaseReviewUsers.stream().map(TestCaseReviewUsers::getUserId).collect(Collectors.toList());
-        if (!reviewIds.contains(currentUserId)) {
-            MSException.throwException("非此用例的评审人员！");
-        }
+        checkReviewCase(testCaseReviewTestCase.getReviewId());
 
         // 记录测试用例评审状态变更
         testCaseReviewTestCase.setStatus(testCaseReviewTestCase.getStatus());
@@ -137,4 +130,37 @@ public class TestReviewTestCaseService {
     public TestReviewCaseDTO get(String reviewId) {
         return extTestReviewCaseMapper.get(reviewId);
     }
+
+    public void editTestCaseBatchStatus(TestReviewCaseBatchRequest request) {
+        List<String> ids = request.getIds();
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+
+        if (StringUtils.isBlank(request.getReviewId())) {
+            return;
+        } else {
+            checkReviewCase(request.getReviewId());
+        }
+
+        // 更新状态
+        if (StringUtils.isNotBlank(request.getStatus())) {
+            TestCaseExample example = new TestCaseExample();
+            example.createCriteria().andIdIn(ids);
+            TestCaseWithBLOBs testCase = new TestCaseWithBLOBs();
+            testCase.setReviewStatus(request.getStatus());
+            testCaseMapper.updateByExampleSelective(testCase, example);
+        }
+    }
+
+    private void checkReviewCase(String reviewId) {
+        String currentUserId = SessionUtils.getUser().getId();
+        TestCaseReviewUsersExample testCaseReviewUsersExample = new TestCaseReviewUsersExample();
+        testCaseReviewUsersExample.createCriteria().andReviewIdEqualTo(reviewId);
+        List<TestCaseReviewUsers> testCaseReviewUsers = testCaseReviewUsersMapper.selectByExample(testCaseReviewUsersExample);
+        List<String> reviewIds = testCaseReviewUsers.stream().map(TestCaseReviewUsers::getUserId).collect(Collectors.toList());
+        if (!reviewIds.contains(currentUserId)) {
+            MSException.throwException("非此用例的评审人员！");
+        }
+    }
 }
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 05f048cdd0..120e2f038c 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -297,5 +297,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .el-tabs__header {
+    margin: 0 0 0px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/automation/report/ApiReportList.vue b/frontend/src/business/components/api/automation/report/ApiReportList.vue
index c9c2923042..4d0d6cb1c7 100644
--- a/frontend/src/business/components/api/automation/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/automation/report/ApiReportList.vue
@@ -83,13 +83,14 @@ import MsTableHeader from "../../../common/components/MsTableHeader";
 import MsContainer from "../../../common/components/MsContainer";
 import MsMainContainer from "../../../common/components/MsMainContainer";
 import MsApiReportStatus from "./ApiReportStatus";
-import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 import ReportTriggerModeItem from "../../../common/tableItem/ReportTriggerModeItem";
 import {REPORT_CONFIGS} from "../../../common/components/search/search-components";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
 import ShowMoreBtn from "../../../track/case/components/ShowMoreBtn";
 import MsApiReportDetail from "./ApiReportDetail";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   components: {
diff --git a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
index a95be114ee..96110380f6 100644
--- a/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddBasisScenario.vue
@@ -74,7 +74,7 @@
         rule: {
           name: [
             {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
-            {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
+            {max: 100, message: this.$t('test_track.length_less_than') + '100', trigger: 'blur'}
           ],
           principal: [{
             required: true,
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index db128915a9..7f3f94c983 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -10,17 +10,19 @@
                 @sort-change="sort"
                 @filter-change="filter"
                 @select-all="select" @select="select"
+                @header-dragend="headerDragend"
+                :height="screenHeight"
                 v-loading="loading">
 
         <el-table-column type="selection" width="50"/>
 
         <ms-table-header-select-popover v-show="total>0"
-                             :page-size="pageSize>total?total:pageSize"
-                             :total="total"
-                             @selectPageAll="isSelectDataAll(false)"
-                             @selectAll="isSelectDataAll(true)"/>
+                                        :page-size="pageSize>total?total:pageSize"
+                                        :total="total"
+                                        @selectPageAll="isSelectDataAll(false)"
+                                        @selectAll="isSelectDataAll(true)"/>
 
-        <el-table-column v-if="!referenced" width="30" :resizable="false" align="center">
+        <el-table-column v-if="!referenced" width="30" min-width="30" :resizable="false" align="center">
           <template v-slot:default="scope">
             <show-more-btn :is-show="isSelect(scope.row)" :buttons="buttons" :size="selectDataCounts"/>
           </template>
@@ -28,6 +30,7 @@
 
         <el-table-column prop="num" label="ID"
                          sortable="custom"
+                         min-width="120px"
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tooltip content="编辑">
@@ -44,8 +47,10 @@
                          sortable="custom"
                          column-key="level"
                          :filters="levelFilters"
+                         min-width="120px"
+
                          :label="$t('api_test.automation.case_level')"
-                         show-overflow-tooltip min-width="120px">
+                         show-overflow-tooltip>
           <template v-slot:default="scope">
             <priority-table-item :value="scope.row.level"/>
           </template>
@@ -54,32 +59,37 @@
                          sortable="custom"
                          column-key="status"
                          :filters="statusFilters"
+
                          show-overflow-tooltip min-width="120px">
           <template v-slot:default="scope">
             <plan-status-table-item :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column prop="tags" :label="$t('api_test.automation.tag')">
+        <el-table-column prop="tags" min-width="120px"
+                         :label="$t('api_test.automation.tag')">
           <template v-slot:default="scope">
             <div v-for="(itemName,index)  in scope.row.tags" :key="index">
               <ms-tag type="success" effect="plain" :content="itemName"/>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="userId" :label="$t('api_test.automation.creator')"
+        <el-table-column prop="userId" min-width="120px"
+                         :label="$t('api_test.automation.creator')"
                          :filters="userFilters"
                          column-key="user_id"
                          sortable="custom"
-                         min-width="100px"
                          show-overflow-tooltip/>
-        <el-table-column prop="updateTime" :label="$t('api_test.automation.update_time')" sortable="custom" width="180">
+        <el-table-column prop="updateTime" :label="$t('api_test.automation.update_time')" sortable="custom" min-width="180px"
+        >
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="stepTotal" :label="$t('api_test.automation.step')" show-overflow-tooltip/>
+        <el-table-column prop="stepTotal" :label="$t('api_test.automation.step')" min-width="80px"
+                         show-overflow-tooltip/>
         <el-table-column prop="lastResult" :label="$t('api_test.automation.last_result')"
                          :filters="resultFilters"
+
                          sortable="custom" column-key="last_result" min-width="120px">
           <template v-slot:default="{row}">
             <el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success'">
@@ -91,6 +101,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="passRate" :label="$t('api_test.automation.passing_rate')"
+                         min-width="120px"
+
                          show-overflow-tooltip/>
         <el-table-column fixed="right" :label="$t('commons.operating')" width="190px" v-if="!referenced">
           <template v-slot:default="{row}">
@@ -106,7 +118,7 @@
               <ms-table-operator-button :tip="$t('api_test.automation.copy')" icon="el-icon-document-copy" type=""
                                         @exec="copy(row)"/>
               <ms-table-operator-button :tip="$t('api_test.automation.remove')" icon="el-icon-delete" @exec="remove(row)" type="danger" v-tester/>
-              <ms-scenario-extend-buttons  style="display: contents" @openScenario="openScenario" :row="row"/>
+              <ms-scenario-extend-buttons style="display: contents" @openScenario="openScenario" :row="row"/>
             </div>
           </template>
         </el-table-column>
@@ -122,7 +134,7 @@
         <!--测试计划-->
         <el-drawer :visible.sync="planVisible" :destroy-on-close="true" direction="ltr" :withHeader="false"
                    :title="$t('test_track.plan_view.test_result')" :modal="false" size="90%">
-          <ms-test-plan-list @addTestPlan="addTestPlan"/>
+          <ms-test-plan-list @addTestPlan="addTestPlan" @cancel="cancel"/>
         </el-drawer>
       </div>
     </el-card>
@@ -143,13 +155,13 @@ import MsTableHeader from "@/business/components/common/components/MsTableHeader
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
 import MsTag from "../../../common/components/MsTag";
-import {_filter, _sort, getCurrentProjectID, getUUID} from "@/common/js/utils";
+import {getCurrentProjectID, getUUID} from "@/common/js/utils";
 import MsApiReportDetail from "../report/ApiReportDetail";
 import MsTableMoreBtn from "./TableMoreBtn";
 import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
 import MsTestPlanList from "./testplan/TestPlanList";
 import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
-import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
+import {API_SCENARIO_CONFIGS} from "@/business/components/common/components/search/search-components";
 import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
 import PriorityTableItem from "../../../track/common/tableItems/planview/PriorityTableItem";
 import PlanStatusTableItem from "../../../track/common/tableItems/plan/PlanStatusTableItem";
@@ -157,6 +169,7 @@ import BatchEdit from "../../../track/case/components/BatchEdit";
 import {WORKSPACE_ID} from "../../../../../common/js/constants";
 import EnvironmentSelect from "../../definition/components/environment/EnvironmentSelect";
 import BatchMove from "../../../track/case/components/BatchMove";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   name: "MsApiScenarioList",
@@ -169,459 +182,478 @@ export default {
     MsTableHeaderSelectPopover,
     MsTablePagination,
     MsTableMoreBtn,
-    ShowMoreBtn,
-    MsTableHeader,
-    MsTag,
-    MsApiReportDetail,
-    MsScenarioExtendButtons,
-    MsTestPlanList,
-    MsTableOperatorButton
-  },
-  props: {
-    referenced: {
-      type: Boolean,
-      default: false,
+      ShowMoreBtn,
+      MsTableHeader,
+      MsTag,
+      MsApiReportDetail,
+      MsScenarioExtendButtons,
+      MsTestPlanList,
+      MsTableOperatorButton
     },
-    selectNodeIds: Array,
-    trashEnable: {
-      type: Boolean,
-      default: false,
+    props: {
+      referenced: {
+        type: Boolean,
+        default: false,
+      },
+      selectNodeIds: Array,
+      trashEnable: {
+        type: Boolean,
+        default: false,
+      },
+      moduleTree: {
+        type: Array,
+        default() {
+          return []
+        },
+      },
+      moduleOptions: {
+        type: Array,
+        default() {
+          return []
+        },
+      }
     },
-    moduleTree: {
-      type: Array,
-      default() {
-        return []
-      },
+    data() {
+      return {
+        loading: false,
+        screenHeight: document.documentElement.clientHeight - 280,//屏幕高度,
+        condition: {
+          components: API_SCENARIO_CONFIGS
+        },
+        currentScenario: {},
+        schedule: {},
+        selection: [],
+        tableData: [],
+        selectDataRange: 'all',
+        currentPage: 1,
+        pageSize: 10,
+        total: 0,
+        reportId: "",
+        batchReportId: "",
+        content: {},
+        infoDb: false,
+        runVisible: false,
+        planVisible: false,
+        projectId: "",
+        runData: [],
+        report: {},
+        selectDataSize: 0,
+        selectAll: false,
+        userFilters: [],
+        buttons: [
+          {
+            name: this.$t('api_test.automation.batch_add_plan'), handleClick: this.handleBatchAddCase
+          },
+          {
+            name: this.$t('api_test.automation.batch_execute'), handleClick: this.handleBatchExecute
+          },
+          {
+            name: this.$t('test_track.case.batch_edit_case'), handleClick: this.handleBatchEdit
+          },
+          {
+            name: this.$t('test_track.case.batch_move_case'), handleClick: this.handleBatchMove
+          }
+        ],
+        isSelectAllDate: false,
+        unSelection: [],
+        selectDataCounts: 0,
+        typeArr: [
+          {id: 'level', name: this.$t('test_track.case.priority')},
+          {id: 'status', name: this.$t('test_track.plan.plan_status')},
+          {id: 'principal', name: this.$t('api_test.definition.request.responsible'), optionMethod: this.getPrincipalOptions},
+          {id: 'environmentId', name: this.$t('api_test.definition.request.run_env'), optionMethod: this.getEnvsOptions},
+        ],
+        statusFilters: [
+          {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
+          {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
+          {text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
+          {text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'},
+        ],
+        levelFilters: [
+          {text: 'P0', value: 'P0'},
+          {text: 'P1', value: 'P1'},
+          {text: 'P2', value: 'P2'},
+          {text: 'P3', value: 'P3'}
+        ],
+        resultFilters: [
+          {text: 'Fail', value: 'Fail'},
+          {text: 'Success', value: 'Success'}
+        ],
+        valueArr: {
+          level: [
+            {name: 'P0', id: 'P0'},
+            {name: 'P1', id: 'P1'},
+            {name: 'P2', id: 'P2'},
+            {name: 'P3', id: 'P3'}
+          ],
+          status: [
+            {name: this.$t('test_track.plan.plan_status_prepare'), id: 'Prepare'},
+            {name: this.$t('test_track.plan.plan_status_running'), id: 'Underway'},
+            {name: this.$t('test_track.plan.plan_status_completed'), id: 'Completed'}
+          ],
+          principal: [],
+          environmentId: []
+        },
+      }
     },
-    moduleOptions: {
-      type: Array,
-      default() {
-        return []
+    created() {
+      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+      this.projectId = getCurrentProjectID();
+      this.search();
+      this.getPrincipalOptions([]);
+    },
+    watch: {
+      selectNodeIds() {
+        this.search();
       },
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      condition: {
-        components: API_CASE_CONFIGS
-      },
-      currentScenario: {},
-      schedule: {},
-      selection: [],
-      tableData: [],
-      selectDataRange: 'all',
-      currentPage: 1,
-      pageSize: 10,
-      total: 0,
-      reportId: "",
-      batchReportId: "",
-      content: {},
-      infoDb: false,
-      runVisible: false,
-      planVisible: false,
-      projectId: "",
-      runData: [],
-      report: {},
-      selectDataSize: 0,
-      selectAll: false,
-      userFilters: [],
-      buttons: [
-        {
-          name: this.$t('api_test.automation.batch_add_plan'), handleClick: this.handleBatchAddCase
-        },
-        {
-          name: this.$t('api_test.automation.batch_execute'), handleClick: this.handleBatchExecute
-        },
-        {
-          name: this.$t('test_track.case.batch_edit_case'), handleClick: this.handleBatchEdit
-        },
-        {
-          name: this.$t('test_track.case.batch_move_case'), handleClick: this.handleBatchMove
+      trashEnable() {
+        if (this.trashEnable) {
+          this.condition.filters = {status: ["Trash"]};
+          this.condition.moduleIds = [];
+        } else {
+          this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
         }
-      ],
-      isSelectAllDate: false,
-      unSelection: [],
-      selectDataCounts: 0,
-      typeArr: [
-        {id: 'level', name: this.$t('test_track.case.priority')},
-        {id: 'status', name: this.$t('test_track.plan.plan_status')},
-        {id: 'principal', name: this.$t('api_test.definition.request.responsible'), optionMethod: this.getPrincipalOptions},
-        {id: 'environmentId', name: this.$t('api_test.definition.request.run_env'), optionMethod: this.getEnvsOptions},
-      ],
-      statusFilters: [
-        {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
-        {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
-        {text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
-        {text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'},
-      ],
-      levelFilters: [
-        {text: 'P0', value: 'P0'},
-        {text: 'P1', value: 'P1'},
-        {text: 'P2', value: 'P2'},
-        {text: 'P3', value: 'P3'}
-      ],
-      resultFilters: [
-        {text: 'Fail', value: 'Fail'},
-        {text: 'Success', value: 'Success'}
-      ],
-      valueArr: {
-        level: [
-          {name: 'P0', id: 'P0'},
-          {name: 'P1', id: 'P1'},
-          {name: 'P2', id: 'P2'},
-          {name: 'P3', id: 'P3'}
-        ],
-        status: [
-          {name: this.$t('test_track.plan.plan_status_prepare'), id: 'Prepare'},
-          {name: this.$t('test_track.plan.plan_status_running'), id: 'Underway'},
-          {name: this.$t('test_track.plan.plan_status_completed'), id: 'Completed'}
-        ],
-        principal: [],
-        environmentId: []
+        this.search();
       },
-    }
-  },
-  created() {
-    this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-    this.projectId = getCurrentProjectID();
-    this.search();
-    this.getPrincipalOptions([]);
-  },
-  watch: {
-    selectNodeIds() {
-      this.search();
-    },
-    trashEnable() {
-      if (this.trashEnable) {
-        this.condition.filters = {status: ["Trash"]};
-        this.condition.moduleIds = [];
-      } else {
-        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-      }
-      this.search();
-    },
-    batchReportId() {
-      this.loading = true;
-      this.getReport();
-    }
-  },
-  computed: {
-    isNotRunning() {
-      return "Running" !== this.report.status;
-    }
-  },
-  methods: {
-    selectByParam() {
-      this.changeSelectDataRangeAll();
-      this.search();
-    },
-    search() {
-      this.condition.moduleIds = this.selectNodeIds;
-      if (this.trashEnable) {
-        this.condition.filters = {status: ["Trash"]};
-        this.condition.moduleIds = [];
-      }
-
-      if (this.projectId != null) {
-        this.condition.projectId = this.projectId;
-      }
-
-      //检查是否只查询本周数据
-      this.condition.selectThisWeedData = false;
-      this.condition.executeStatus = null;
-      this.isSelectThissWeekData();
-      switch (this.selectDataRange) {
-        case 'thisWeekCount':
-          this.condition.selectThisWeedData = true;
-          break;
-        case 'unExecute':
-          this.condition.executeStatus = 'unExecute';
-          break;
-        case 'executeFailed':
-          this.condition.executeStatus = 'executeFailed';
-          break;
-        case 'executePass':
-          this.condition.executeStatus = 'executePass';
-          break;
-      }
-      this.selection = [];
-      this.selectAll = false;
-      this.unSelection = [];
-      this.selectDataCounts = 0;
-      let url = "/api/automation/list/" + this.currentPage + "/" + this.pageSize;
-      if (this.condition.projectId) {
+      batchReportId() {
         this.loading = true;
-        this.$post(url, this.condition, response => {
-          let data = response.data;
-          this.total = data.itemCount;
-          this.tableData = data.listObject;
-          this.tableData.forEach(item => {
-            if (item.tags && item.tags.length > 0) {
-              item.tags = JSON.parse(item.tags);
-            }
-          });
-          this.loading = false;
-          this.unSelection = data.listObject.map(s => s.id);
-        });
+        this.getReport();
       }
     },
-    handleCommand(cmd) {
-      let table = this.$refs.scenarioTable;
-      switch (cmd) {
-        case "table":
-          this.selectAll = false;
-          table.toggleAllSelection();
-          break;
-        case "all":
-          this.selectAll = true;
-          break
+    computed: {
+      isNotRunning() {
+        return "Running" !== this.report.status;
       }
     },
-    handleBatchAddCase() {
-      this.planVisible = true;
-    },
-    handleBatchEdit() {
-      this.$refs.batchEdit.open(this.selectDataCounts);
-    },
-    handleBatchMove() {
-      this.$refs.testBatchMove.open(this.moduleTree, [], this.moduleOptions);
-    },
-    moveSave(param) {
-      this.buildBatchParam(param);
-      param.apiScenarioModuleId = param.nodeId;
-      this.$post('/api/automation/batch/edit', param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.$refs.testBatchMove.close();
+    methods: {
+      selectByParam() {
+        this.changeSelectDataRangeAll();
         this.search();
-      });
-    },
-    batchEdit(form) {
-      let param = {};
-      param[form.type] = form.value;
-      this.buildBatchParam(param);
-      this.$post('/api/automation/batch/edit', param, () => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
-      });
-    },
-    getPrincipalOptions(option) {
-      let workspaceId = localStorage.getItem(WORKSPACE_ID);
-      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-        option.push(...response.data);
-        this.userFilters = response.data.map(u => {
-          return {text: u.name, value: u.id}
-        });
-      });
-    },
-    getEnvsOptions(option) {
-      this.$get('/api/environment/list/' + this.projectId, response => {
-        option.push(...response.data);
-        option.forEach(environment => {
-          if (!(environment.config instanceof Object)) {
-            environment.config = JSON.parse(environment.config);
-          }
-          environment.name = environment.name + (environment.config.httpConfig.socket ?
-            (': ' + environment.config.httpConfig.protocol + '://' + environment.config.httpConfig.socket) : '');
-        });
-      });
-    },
-    addTestPlan(plans) {
-      let obj = {planIds: plans, scenarioIds: this.selection};
+      },
+      search() {
+        this.condition.moduleIds = this.selectNodeIds;
+        if (this.trashEnable) {
+          this.condition.filters = {status: ["Trash"]};
+          this.condition.moduleIds = [];
+        }
 
-      obj.projectId = getCurrentProjectID();
-      obj.selectAllDate = this.isSelectAllDate;
-      obj.unSelectIds = this.unSelection;
-      obj = Object.assign(obj, this.condition);
+        if (this.projectId != null) {
+          this.condition.projectId = this.projectId;
+        }
 
-      this.planVisible = false;
-      this.$post("/api/automation/scenario/plan", obj, response => {
-        this.$success(this.$t("commons.save_success"));
-      });
-    },
-    getReport() {
-      if (this.batchReportId) {
-        let url = "/api/scenario/report/get/" + this.batchReportId;
-        this.$get(url, response => {
-          this.report = response.data || {};
-          if (response.data) {
-            if (this.isNotRunning) {
-              try {
-                this.content = JSON.parse(this.report.content);
-              } catch (e) {
-                throw e;
+        //检查是否只查询本周数据
+        this.condition.selectThisWeedData = false;
+        this.condition.executeStatus = null;
+        this.isSelectThissWeekData();
+        switch (this.selectDataRange) {
+          case 'thisWeekCount':
+            this.condition.selectThisWeedData = true;
+            break;
+          case 'unExecute':
+            this.condition.executeStatus = 'unExecute';
+            break;
+          case 'executeFailed':
+            this.condition.executeStatus = 'executeFailed';
+            break;
+          case 'executePass':
+            this.condition.executeStatus = 'executePass';
+            break;
+        }
+        this.selection = [];
+        this.selectAll = false;
+        this.unSelection = [];
+        this.selectDataCounts = 0;
+        let url = "/api/automation/list/" + this.currentPage + "/" + this.pageSize;
+        if (this.condition.projectId) {
+          this.loading = true;
+          this.$post(url, this.condition, response => {
+            let data = response.data;
+            this.total = data.itemCount;
+            this.tableData = data.listObject;
+            this.tableData.forEach(item => {
+              if (item.tags && item.tags.length > 0) {
+                item.tags = JSON.parse(item.tags);
               }
-              this.loading = false;
-              this.$success("批量执行成功，请到报告页面查看详情！");
-            } else {
-              setTimeout(this.getReport, 2000)
-            }
-          } else {
+            });
             this.loading = false;
-            this.$error(this.$t('api_report.not_exist'));
-          }
-        });
-      }
-    },
-    buildBatchParam(param) {
-      param.scenarioIds = this.selection;
-      param.projectId = getCurrentProjectID();
-      param.selectAllDate = this.isSelectAllDate;
-      param.unSelectIds = this.unSelection;
-      param = Object.assign(param, this.condition);
-    },
-    handleBatchExecute() {
-      this.infoDb = false;
-      let url = "/api/automation/run/batch";
-      let run = {};
-      run.id = getUUID();
-      this.buildBatchParam(run);
-      this.$post(url, run, response => {
-        let data = response.data;
-        this.runVisible = false;
-        this.batchReportId = run.id;
-      });
-    },
-    select(selection) {
-      this.selection = selection.map(s => s.id);
-
-      //统计应当展示选择了多少行
-      this.selectRowsCount(this.selection)
-
-      this.$emit('selection', selection);
-    },
-    isSelect(row) {
-      return this.selection.includes(row.id)
-    },
-    edit(row) {
-      let data = JSON.parse(JSON.stringify(row));
-      this.$emit('edit', data);
-    },
-    reductionApi(row) {
-      row.scenarioDefinition = null;
-      row.tags = null;
-      let rows = [row];
-      this.$post("/api/automation/reduction", rows, response => {
-        this.$success(this.$t('commons.save_success'));
-        this.search();
-      })
-    },
-    execute(row) {
-      this.infoDb = false;
-      let url = "/api/automation/run";
-      let run = {};
-      let scenarioIds = [];
-      scenarioIds.push(row.id);
-      run.id = getUUID();
-      run.projectId = getCurrentProjectID();
-      run.scenarioIds = scenarioIds;
-      this.$post(url, run, response => {
-        let data = response.data;
-        this.runVisible = true;
-        this.reportId = run.id;
-      });
-    },
-    copy(row) {
-      let rowParam = JSON.parse(JSON.stringify(row));
-      rowParam.copy = true;
-      rowParam.name = 'copy_' + rowParam.name;
-      this.$emit('edit', rowParam);
-    },
-    showReport(row) {
-      this.runVisible = true;
-      this.infoDb = true;
-      this.reportId = row.reportId;
-    },
-    //是否选择了全部数据
-    isSelectDataAll(dataType) {
-      this.isSelectAllDate = dataType;
-      this.selectRowsCount(this.selection);
-      //如果已经全选，不需要再操作了
-      if (this.selection.length != this.tableData.length) {
-        this.$refs.scenarioTable.toggleAllSelection(true);
-      }
-    },
-    //选择数据数量统计
-    selectRowsCount(selection) {
-      let selectedIDs = selection;
-      let allIDs = this.tableData.map(s => s.id);
-      this.unSelection = allIDs.filter(function (val) {
-        return selectedIDs.indexOf(val) === -1
-      });
-      if (this.isSelectAllDate) {
-        this.selectDataCounts = this.total - this.unSelection.length;
-      } else {
-        this.selectDataCounts = this.selection.length;
-      }
-    },
-    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
-    isSelectThissWeekData() {
-      let dataRange = this.$route.params.dataSelectRange;
-      this.selectDataRange = dataRange;
-    },
-    changeSelectDataRangeAll() {
-      this.$emit("changeSelectDataRangeAll");
-    },
-    remove(row) {
-      if (this.trashEnable) {
-        this.$get('/api/automation/delete/' + row.id, () => {
-          this.$success(this.$t('commons.delete_success'));
+            this.unSelection = data.listObject.map(s => s.id);
+          });
+        }
+      },
+      handleCommand(cmd) {
+        let table = this.$refs.scenarioTable;
+        switch (cmd) {
+          case "table":
+            this.selectAll = false;
+            table.toggleAllSelection();
+            break;
+          case "all":
+            this.selectAll = true;
+            break
+        }
+      },
+      handleBatchAddCase() {
+        this.planVisible = true;
+      },
+      handleBatchEdit() {
+        this.$refs.batchEdit.open(this.selectDataCounts);
+      },
+      handleBatchMove() {
+        this.$refs.testBatchMove.open(this.moduleTree, [], this.moduleOptions);
+      },
+      moveSave(param) {
+        this.buildBatchParam(param);
+        param.apiScenarioModuleId = param.nodeId;
+        this.$post('/api/automation/batch/edit', param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.$refs.testBatchMove.close();
           this.search();
         });
-        return;
-      }
-      this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        callback: (action) => {
-          if (action === 'confirm') {
-            let ids = [row.id];
-            this.$post('/api/automation/removeToGc/', ids, () => {
-              this.$success(this.$t('commons.delete_success'));
-              this.search();
-            });
-          }
+      },
+      batchEdit(form) {
+        let param = {};
+        param[form.type] = form.value;
+        this.buildBatchParam(param);
+        this.$post('/api/automation/batch/edit', param, () => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        });
+      },
+      getPrincipalOptions(option) {
+        let workspaceId = localStorage.getItem(WORKSPACE_ID);
+        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+          option.push(...response.data);
+          this.userFilters = response.data.map(u => {
+            return {text: u.name, value: u.id}
+          });
+        });
+      },
+      getEnvsOptions(option) {
+        this.$get('/api/environment/list/' + this.projectId, response => {
+          option.push(...response.data);
+          option.forEach(environment => {
+            if (!(environment.config instanceof Object)) {
+              environment.config = JSON.parse(environment.config);
+            }
+            environment.name = environment.name + (environment.config.httpConfig.socket ?
+              (': ' + environment.config.httpConfig.protocol + '://' + environment.config.httpConfig.socket) : '');
+          });
+        });
+      },
+      cancel() {
+        this.planVisible = false;
+      },
+      addTestPlan(plans) {
+        let obj = {planIds: plans, scenarioIds: this.selection};
+
+        obj.projectId = getCurrentProjectID();
+        obj.selectAllDate = this.isSelectAllDate;
+        obj.unSelectIds = this.unSelection;
+        obj = Object.assign(obj, this.condition);
+
+        this.planVisible = false;
+        this.$post("/api/automation/scenario/plan", obj, response => {
+          this.$success(this.$t("commons.save_success"));
+        });
+      },
+      getReport() {
+        if (this.batchReportId) {
+          let url = "/api/scenario/report/get/" + this.batchReportId;
+          this.$get(url, response => {
+            this.report = response.data || {};
+            if (response.data) {
+              if (this.isNotRunning) {
+                try {
+                  this.content = JSON.parse(this.report.content);
+                } catch (e) {
+                  throw e;
+                }
+                this.loading = false;
+                this.$success("批量执行成功，请到报告页面查看详情！");
+              } else {
+                setTimeout(this.getReport, 2000)
+              }
+            } else {
+              this.loading = false;
+              this.$error(this.$t('api_report.not_exist'));
+            }
+          });
         }
-      });
-    },
-    sort(column) {
-      // 每次只对一个字段排序
-      if (this.condition.orders) {
-        this.condition.orders = [];
-      }
-      _sort(column, this.condition);
-      this.search();
-    },
-    filter(filters) {
-      _filter(filters, this.condition);
-      this.search();
-    },
-    openScenario (item) {
-      this.$emit('openScenario', item)
-    },
+      },
+      buildBatchParam(param) {
+        param.scenarioIds = this.selection;
+        param.projectId = getCurrentProjectID();
+        param.selectAllDate = this.isSelectAllDate;
+        param.unSelectIds = this.unSelection;
+        param = Object.assign(param, this.condition);
+      },
+      handleBatchExecute() {
+        this.infoDb = false;
+        let url = "/api/automation/run/batch";
+        let run = {};
+        run.id = getUUID();
+        this.buildBatchParam(run);
+        this.$post(url, run, response => {
+          let data = response.data;
+          this.runVisible = false;
+          this.batchReportId = run.id;
+        });
+      },
+      select(selection) {
+        this.selection = selection.map(s => s.id);
+
+        //统计应当展示选择了多少行
+        this.selectRowsCount(this.selection)
+
+        this.$emit('selection', selection);
+      },
+      isSelect(row) {
+        return this.selection.includes(row.id)
+      },
+      edit(row) {
+        let data = JSON.parse(JSON.stringify(row));
+        this.$emit('edit', data);
+      },
+      reductionApi(row) {
+        row.scenarioDefinition = null;
+        row.tags = null;
+        let rows = [row];
+        this.$post("/api/automation/reduction", rows, response => {
+          this.$success(this.$t('commons.save_success'));
+          this.search();
+        })
+      },
+      execute(row) {
+        this.infoDb = false;
+        let url = "/api/automation/run";
+        let run = {};
+        let scenarioIds = [];
+        scenarioIds.push(row.id);
+        run.id = getUUID();
+        run.projectId = getCurrentProjectID();
+        run.scenarioIds = scenarioIds;
+        this.$post(url, run, response => {
+          let data = response.data;
+          this.runVisible = true;
+          this.reportId = run.id;
+        });
+      },
+      copy(row) {
+        let rowParam = JSON.parse(JSON.stringify(row));
+        rowParam.copy = true;
+        rowParam.name = 'copy_' + rowParam.name;
+        this.$emit('edit', rowParam);
+      },
+      showReport(row) {
+        this.runVisible = true;
+        this.infoDb = true;
+        this.reportId = row.reportId;
+      },
+      //是否选择了全部数据
+      isSelectDataAll(dataType) {
+        this.isSelectAllDate = dataType;
+        this.selectRowsCount(this.selection);
+        //如果已经全选，不需要再操作了
+        if (this.selection.length != this.tableData.length) {
+          this.$refs.scenarioTable.toggleAllSelection(true);
+        }
+      },
+      //选择数据数量统计
+      selectRowsCount(selection) {
+        let selectedIDs = selection;
+        let allIDs = this.tableData.map(s => s.id);
+        this.unSelection = allIDs.filter(function (val) {
+          return selectedIDs.indexOf(val) === -1
+        });
+        if (this.isSelectAllDate) {
+          this.selectDataCounts = this.total - this.unSelection.length;
+        } else {
+          this.selectDataCounts = this.selection.length;
+        }
+      },
+      //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+      isSelectThissWeekData() {
+        let dataRange = this.$route.params.dataSelectRange;
+        this.selectDataRange = dataRange;
+      },
+      changeSelectDataRangeAll() {
+        this.$emit("changeSelectDataRangeAll");
+      },
+      remove(row) {
+        if (this.trashEnable) {
+          this.$get('/api/automation/delete/' + row.id, () => {
+            this.$success(this.$t('commons.delete_success'));
+            this.search();
+          });
+          return;
+        }
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + row.name + " ？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              let ids = [row.id];
+              this.$post('/api/automation/removeToGc/', ids, () => {
+                this.$success(this.$t('commons.delete_success'));
+                this.search();
+              });
+            }
+          }
+        });
+      },
+      sort(column) {
+        // 每次只对一个字段排序
+        if (this.condition.orders) {
+          this.condition.orders = [];
+        }
+        _sort(column, this.condition);
+        this.search();
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.search();
+      },
+      headerDragend(newWidth, oldWidth, column, event) {
+        let finalWidth = newWidth;
+        if (column.minWidth > finalWidth) {
+          finalWidth = column.minWidth;
+        }
+        column.width = finalWidth;
+        column.realWidth = finalWidth;
+      },
+      openScenario(item) {
+        this.$emit('openScenario', item)
+      },
+    }
   }
-}
 </script>
 
 <style scoped>
-/deep/ .el-drawer__header {
-  margin-bottom: 0px;
-}
+  /deep/ .el-drawer__header {
+    margin-bottom: 0px;
+  }
 
-/deep/ .run-button {
-  background-color: #409EFF;
-  border-color: #409EFF;
-}
+  /deep/ .run-button {
+    background-color: #409EFF;
+    border-color: #409EFF;
+  }
 
   /deep/ .el-table__fixed-body-wrapper {
     z-index: auto !important;
   }
-  /deep/ el-table__fixed-right{
+
+  /deep/ el-table__fixed-right {
 
   }
-    /deep/ .el-table__fixed-right {
-      height: 100% !important;
-    }
-    /deep/ .el-table__fixed {
-      height: 110px !important;
-    }
+
+  /deep/ .el-table__fixed-right {
+    height: 100% !important;
+  }
+
+  /deep/ .el-table__fixed {
+    height: 110px !important;
+  }
+
+  /deep/ .el-card__header {
+    padding: 10px;
+  }
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/DebugRun.vue b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
index ef4f21e5ed..f5f6880cc5 100644
--- a/frontend/src/business/components/api/automation/scenario/DebugRun.vue
+++ b/frontend/src/business/components/api/automation/scenario/DebugRun.vue
@@ -67,6 +67,19 @@
             });
           }
         }
+        if (item && item.files) {
+          item.files.forEach(fileItem => {
+            if (fileItem.file) {
+              if (!fileItem.id) {
+                let fileId = getUUID().substring(0, 12);
+                fileItem.name = fileItem.file.name;
+                fileItem.id = fileId;
+              }
+              obj.bodyUploadIds.push(fileItem.id);
+              bodyUploadFiles.push(fileItem.file);
+            }
+          });
+        }
       },
       recursiveFile(arr, bodyUploadFiles, obj) {
         arr.forEach(item => {
@@ -86,6 +99,11 @@
             this.recursiveFile(item.hashTree, bodyUploadFiles, obj);
           }
         })
+        if (request.variables) {
+          request.variables.forEach(item => {
+            this.setFiles(item, bodyUploadFiles, obj);
+          })
+        }
         return bodyUploadFiles;
       },
       run() {
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index ffe228a3f3..21ffb284f9 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -250,7 +250,7 @@
         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'}
+            {max: 100, message: this.$t('test_track.length_less_than') + '100', 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'}],
@@ -567,6 +567,9 @@
               this.$error("不能引用或复制自身！");
               return;
             }
+            if (!item.hashTree) {
+              item.hashTree = [];
+            }
             item.enable === undefined ? item.enable = true : item.enable;
             this.scenarioDefinition.push(item);
           })
diff --git a/frontend/src/business/components/api/automation/scenario/ImportApiScenario.vue b/frontend/src/business/components/api/automation/scenario/ImportApiScenario.vue
index 6ef476bc3a..556506c192 100644
--- a/frontend/src/business/components/api/automation/scenario/ImportApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/ImportApiScenario.vue
@@ -68,7 +68,7 @@
           if (response.data) {
             response.data.forEach(item => {
               let scenarioDefinition = JSON.parse(item.scenarioDefinition);
-              let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition.hashTree};
+              let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition && scenarioDefinition.hashTree ? scenarioDefinition.hashTree : []};
               scenarios.push(obj);
             })
             this.$emit('addScenario', scenarios);
diff --git a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
index d28edd5bf2..f93ba6fda0 100644
--- a/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/ApiRelevance.vue
@@ -1,5 +1,5 @@
 <template>
-  <relevance-dialog :title="'接口导入'" ref="relevanceDialog">
+  <relevance-dialog :title="$t('api_test.definition.api_import')" ref="relevanceDialog">
 
     <template v-slot:aside>
       <ms-api-module
@@ -28,32 +28,36 @@
       ref="apiCaseList"/>
 
     <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>
+      <el-button type="primary" @click="copy" @keydown.enter.native.prevent>{{ $t('commons.copy') }}</el-button>
+      <el-button v-if="!isApiListEnable" type="primary" @click="reference" @keydown.enter.native.prevent>
+        {{ $t('api_test.scenario.reference') }}
+      </el-button>
     </template>
 
   </relevance-dialog>
 </template>
 
 <script>
-    import ScenarioRelevanceCaseList from "./RelevanceCaseList";
-    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 "./RelevanceApiList";
-    import RelevanceDialog from "../../../../track/plan/view/comonents/base/RelevanceDialog";
-    export default {
-      name: "ApiRelevance",
-      components: {
-        RelevanceDialog,
-        ScenarioRelevanceApiList,
-        MsMainContainer, MsAsideContainer, MsContainer, MsApiModule, ScenarioRelevanceCaseList},
-      data() {
-          return {
-            result: {},
-            currentProtocol: null,
-            selectNodeIds: [],
+import ScenarioRelevanceCaseList from "./RelevanceCaseList";
+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 "./RelevanceApiList";
+import RelevanceDialog from "../../../../track/plan/view/comonents/base/RelevanceDialog";
+
+export default {
+  name: "ApiRelevance",
+  components: {
+    RelevanceDialog,
+    ScenarioRelevanceApiList,
+    MsMainContainer, MsAsideContainer, MsContainer, MsApiModule, ScenarioRelevanceCaseList
+  },
+  data() {
+    return {
+      result: {},
+      currentProtocol: null,
+      selectNodeIds: [],
             moduleOptions: {},
             isApiListEnable: true,
           }
@@ -118,4 +122,7 @@
 </script>
 
 <style scoped>
+/deep/ .filter-input {
+  width: 140px !important;
+}
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
index c76a5eef13..8b2270f704 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceApiList.vue
@@ -88,10 +88,9 @@ import {API_METHOD_COLOUR, CASE_PRIORITY} from "../../../definition/model/JsonDa
 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";
 import MsEnvironmentSelect from "../../../definition/components/case/MsEnvironmentSelect";
 import TableSelectCountBar from "./TableSelectCountBar";
+import {_filter, _handleSelect, _handleSelectAll, _sort,} from "@/common/js/tableUtils";
 
 export default {
   name: "RelevanceApiList",
diff --git a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
index 856e2fb00a..37ba68459b 100644
--- a/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/RelevanceCaseList.vue
@@ -6,7 +6,8 @@
 
       <ms-environment-select :project-id="projectId" v-if="isTestPlan" :is-read-only="isReadOnly" @setEnvironment="setEnvironment"/>
 
-      <el-input placeholder="搜索" @blur="initTable" @keyup.enter.native="initTable" class="search-input" size="small" v-model="condition.name"/>
+      <el-input :placeholder="$t('api_test.definition.request.select_case')" @blur="initTable"
+                @keyup.enter.native="initTable" class="search-input" size="small" v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
                 border
@@ -65,34 +66,32 @@
 
 <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";
-  import MsEnvironmentSelect from "../../../definition/components/case/MsEnvironmentSelect";
-  import TableSelectCountBar from "./TableSelectCountBar";
+import MsTableOperator from "../../../../common/components/MsTableOperator";
+import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+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 MsEnvironmentSelect from "../../../definition/components/case/MsEnvironmentSelect";
+import TableSelectCountBar from "./TableSelectCountBar";
+import {_filter, _handleSelect, _handleSelectAll, _sort} from "@/common/js/tableUtils";
 
-  export default {
-    name: "RelevanceCaseList",
-    components: {
-      TableSelectCountBar,
-      MsEnvironmentSelect,
-      PriorityTableItem,
-      ApiListContainer,
-      MsTableOperatorButton,
-      MsTableOperator,
-      MsTablePagination,
-      MsTag,
+export default {
+  name: "RelevanceCaseList",
+  components: {
+    TableSelectCountBar,
+    MsEnvironmentSelect,
+    PriorityTableItem,
+    ApiListContainer,
+    MsTableOperatorButton,
+    MsTableOperator,
+    MsTablePagination,
+    MsTag,
       MsBottomContainer,
       ShowMoreBtn,
       MsBatchEdit
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index baa01172f9..d2a439c0f7 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -1,23 +1,21 @@
 <template>
   <el-card class="api-component">
 
-      <div class="header" @click="active(data)">
+    <div class="header" @click="active(data)">
 
-        <fieldset :disabled="data.disabled" class="ms-fieldset">
-          <slot name="beforeHeaderLeft">
-            <div v-if="data.index" class="el-step__icon is-text" style="margin-right: 10px;" :style="{'color': color, 'background-color': backgroundColor}">
-              <div class="el-step__icon-inner">{{data.index}}</div>
-            </div>
-            <el-button class="ms-left-buttion" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-button>
-          </slot>
-        </fieldset>
+      <slot name="beforeHeaderLeft">
+        <div v-if="data.index" class="el-step__icon is-text" style="margin-right: 10px;" :style="{'color': color, 'background-color': backgroundColor}">
+          <div class="el-step__icon-inner">{{data.index}}</div>
+        </div>
+        <el-button class="ms-left-buttion" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-button>
+      </slot>
 
-        <span @click.stop>
+      <span @click.stop>
         <slot name="headerLeft">
           <i class="icon el-icon-arrow-right" :class="{'is-active': data.active}"
              @click="active(data)" v-if="data.type!='scenario'"/>
           <el-input :draggable="draggable" v-if="isShowInput && isShowNameInput" size="small" v-model="data.name" class="name-input"
-                    @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit"/>
+                    @blur="isShowInput = false" :placeholder="$t('commons.input_name')" ref="nameEdit" :disabled="data.disabled"/>
           <span v-else>
             {{data.name}}
             <i class="el-icon-edit" style="cursor:pointer" @click="editName" v-tester v-if="data.referenced!='REF' && !data.disabled"/>
@@ -26,31 +24,31 @@
         <slot name="behindHeaderLeft"></slot>
       </span>
 
-        <div class="header-right" @click.stop>
-          <slot name="message"></slot>
-          <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top">
-            <el-switch v-model="data.enable" class="enable-switch"/>
-          </el-tooltip>
-          <slot name="button"></slot>
-          <el-tooltip content="Copy" placement="top">
-            <el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow"/>
-          </el-tooltip>
-          <el-tooltip :content="$t('commons.remove')" placement="top">
-            <el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove"/>
-          </el-tooltip>
-        </div>
+      <div class="header-right" @click.stop>
+        <slot name="message"></slot>
+        <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top">
+          <el-switch v-model="data.enable" class="enable-switch"/>
+        </el-tooltip>
+        <slot name="button"></slot>
+        <el-tooltip content="Copy" placement="top">
+          <el-button size="mini" icon="el-icon-copy-document" circle @click="copyRow"/>
+        </el-tooltip>
+        <el-tooltip :content="$t('commons.remove')" placement="top">
+          <el-button size="mini" icon="el-icon-delete" type="danger" circle @click="remove"/>
+        </el-tooltip>
       </div>
 
-    <fieldset :disabled="data.disabled" class="ms-fieldset">
-      <div class="header">
-          <el-collapse-transition>
-            <div v-if="data.active && showCollapse" :draggable="draggable">
-              <el-divider></el-divider>
-              <slot></slot>
-            </div>
-          </el-collapse-transition>
-      </div>
-    </fieldset>
+    </div>
+    <div class="header">
+      <fieldset :disabled="data.disabled" class="ms-fieldset">
+        <el-collapse-transition>
+          <div v-if="data.active && showCollapse" :draggable="draggable">
+            <el-divider></el-divider>
+            <slot></slot>
+          </div>
+        </el-collapse-transition>
+      </fieldset>
+    </div>
 
   </el-card>
 </template>
@@ -163,8 +161,4 @@
     border: 0px;
   }
 
-  .ms-fieldset {
-    display: contents;
-  }
-
 </style>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
index 5fae058169..bab86e7b27 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -25,18 +25,8 @@
       </el-tooltip>
     </template>
 
-    <div v-if="request.protocol === 'HTTP'">
-      <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-if="request.url" v-model="request.url" style="width: 85%;margin-top: 10px" size="small">
-        <el-select v-model="request.method" slot="prepend" style="width: 100px" size="small">
-          <el-option v-for="item in reqOptions" :key="item.id" :label="item.label" :value="item.id"/>
-        </el-select>
-      </el-input>
-      <el-input :placeholder="$t('api_test.definition.request.path_all_info')" v-else v-model="request.path" style="width: 85%;margin-top: 10px" size="small">
-        <el-select v-model="request.method" slot="prepend" style="width: 100px" size="small">
-          <el-option v-for="item in reqOptions" :key="item.id" :label="item.label" :value="item.id"/>
-        </el-select>
-      </el-input>
-    </div>
+    <customize-req-info :is-customize-req="isCustomizeReq" :request="request"/>
+
     <p class="tip">{{$t('api_test.definition.request.req_param')}} </p>
     <ms-api-request-form :isShowEnable="true" :referenced="true" :headers="request.headers " :request="request" v-if="request.protocol==='HTTP' || request.type==='HTTPSamplerProxy'"/>
     <ms-tcp-basis-parameters :request="request" v-if="request.protocol==='TCP'|| request.type==='TCPSampler'"/>
@@ -65,6 +55,7 @@
   import {getUUID} from "@/common/js/utils";
   import ApiBaseComponent from "../common/ApiBaseComponent";
   import ApiResponseComponent from "./ApiResponseComponent";
+  import CustomizeReqInfo from "@/business/components/api/automation/scenario/common/CustomizeReqInfo";
 
   export default {
     name: "MsApiComponent",
@@ -79,13 +70,13 @@
       currentEnvironmentId: String,
     },
     components: {
+      CustomizeReqInfo,
       ApiBaseComponent, ApiResponseComponent,
       MsSqlBasisParameters, MsTcpBasisParameters, MsDubboBasisParameters, MsApiRequestForm, MsRequestResultTail, MsRun
     },
     data() {
       return {
         loading: false,
-        reqOptions: REQ_METHOD,
         reportId: "",
         runData: [],
         isShowInput: false,
@@ -98,15 +89,8 @@
       // 加载引用对象数据
       this.getApiInfo();
       if (this.request.protocol === 'HTTP') {
-        try {
-          let urlObject = new URL(this.request.url);
-          let url = urlObject.protocol + "//" + urlObject.host + "/";
-        } catch (e) {
-          if (this.request.url) {
-            this.request.path = this.request.url;
-            this.request.url = undefined;
-          }
-        }
+        this.setUrl(this.request.url);
+        this.setUrl(this.request.path);
         // 历史数据 auth 处理
         if (this.request.hashTree) {
           for (let index in this.request.hashTree) {
@@ -180,6 +164,17 @@
       copyRow() {
         this.$emit('copyRow', this.request, this.node);
       },
+      setUrl(url) {
+        try {
+          new URL(url);
+          this.request.url = url;
+        } catch (e) {
+          if (url) {
+            this.request.path = url;
+            this.request.url = undefined;
+          }
+        }
+      },
       getApiInfo() {
         if (this.request.id && this.request.referenced === 'REF') {
           let requestResult = this.request.requestResult;
@@ -192,7 +187,8 @@
               this.request.enable = enable;
               if (response.data.path && response.data.path != null) {
                 this.request.path = response.data.path;
-                this.request.url = response.data.path;
+                this.request.url = response.data.url;
+                this.setUrl(this.request.path);
               }
               if (response.data.method && response.data.method != null) {
                 this.request.method = response.data.method;
@@ -239,6 +235,7 @@
         this.loading = true;
         this.runData = [];
         this.request.useEnvironment = this.currentEnvironmentId;
+        this.request.customizeReq = this.isCustomizeReq;
         let debugData = {
           id: this.currentScenario.id, name: this.currentScenario.name, type: "scenario",
           variables: this.currentScenario.variables, referenced: 'Created', enableCookieShare: this.enableCookieShare,
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 59e4c6c13c..5a2cbd94d7 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -16,7 +16,6 @@
   import MsApiComponent from "./ApiComponent";
   import MsLoopController from "./LoopController";
   import MsApiScenarioComponent from "./ApiScenarioComponent";
-  import {getUUID} from "@/common/js/utils";
 
   export default {
     name: "ComponentConfig",
diff --git a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
index 427826eb6f..85a6931c48 100644
--- a/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/LoopController.vue
@@ -244,7 +244,7 @@
       getFails() {
         this.error = 0;
         this.success = 0;
-        if (this.requestResult.scenarios) {
+        if (this.requestResult.scenarios && this.requestResult.scenarios != null) {
           this.requestResult.scenarios.forEach((scenario) => {
             if (scenario.requestResults) {
               scenario.requestResults.forEach(item => {
@@ -255,7 +255,7 @@
               })
             }
           })
-          this.success = this.requestResult.scenarios.length - this.error;
+          this.success = this.requestResult.scenarios && this.requestResult.scenarios != null ? this.requestResult.scenarios.length - this.error : 0;
         }
       },
       getReport() {
@@ -267,6 +267,9 @@
               if (this.isNotRunning) {
                 try {
                   this.requestResult = JSON.parse(this.report.content);
+                  if (!this.requestResult) {
+                    this.requestResult = {scenarios: []};
+                  }
                   this.controller.requestResult = this.requestResult;
                   switch (this.controller.loopType) {
                     case "LOOP_COUNT":
@@ -282,14 +285,11 @@
                       break;
                   }
                   this.getFails();
-                  if (!this.requestResult) {
-                    this.requestResult = {scenarios: []};
-                  }
                 } catch (e) {
                   throw e;
                 }
                 this.loading = false;
-                this.activeName = this.requestResult && this.requestResult.scenarios ? this.requestResult.scenarios[0].name : "";
+                this.activeName = this.requestResult && this.requestResult.scenarios && this.requestResult.scenarios != null && this.requestResult.scenarios.length > 0 ? this.requestResult.scenarios[0].name : "";
               } else {
                 setTimeout(this.getReport, 2000)
               }
diff --git a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
index 6e0bc6dee4..ea2aceb4f9 100644
--- a/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
+++ b/frontend/src/business/components/api/automation/scenario/testplan/TestPlanList.vue
@@ -127,40 +127,42 @@
     </ms-delete-confirm>
 
     <ms-dialog-footer style="float: right;margin: 20px"
-                      @confirm="confirm">
+                      @confirm="confirm" @cancel="cancel">
     </ms-dialog-footer>
 
   </el-card>
 </template>
 
 <script>
-  import MsCreateBox from '../../../../settings/CreateBox';
-  import MsTablePagination from '../../../../../components/common/pagination/TablePagination';
-  import MsTableHeader from "../../../../common/components/MsTableHeader";
-  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-  import MsTableOperator from "../../../../common/components/MsTableOperator";
-  import PlanStatusTableItem from "../../../../track/common/tableItems/plan/PlanStatusTableItem";
-  import PlanStageTableItem from "../../../../track/common/tableItems/plan/PlanStageTableItem";
-  import {_filter, _sort, checkoutTestManagerOrTestUser} from "@/common/js/utils";
-  import TestReportTemplateList from "../../../../track/plan/view/comonents/TestReportTemplateList";
-  import TestCaseReportView from "../../../../track/plan/view/comonents/report/TestCaseReportView";
-  import MsDeleteConfirm from "../../../../common/components/MsDeleteConfirm";
-  import {TEST_PLAN_CONFIGS} from "../../../../common/components/search/search-components";
-  import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
-  import {getCurrentProjectID} from "../../../../../../common/js/utils";
+import MsCreateBox from '../../../../settings/CreateBox';
+import MsTablePagination from '../../../../../components/common/pagination/TablePagination';
+import MsTableHeader from "../../../../common/components/MsTableHeader";
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+import MsTableOperator from "../../../../common/components/MsTableOperator";
+import PlanStatusTableItem from "../../../../track/common/tableItems/plan/PlanStatusTableItem";
+import PlanStageTableItem from "../../../../track/common/tableItems/plan/PlanStageTableItem";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
+import TestReportTemplateList from "../../../../track/plan/view/comonents/TestReportTemplateList";
+import TestCaseReportView from "../../../../track/plan/view/comonents/report/TestCaseReportView";
+import MsDeleteConfirm from "../../../../common/components/MsDeleteConfirm";
+import {TEST_PLAN_CONFIGS} from "../../../../common/components/search/search-components";
+import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
+import {getCurrentProjectID} from "../../../../../../common/js/utils";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
-  export default {
-    name: "TestPlanList",
-    components: {
-      MsDeleteConfirm,
-      TestCaseReportView,
-      TestReportTemplateList,
-      PlanStageTableItem,
-      PlanStatusTableItem,
-      MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsCreateBox, MsTablePagination
-    },
-    data() {
+
+export default {
+  name: "TestPlanList",
+  components: {
+    MsDeleteConfirm,
+    TestCaseReportView,
+    TestReportTemplateList,
+    PlanStageTableItem,
+    PlanStatusTableItem,
+    MsTableOperator, MsTableOperatorButton, MsDialogFooter, MsTableHeader, MsCreateBox, MsTablePagination
+  },
+  data() {
       return {
         result: {},
         selection: [],
@@ -203,8 +205,12 @@
       confirm() {
         if (this.selection.length==0) {
           this.$warning(this.$t("api_test.definition.request.test_plan_select"));
+        }else{
+          this.$emit('addTestPlan', this.selection);
         }
-        this.$emit('addTestPlan', this.selection);
+      },
+      cancel(){
+        this.$emit('cancel');
       },
       select(selection) {
         this.selection = selection.map(s => s.id);
diff --git a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
index 18a729dfe7..6ec9ad3bc4 100644
--- a/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
+++ b/frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
@@ -1,14 +1,22 @@
 <template>
   <el-dialog :title="$t('api_test.scenario.variables')" :close-on-click-modal="false"
-             :visible.sync="visible" class="environment-dialog" width="60%"
-             @close="close">
+             :visible.sync="visible" class="visible-dialog" width="60%"
+             @close="close" v-loading="loading">
     <div>
+      <el-input placeholder="变量名称搜索" style="width: 50%;margin: 0px 0px 10px" v-model="selectVariable" size="small" @change="filter" @keyup.enter="filter">
+        <el-select v-model="searchType" slot="prepend" placeholder="类型" style="width: 90px" @change="filter">
+          <el-option value="CONSTANT" label="常量"></el-option>
+          <el-option value="LIST" label="列表"></el-option>
+          <el-option value="CSV" label="CSV"></el-option>
+          <el-option value="COUNTER" label="计数器"></el-option>
+          <el-option value="RANDOM" label="随机数"></el-option>
+        </el-select>
+      </el-input>
       <el-row>
         <el-col :span="12">
           <div style="border:1px #DCDFE6 solid; min-height: 400px;border-radius: 4px ;width: 100% ;">
-
             <el-table ref="table" border :data="variables" class="adjust-table" @select-all="select" @select="select"
-                      v-loading="loading" @row-click="edit">
+                      v-loading="loading" @row-click="edit" height="400px" :row-class-name="tableRowClassName">
               <el-table-column type="selection" width="38"/>
               <el-table-column prop="num" label="ID" sortable/>
               <el-table-column prop="name" :label="$t('api_test.variable_name')" sortable show-overflow-tooltip/>
@@ -28,15 +36,12 @@
           <ms-edit-list-value v-if="editData.type=='LIST'" ref="listValue" :editData="editData"/>
           <ms-edit-csv v-if="editData.type=='CSV'" ref="csv" :editData.sync="editData"/>
         </el-col>
-
       </el-row>
-
     </div>
 
     <template v-slot:footer>
-      <div style="margin:20px">
+      <div>
         <el-button style="margin-right:10px" @click="deleteVariable">{{$t('commons.delete')}}</el-button>
-
         <el-dropdown split-button type="primary" @command="handleClick" @click="handleClick('CONSTANT')" placement="top-end">
           {{$t('commons.add')}}
           <el-dropdown-menu slot="dropdown">
@@ -49,8 +54,6 @@
         </el-dropdown>
       </div>
     </template>
-
-
   </el-dialog>
 </template>
 
@@ -80,6 +83,9 @@
     data() {
       return {
         variables: [],
+        searchType: "",
+        selectVariable: "",
+        condition: {},
         types: new Map([
           ['CONSTANT', '常量'],
           ['LIST', '列表'],
@@ -105,6 +111,12 @@
       edit(row) {
         this.editData = row;
       },
+      tableRowClassName(row) {
+        if (row.row.hidden) {
+          return 'ms-variable-hidden-row';
+        }
+        return '';
+      },
       addParameters(v) {
         v.id = getUUID();
         if (v.type === 'CSV') {
@@ -133,10 +145,13 @@
         this.visible = false;
         let saveVariables = [];
         this.variables.forEach(item => {
+          item.hidden = undefined;
           if (item.name && item.name != "") {
             saveVariables.push(item);
           }
         })
+        this.selectVariable = "";
+        this.searchType = "";
         this.$emit('setVariables', saveVariables);
       },
       deleteVariable() {
@@ -150,11 +165,48 @@
           this.variables.splice(index, 1);
         })
         this.selection = [];
-      }
+      },
+      filter() {
+        let datas = [];
+        this.variables.forEach(item => {
+          if (this.searchType && this.searchType != "" && this.selectVariable && this.selectVariable != "") {
+            if ((item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) || (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1)) {
+              item.hidden = true;
+            } else {
+              item.hidden = undefined;
+            }
+          }
+          else if (this.selectVariable && this.selectVariable != "") {
+            if (item.name && item.name.toLowerCase().indexOf(this.selectVariable.toLowerCase()) == -1) {
+              item.hidden = true;
+            } else {
+              item.hidden = undefined;
+            }
+          }
+          else if (this.searchType && this.searchType != "") {
+            if (item.type && item.type.toLowerCase().indexOf(this.searchType.toLowerCase()) == -1) {
+              item.hidden = true;
+            } else {
+              item.hidden = undefined;
+            }
+          } else {
+            item.hidden = undefined;
+          }
+          datas.push(item);
+        })
+        this.variables = datas;
+      },
+      createFilter(queryString) {
+        return item => {
+          return (item.type && item.type.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
+        };
+      },
     }
   }
 </script>
 
-<style scoped>
-
+<style>
+  .ms-variable-hidden-row {
+    display: none;
+  }
 </style>
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index b2492190de..55ecc124b3 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -1,4 +1,5 @@
 <template>
+  <div>
   <ms-container v-if="renderComponent">
     <ms-aside-container>
       <ms-api-module
@@ -9,6 +10,7 @@
         @debug="debug"
         @saveAsEdit="editApi"
         @setModuleOptions="setModuleOptions"
+        @setNodeTree="setNodeTree"
         @enableTrash="enableTrash"
         :type="'edit'"
         ref="nodeTree"/>
@@ -25,6 +27,8 @@
           <!-- 列表集合 -->
           <ms-api-list
             v-if="item.type === 'list' && isApiListEnable"
+            :module-tree="nodeTree"
+            :module-options="moduleOptions"
             :current-protocol="currentProtocol"
             :visible="visible"
             :currentRow="currentRow"
@@ -102,8 +106,12 @@
           </template>
         </el-tab-pane>
       </el-tabs>
+
+
     </ms-main-container>
   </ms-container>
+
+  </div>
 </template>
 <script>
   import MsApiList from './components/list/ApiList';
@@ -177,7 +185,7 @@
         currentModule: null,
         selectNodeIds: [],
         currentApi: {},
-        moduleOptions: {},
+        moduleOptions: [],
         trashEnable: false,
         apiTabs: [{
           title: this.$t('api_test.definition.api_title'),
@@ -187,7 +195,8 @@
         }],
         isApiListEnable: true,
         syncTabs: [],
-        projectId: ""
+        projectId: "",
+        nodeTree: []
       }
     },
     mounted() {
@@ -215,6 +224,7 @@
       }
     },
     methods: {
+
       changeRedirectParam(redirectIDParam) {
         this.redirectID = redirectIDParam;
       },
@@ -394,6 +404,9 @@
       setModuleOptions(data) {
         this.moduleOptions = data;
       },
+      setNodeTree(data) {
+        this.nodeTree = data;
+      },
       changeSelectDataRangeAll(tableType) {
         this.$route.params.dataSelectRange = 'all';
       },
diff --git a/frontend/src/business/components/api/definition/components/ApiConfig.vue b/frontend/src/business/components/api/definition/components/ApiConfig.vue
index 235431817c..84fb71cc1d 100644
--- a/frontend/src/business/components/api/definition/components/ApiConfig.vue
+++ b/frontend/src/business/components/api/definition/components/ApiConfig.vue
@@ -127,6 +127,9 @@
           this.request = createComponent("JDBCSampler");
           this.currentApi.request = this.request;
         }
+        if (!this.currentApi.request.variables) {
+          this.currentApi.request.variables = [];
+        }
       },
       initDubbo() {
         if (!this.setRequest()) {
diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue b/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue
index 631d3cc043..05064cf710 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiJsonpathSuggest.vue
@@ -9,27 +9,28 @@
 </template>
 
 <script>
-  import MsDrawer from "../../../../common/components/MsDrawer";
-  import MsInstructionsIcon from "../../../../common/components/MsInstructionsIcon";
+import MsDrawer from "../../../../common/components/MsDrawer";
+import MsInstructionsIcon from "../../../../common/components/MsInstructionsIcon";
 
-  export default {
-    name: "MsApiJsonpathSuggest",
-    components: {MsInstructionsIcon, MsDrawer},
-    data() {
-      return {
-        visible: false,
-        isCheckAll: false,
-        data: {},
-      };
-    },
-    props: {
-      tip: {
-        type: String,
-        default() {
-          return ""
-        }
-      },
+let dotReplace = "#DOT_MASK#";
+export default {
+  name: "MsApiJsonpathSuggest",
+  components: {MsInstructionsIcon, MsDrawer},
+  data() {
+    return {
+      visible: false,
+      isCheckAll: false,
+      data: {},
+    };
+  },
+  props: {
+    tip: {
+      type: String,
+      default() {
+        return ""
+      }
     },
+  },
     methods: {
       close() {
         this.visible = false;
@@ -50,14 +51,46 @@
         this.visible = true;
       },
       pathChangeHandler(data) {
-        let paramNames = data.split('.');
-        let result = this.getParamValue(this.data, 0, paramNames);
+        let paramNames = [];
+        let result = {};
+        try {
+          paramNames = this.parseSpecialChar(data);
+          result = this.getParamValue(this.data, 0, paramNames);
+        } catch (e) {
+          result = {};
+          result.key = 'var';
+        }
         result.path = '$.' + data;
         this.$emit('addSuggest', result);
       },
+      // 替换. 等特殊字符
+      parseSpecialChar(data) {
+        let paramNames = [];
+        let reg = /\['.*'\]/;
+        let searchStr = reg.exec(data);
+        if (searchStr) {
+          searchStr.forEach(item => {
+            if (data.startsWith("['")) {
+              data = data.replace(item, item.replace('.', dotReplace));
+            } else {
+              data = data.replace(item, '.' + item.replace('.', dotReplace));
+            }
+          });
+          paramNames = data.split('.');
+        } else {
+          paramNames = data.split('.');
+        }
+        for (let i in paramNames) {
+          if (paramNames[i].search(reg) > -1) {
+            paramNames[i] = paramNames[i].substring(2, paramNames[i].length - 2);
+          }
+          paramNames[i] = paramNames[i].replace(dotReplace, '.');
+        }
+        return paramNames;
+      },
       getParamValue(obj, index, params) {
         if (params.length < 1) {
-          return "";
+          return {};
         }
 
         let param = params[index];
diff --git a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
index 0fb928e222..d14d3eccfe 100644
--- a/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
+++ b/frontend/src/business/components/api/definition/components/basis/AddBasisApi.vue
@@ -86,7 +86,7 @@
         rule: {
           name: [
             {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
-            {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
+            {max: 100, message: this.$t('test_track.length_less_than') + '100', trigger: 'blur'}
           ],
           path: [{required: true, message: this.$t('api_test.definition.request.path_info'), trigger: 'blur'}, {validator: validateURL, trigger: 'blur'}],
           userId: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
index 2566b9da09..cba4d8dd89 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
@@ -288,6 +288,9 @@
           url = "/api/testcase/update";
         } else {
           tmp.request.path = this.api.path;
+          if (tmp.request.protocol != "dubbo://" && tmp.request.protocol != "DUBBO") {
+            tmp.request.method = this.api.method;
+          }
         }
         if (tmp.tags instanceof Array) {
           tmp.tags = JSON.stringify(tmp.tags);
diff --git a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
index 7b160b9a1b..731129a5ca 100644
--- a/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
+++ b/frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
@@ -54,7 +54,8 @@
   import {CASE_ORDER} from "../../model/JsonData";
   import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
   import MsBatchEdit from "../basis/BatchEdit";
-  import {CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
+  // import {CASE_PRIORITY, REQ_METHOD} from "../../model/JsonData";
+  import {CASE_PRIORITY,API_METHOD_COLOUR, API_STATUS, REQ_METHOD, TCP_METHOD, SQL_METHOD, DUBBO_METHOD} from "../../model/JsonData";
 
   export default {
     name: 'ApiCaseList',
@@ -313,6 +314,17 @@
           this.$warning("请选择用例！");
           return;
         }
+        // //根据不同的接口，注入不同的参数
+        if (this.currentApi.protocol == 'HTTP') {
+          this.valueArr.method = REQ_METHOD;
+        } else if (this.currentApi.protocol == 'TCP') {
+          this.valueArr.method = TCP_METHOD;
+        } else if (this.currentApi.protocol == 'SQL') {
+          this.valueArr.method = SQL_METHOD;
+        } else if (this.currentApi.protocol == 'DUBBO') {
+          this.valueArr.method = DUBBO_METHOD;
+        }
+
         this.$refs.batchEdit.open();
       },
       batchEdit(form) {
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index 7cb015595a..5fac84d2a1 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -109,29 +109,29 @@
 
 <script>
 
-  import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-  import MsResponseText from "../response/ResponseText";
-  import {WORKSPACE_ID} from '../../../../../../common/js/constants';
-  import {API_STATUS, REQ_METHOD} from "../../model/JsonData";
-  import {KeyValue} from "../../model/ApiTestModel";
-  import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
-  import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
+import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
+import MsResponseText from "../response/ResponseText";
+import {WORKSPACE_ID} from '../../../../../../common/js/constants';
+import {API_STATUS, REQ_METHOD} from "../../model/JsonData";
+import {KeyValue} from "../../model/ApiTestModel";
+import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
+import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
 
-  export default {
-    name: "MsAddCompleteHttpApi",
-    components: {MsJsr233Processor, MsResponseText, MsApiRequestForm, MsInputTag},
-    data() {
-      let validateURL = (rule, value, callback) => {
-        if (!this.httpForm.path.startsWith("/") || this.httpForm.path.match(/\s/) != null) {
-          callback(this.$t('api_test.definition.request.path_valid_info'));
-        }
-        callback();
-      };
-      return {
+export default {
+  name: "MsAddCompleteHttpApi",
+  components: {MsJsr233Processor, MsResponseText, MsApiRequestForm, MsInputTag},
+  data() {
+    let validateURL = (rule, value, callback) => {
+      if (!this.httpForm.path.startsWith("/") || this.httpForm.path.match(/\s/) != null) {
+        callback(this.$t('api_test.definition.request.path_valid_info'));
+      }
+      callback();
+    };
+    return {
         rule: {
           name: [
             {required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},
-            {max: 50, message: this.$t('test_track.length_less_than') + '50', trigger: 'blur'}
+            {max: 100, message: this.$t('test_track.length_less_than') + '100', trigger: 'blur'}
           ],
           path: [{required: true, message: this.$t('api_test.definition.request.path_info'), trigger: 'blur'}, {
             validator: validateURL,
diff --git a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
index 575df88736..fc5dca9356 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugTcpPage.vue
@@ -147,8 +147,6 @@
       },
       saveAs() {
         let obj = {request: this.request};
-        obj.request.server = this.debugForm.server;
-        obj.request.port = this.debugForm.port;
         obj.server = this.debugForm.server;
         obj.port = this.debugForm.port;
         obj.request.id = getUUID();
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 6a4c72a57b..1f65665b5d 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -15,6 +15,7 @@
                 @select-all="handleSelectAll"
                 @filter-change="filter"
                 @sort-change="sort"
+                @header-dragend="headerDragend"
                 @select="handleSelect" :height="screenHeight">
 
         <el-table-column type="selection" width="50"/>
@@ -25,25 +26,28 @@
           @selectPageAll="isSelectDataAll(false)"
           @selectAll="isSelectDataAll(true)"/>
 
-        <el-table-column width="30" :resizable="false" align="center">
+        <el-table-column width="30" :resizable="false" min-width="30px"  align="center">
           <template v-slot:default="scope">
             <show-more-btn :is-show="scope.row.showMore" :buttons="buttons" :size="selectDataCounts"/>
           </template>
         </el-table-column>
 
-        <el-table-column prop="num" label="ID" show-overflow-tooltip>
+        <el-table-column prop="num" label="ID" min-width="120px"  show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tooltip content="编辑">
               <a style="cursor:pointer" @click="handleTestCase(scope.row)"> {{ scope.row.num }} </a>
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="name" :label="$t('test_track.case.name')" show-overflow-tooltip/>
+
+        <el-table-column prop="name" min-width="160px"  :label="$t('test_track.case.name')" show-overflow-tooltip/>
 
         <el-table-column
           prop="priority"
           :filters="priorityFilters"
           column-key="priority"
+          min-width="120px"
+
           :label="$t('test_track.case.priority')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -54,10 +58,12 @@
         <el-table-column
           sortable="custom"
           prop="path"
+          min-width="180px"
           :label="$t('api_test.definition.api_path')"
+
           show-overflow-tooltip/>
 
-        <el-table-column prop="tags" :label="$t('commons.tag')">
+        <el-table-column prop="tags" min-width="120px"  :label="$t('commons.tag')">
           <template v-slot:default="scope">
             <div v-for="(itemName,index)  in scope.row.tags" :key="index">
               <ms-tag type="success" effect="plain" :content="itemName"/>
@@ -68,12 +74,14 @@
         <el-table-column
           prop="createUser"
           :label="'创建人'"
+
           show-overflow-tooltip/>
 
         <el-table-column
           sortable="custom"
-          width="160"
+          min-width="160"
           :label="$t('api_test.definition.api_last_time')"
+
           prop="updateTime">
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
@@ -82,11 +90,6 @@
 
         <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
           <template v-slot:default="scope">
-            <!--<el-button type="text" @click="reductionApi(scope.row)" v-if="trashEnable">{{$t('commons.reduction')}}</el-button>-->
-<!--            <el-button type="text" @click="handleTestCase(scope.row)" v-if="!trashEnable">{{ $t('commons.edit') }}-->
-<!--            </el-button>-->
-<!--            <el-button type="text" @click="handleDelete(scope.row)" style="color: #F56C6C">{{ $t('commons.delete') }}-->
-<!--            </el-button>-->
             <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="handleTestCase(scope.row)" v-tester/>
             <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger" v-tester/>
             <ms-api-case-table-extend-btns @showCaseRef="showCaseRef" @showEnvironment="showEnvironment" @createPerformance="createPerformance" :row="scope.row" v-tester/>
@@ -129,18 +132,16 @@ import {API_METHOD_COLOUR, CASE_PRIORITY, DUBBO_METHOD, REQ_METHOD, SQL_METHOD,
 import {getBodyUploadFiles, getCurrentProjectID} from "@/common/js/utils";
 import ApiListContainer from "./ApiListContainer";
 import PriorityTableItem from "../../../../track/common/tableItems/planview/PriorityTableItem";
-import {_filter, _sort} from "../../../../../../common/js/utils";
-import {_handleSelect, _handleSelectAll} from "../../../../../../common/js/tableUtils";
 import MsApiCaseTableExtendBtns from "../reference/ApiCaseTableExtendBtns";
 import MsReferenceView from "../reference/ReferenceView";
 import MsSetEnvironment from "@/business/components/api/definition/components/basis/SetEnvironment";
 import TestPlan from "@/business/components/api/definition/components/jmeter/components/test-plan";
 import ThreadGroup from "@/business/components/api/definition/components/jmeter/components/thread-group";
 import {parseEnvironment} from "@/business/components/api/test/model/EnvironmentModel";
-// import MsTableSelectAll from "../../../../common/components/table/MsTableSelectAll";
 import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
 import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
 import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
+import {_filter, _handleSelect, _handleSelectAll, _sort,} from "@/common/js/tableUtils";
 
 export default {
     name: "ApiCaseSimpleList",
@@ -505,6 +506,14 @@ export default {
         this.clickRow = row;
         this.$refs.setEnvironment.open(row);
       },
+      headerDragend(newWidth,oldWidth,column,event){
+        let finalWidth = newWidth;
+        if(column.minWidth>finalWidth){
+          finalWidth = column.minWidth;
+        }
+        column.width = finalWidth;
+        column.realWidth = finalWidth;
+      },
       createPerformance(row, environment) {
         /**
          * 思路：调用后台创建性能测试的方法，把当前案例的hashTree在后台转化为jmx并文件创建性能测试。
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index a25d37e379..fe05a18b94 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -4,8 +4,10 @@
       :is-api-list-enable="isApiListEnable"
       @isApiListEnableChange="isApiListEnableChange">
 
-      <el-link type="primary" @click="open" style="float: right;margin-top: 5px">{{$t('commons.adv_search.title')}}</el-link>
-      <el-input :placeholder="$t('commons.search_by_id_name_tag')" @blur="search" class="search-input" size="small" @keyup.enter.native="search"
+      <el-link type="primary" @click="open" style="float: right;margin-top: 5px">{{ $t('commons.adv_search.title') }}
+      </el-link>
+      <el-input :placeholder="$t('commons.search_by_id_name_tag')" @blur="search" class="search-input" size="small"
+                @keyup.enter.native="search"
                 v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
@@ -15,14 +17,15 @@
                 @filter-change="filter"
                 :data="tableData" row-key="id" class="test-content adjust-table ms-select-all-fixed"
                 @select-all="handleSelectAll"
+                @header-dragend="headerDragend"
                 @select="handleSelect" :height="screenHeight">
         <el-table-column width="50" type="selection"/>
 
         <ms-table-header-select-popover v-show="total>0"
-          :page-size="pageSize>total?total:pageSize"
-          :total="total"
-          @selectPageAll="isSelectDataAll(false)"
-          @selectAll="isSelectDataAll(true)"/>
+                                        :page-size="pageSize>total?total:pageSize"
+                                        :total="total"
+                                        @selectPageAll="isSelectDataAll(false)"
+                                        @selectAll="isSelectDataAll(true)"/>
 
         <el-table-column width="30" :resizable="false" align="center">
           <template v-slot:default="scope">
@@ -31,6 +34,8 @@
         </el-table-column>
 
         <el-table-column prop="num" label="ID" show-overflow-tooltip
+                         min-width="80px"
+
                          sortable="custom">
           <template slot-scope="scope">
             <el-tooltip content="编辑">
@@ -40,12 +45,14 @@
         </el-table-column>
         <el-table-column prop="name" :label="$t('api_test.definition.api_name')"
                          show-overflow-tooltip
+
                          sortable="custom" min-width="120px"/>
         <el-table-column
           prop="status"
           column-key="status"
           sortable="custom"
           :filters="statusFilters"
+
           :label="$t('api_test.definition.api_status')" min-width="120px">
           <template v-slot:default="scope">
             <span class="el-dropdown-link">
@@ -59,10 +66,12 @@
           sortable="custom"
           column-key="method"
           :filters="methodFilters"
+
           :label="$t('api_test.definition.api_type')"
           show-overflow-tooltip min-width="120px">
           <template v-slot:default="scope" class="request-method">
-            <el-tag size="mini" :style="{'background-color': getColor(true, scope.row.method), border: getColor(true, scope.row.method)}"
+            <el-tag size="mini"
+                    :style="{'background-color': getColor(true, scope.row.method), border: getColor(true, scope.row.method)}"
                     class="api-el-tag">
               {{ scope.row.method }}
             </el-tag>
@@ -74,15 +83,19 @@
           sortable="custom"
           :filters="userFilters"
           column-key="user_id"
+
           :label="$t('api_test.definition.api_principal')"
           show-overflow-tooltip min-width="100px"/>
 
         <el-table-column
           prop="path"
+          min-width="120px"
+
           :label="$t('api_test.definition.api_path')"
           show-overflow-tooltip/>
 
-        <el-table-column prop="tags" :label="$t('commons.tag')">
+        <el-table-column prop="tags" :label="$t('commons.tag')" min-width="80px"
+                         >
           <template v-slot:default="scope">
             <div v-for="(itemName,index)  in scope.row.tags" :key="index">
               <ms-tag type="success" effect="plain" :content="itemName"/>
@@ -94,6 +107,8 @@
           width="160"
           :label="$t('api_test.definition.api_last_time')"
           sortable="custom"
+          min-width="160px"
+
           prop="updateTime">
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
@@ -102,37 +117,47 @@
 
         <el-table-column
           prop="caseTotal"
+          min-width="80px"
+
           :label="$t('api_test.definition.api_case_number')"
           show-overflow-tooltip/>
 
         <el-table-column
           prop="caseStatus"
+          min-width="80px"
+
           :label="$t('api_test.definition.api_case_status')"
           show-overflow-tooltip/>
 
         <el-table-column
           prop="casePassingRate"
           :width="100"
+          min-width="100px"
+
           :label="$t('api_test.definition.api_case_passing_rate')"
           show-overflow-tooltip/>
 
-        <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130" align="center">
+        <el-table-column fixed="right" v-if="!isReadOnly" :label="$t('commons.operating')" min-width="130"
+                         align="center">
           <template v-slot:default="scope">
-            <ms-table-operator-button :tip="$t('commons.reduction')" icon="el-icon-refresh-left" @exec="reductionApi(scope.row)" v-if="trashEnable" v-tester/>
-            <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="editApi(scope.row)" v-else v-tester/>
+            <ms-table-operator-button :tip="$t('commons.reduction')" icon="el-icon-refresh-left"
+                                      @exec="reductionApi(scope.row)" v-if="trashEnable" v-tester/>
+            <ms-table-operator-button :tip="$t('commons.edit')" icon="el-icon-edit" @exec="editApi(scope.row)" v-else
+                                      v-tester/>
             <el-tooltip :content="$t('test_track.case.case_list')"
                         placement="bottom"
                         :enterable="false"
-                        effect="dark" >
+                        effect="dark">
               <el-button @click="handleTestCase(scope.row)"
                          @keydown.enter.native.prevent
                          type="primary"
                          circle
                          style="color:white;padding: 0px 0.1px;font-size: 11px;width: 28px;height: 28px;"
-                         size="mini" >case
+                         size="mini">case
               </el-button>
             </el-tooltip>
-            <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" @exec="handleDelete(scope.row)" type="danger" v-tester/>
+            <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" @exec="handleDelete(scope.row)"
+                                      type="danger" v-tester/>
           </template>
         </el-table-column>
       </el-table>
@@ -144,81 +169,263 @@
     <ms-batch-edit ref="batchEdit" @batchEdit="batchEdit" :typeArr="typeArr" :value-arr="valueArr"/>
     <!--高级搜索-->
     <ms-table-adv-search-bar :condition.sync="condition" :showLink="false" ref="searchBar" @search="search"/>
-
+    <case-batch-move @refresh="initTable" @moveSave="moveSave" ref="testCaseBatchMove"></case-batch-move>
   </div>
 
 </template>
 
 <script>
 
-  import MsTableHeader from '../../../../common/components/MsTableHeader';
-  import MsTableOperator from "../../../../common/components/MsTableOperator";
-  import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
-  import MsTableButton from "../../../../common/components/MsTableButton";
-  import MsTablePagination from "../../../../common/pagination/TablePagination";
-  import MsTag from "../../../../common/components/MsTag";
-  import MsApiCaseList from "../case/ApiCaseList";
-  import MsContainer from "../../../../common/components/MsContainer";
-  import MsBottomContainer from "../BottomContainer";
-  import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
-  import MsBatchEdit from "../basis/BatchEdit";
-  import {API_METHOD_COLOUR, API_STATUS, REQ_METHOD,TCP_METHOD,SQL_METHOD,DUBBO_METHOD} from "../../model/JsonData";
-  import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
-  import {WORKSPACE_ID} from '@/common/js/constants';
-  import ApiListContainer from "./ApiListContainer";
-  import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
-  import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
-  import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
-  import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
-  import MsTipButton from "@/business/components/common/components/MsTipButton";
+import MsTableHeader from '../../../../common/components/MsTableHeader';
+import MsTableOperator from "../../../../common/components/MsTableOperator";
+import MsTableOperatorButton from "../../../../common/components/MsTableOperatorButton";
+import MsTableButton from "../../../../common/components/MsTableButton";
+import MsTablePagination from "../../../../common/pagination/TablePagination";
+import MsTag from "../../../../common/components/MsTag";
+import MsApiCaseList from "../case/ApiCaseList";
+import MsContainer from "../../../../common/components/MsContainer";
+import MsBottomContainer from "../BottomContainer";
+import ShowMoreBtn from "../../../../track/case/components/ShowMoreBtn";
+import MsBatchEdit from "../basis/BatchEdit";
+import {API_METHOD_COLOUR, API_STATUS, DUBBO_METHOD, REQ_METHOD, SQL_METHOD, TCP_METHOD} from "../../model/JsonData";
+import {getCurrentProjectID} from "@/common/js/utils";
+import {WORKSPACE_ID} from '@/common/js/constants';
+import ApiListContainer from "./ApiListContainer";
+import MsTableHeaderSelectPopover from "@/business/components/common/components/table/MsTableHeaderSelectPopover";
+import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
+import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
+import {API_DEFINITION_CONFIGS} from "@/business/components/common/components/search/search-components";
+import MsTipButton from "@/business/components/common/components/MsTipButton";
+import CaseBatchMove from "@/business/components/api/definition/components/basis/BatchMove";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
-  export default {
-    name: "ApiList",
-    components: {
-      ApiStatus,
-      MsTableHeaderSelectPopover,
-      ApiListContainer,
-      MsTableButton,
-      MsTableOperatorButton,
-      MsTableOperator,
-      MsTableHeader,
-      MsTablePagination,
-      MsTag,
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      ShowMoreBtn,
-      MsBatchEdit,
-      MsTipButton,
-      MsTableAdvSearchBar
+
+export default {
+  name: "ApiList",
+  components: {
+    CaseBatchMove,
+    ApiStatus,
+    MsTableHeaderSelectPopover,
+    ApiListContainer,
+    MsTableButton,
+    MsTableOperatorButton,
+    MsTableOperator,
+    MsTableHeader,
+    MsTablePagination,
+    MsTag,
+    MsApiCaseList,
+    MsContainer,
+    MsBottomContainer,
+    ShowMoreBtn,
+    MsBatchEdit,
+    MsTipButton,
+    MsTableAdvSearchBar
+  },
+  data() {
+    return {
+      condition: {
+        components: API_DEFINITION_CONFIGS
+      },
+      selectApi: {},
+      result: {},
+      moduleId: "",
+      selectDataRange: "all",
+      deletePath: "/test/case/delete",
+      selectRows: new Set(),
+      buttons: [
+        {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
+        {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch},
+        {
+          name: this.$t('api_test.definition.request.batch_move'), handleClick: this.handleBatchMove
+        }
+      ],
+      typeArr: [
+        {id: 'status', name: this.$t('api_test.definition.api_status')},
+        {id: 'method', name: this.$t('api_test.definition.api_type')},
+        {id: 'userId', name: this.$t('api_test.definition.api_principal')},
+      ],
+      statusFilters: [
+        {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
+        {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
+        {text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
+        {text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'},
+      ],
+      methodFilters: [
+        {text: 'GET', value: 'GET'},
+        {text: 'POST', value: 'POST'},
+        {text: 'PUT', value: 'PUT'},
+        {text: 'PATCH', value: 'PATCH'},
+        {text: 'DELETE', value: 'DELETE'},
+        {text: 'OPTIONS', value: 'OPTIONS'},
+        {text: 'HEAD', value: 'HEAD'},
+        {text: 'CONNECT', value: 'CONNECT'},
+        {text: 'DUBBO', value: 'DUBBO'},
+        {text: 'dubbo://', value: 'dubbo://'},
+        {text: 'SQL', value: 'SQL'},
+        {text: 'TCP', value: 'TCP'},
+      ],
+      userFilters: [],
+      valueArr: {
+        status: API_STATUS,
+        method: REQ_METHOD,
+        userId: [],
+      },
+      methodColorMap: new Map(API_METHOD_COLOUR),
+      tableData: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      screenHeight: document.documentElement.clientHeight - 270,//屏幕高度,
+      environmentId: undefined,
+      selectAll: false,
+      unSelection: [],
+      selectDataCounts: 0,
+    }
+  },
+  props: {
+    currentProtocol: String,
+    selectNodeIds: Array,
+    isSelectThisWeek: String,
+    visible: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-      return {
-        condition: {
-          components: API_DEFINITION_CONFIGS
-        },
-        selectApi: {},
-        result: {},
-        moduleId: "",
-        selectDataRange: "all",
-        deletePath: "/test/case/delete",
-        selectRows: new Set(),
-        buttons: [
-          {name: this.$t('api_test.definition.request.batch_delete'), handleClick: this.handleDeleteBatch},
-          {name: this.$t('api_test.definition.request.batch_edit'), handleClick: this.handleEditBatch}
-        ],
-        typeArr: [
-          {id: 'status', name: this.$t('api_test.definition.api_status')},
-          {id: 'method', name: this.$t('api_test.definition.api_type')},
-          {id: 'userId', name: this.$t('api_test.definition.api_principal')},
-        ],
-        statusFilters: [
-          {text: this.$t('test_track.plan.plan_status_prepare'), value: 'Prepare'},
-          {text: this.$t('test_track.plan.plan_status_running'), value: 'Underway'},
-          {text: this.$t('test_track.plan.plan_status_completed'), value: 'Completed'},
-          {text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'},
-        ],
-        methodFilters: [
+    isCaseRelevance: {
+      type: Boolean,
+      default: false,
+    },
+    trashEnable: {
+      type: Boolean,
+      default: false,
+    },
+    isApiListEnable: Boolean,
+    isReadOnly: {
+      type: Boolean,
+      default: false
+    },
+    moduleTree: {
+      type: Array,
+      default() {
+        return []
+      },
+    },
+    moduleOptions: {
+      type: Array,
+      default() {
+        return []
+      },
+    }
+  },
+  created: function () {
+    if (this.trashEnable) {
+      this.condition.filters = {status: ["Trash"]};
+    } else {
+      this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+    }
+    this.initTable();
+    this.getMaintainerOptions();
+  },
+  watch: {
+    selectNodeIds() {
+      this.initTable();
+    },
+    currentProtocol() {
+      this.initTable();
+    },
+    trashEnable() {
+      if (this.trashEnable) {
+        this.condition.filters = {status: ["Trash"]};
+        this.condition.moduleIds = [];
+      } else {
+        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
+      }
+      this.initTable();
+    }
+  },
+  methods: {
+    handleBatchMove() {
+      this.$refs.testCaseBatchMove.open(this.moduleTree, [], this.moduleOptions);
+    },
+
+    isApiListEnableChange(data) {
+      this.$emit('isApiListEnableChange', data);
+    },
+    initTable() {
+      this.selectRows = new Set();
+      this.selectAll = false;
+      this.unSelection = [];
+      this.selectDataCounts = 0;
+      this.condition.moduleIds = this.selectNodeIds;
+      this.condition.projectId = getCurrentProjectID();
+      if (this.currentProtocol != null) {
+        this.condition.protocol = this.currentProtocol;
+      }
+
+      //检查是否只查询本周数据
+      this.getSelectDataRange();
+      this.condition.selectThisWeedData = false;
+      this.condition.apiCaseCoverage = null;
+      switch (this.selectDataRange) {
+        case 'thisWeekCount':
+          this.condition.selectThisWeedData = true;
+          break;
+        case 'uncoverage':
+          this.condition.apiCaseCoverage = 'uncoverage';
+          break;
+        case 'coverage':
+          this.condition.apiCaseCoverage = 'coverage';
+          break;
+        case 'Prepare':
+          this.condition.filters.status = [this.selectDataRange];
+          break;
+        case 'Completed':
+          this.condition.filters.status = [this.selectDataRange];
+          break;
+        case 'Underway':
+          this.condition.filters.status = [this.selectDataRange];
+          break;
+      }
+      if (this.condition.projectId) {
+        this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
+          this.genProtocalFilter(this.condition.protocol);
+          this.total = response.data.itemCount;
+          this.tableData = response.data.listObject;
+          this.unSelection = response.data.listObject.map(s => s.id);
+          this.tableData.forEach(item => {
+            if (item.tags && item.tags.length > 0) {
+              item.tags = JSON.parse(item.tags);
+            }
+          })
+        });
+      }
+    },
+    genProtocalFilter(protocalType) {
+      if (protocalType === "HTTP") {
+        this.methodFilters = [
+          {text: 'GET', value: 'GET'},
+          {text: 'POST', value: 'POST'},
+          {text: 'PUT', value: 'PUT'},
+          {text: 'PATCH', value: 'PATCH'},
+          {text: 'DELETE', value: 'DELETE'},
+          {text: 'OPTIONS', value: 'OPTIONS'},
+          {text: 'HEAD', value: 'HEAD'},
+          {text: 'CONNECT', value: 'CONNECT'},
+        ];
+      } else if (protocalType === "TCP") {
+        this.methodFilters = [
+          {text: 'TCP', value: 'TCP'},
+        ];
+      } else if (protocalType === "SQL") {
+        this.methodFilters = [
+          {text: 'SQL', value: 'SQL'},
+        ];
+      } else if (protocalType === "DUBBO") {
+        this.methodFilters = [
+          {text: 'DUBBO', value: 'DUBBO'},
+          {text: 'dubbo://', value: 'dubbo://'},
+        ];
+      } else {
+        this.methodFilters = [
           {text: 'GET', value: 'GET'},
           {text: 'POST', value: 'POST'},
           {text: 'PUT', value: 'PUT'},
@@ -231,447 +438,310 @@
           {text: 'dubbo://', value: 'dubbo://'},
           {text: 'SQL', value: 'SQL'},
           {text: 'TCP', value: 'TCP'},
-        ],
-        userFilters: [],
-        valueArr: {
-          status: API_STATUS,
-          method: REQ_METHOD,
-          userId: [],
-        },
-        methodColorMap: new Map(API_METHOD_COLOUR),
-        tableData: [],
-        currentPage: 1,
-        pageSize: 10,
-        total: 0,
-        screenHeight: document.documentElement.clientHeight - 330,//屏幕高度,
-        environmentId: undefined,
-        selectAll: false,
-        unSelection: [],
-        selectDataCounts: 0,
+        ];
       }
     },
-    props: {
-      currentProtocol: String,
-      selectNodeIds: Array,
-      isSelectThisWeek: String,
-      visible: {
-        type: Boolean,
-        default: false,
-      },
-      isCaseRelevance: {
-        type: Boolean,
-        default: false,
-      },
-      trashEnable: {
-        type: Boolean,
-        default: false,
-      },
-      isApiListEnable: Boolean,
-      isReadOnly: {
-        type: Boolean,
-        default: false
-      },
-    },
-    created: function () {
-      if (this.trashEnable) {
-        this.condition.filters = {status: ["Trash"]};
-      }
-      else {
-        this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-      }
-      this.initTable();
-      this.getMaintainerOptions();
-    },
-    watch: {
-      selectNodeIds() {
-        this.initTable();
-      },
-      currentProtocol() {
-        this.initTable();
-      },
-      trashEnable() {
-        if (this.trashEnable) {
-          this.condition.filters = {status: ["Trash"]};
-          this.condition.moduleIds = [];
-        } else {
-          this.condition.filters = {status: ["Prepare", "Underway", "Completed"]};
-        }
-        this.initTable();
-      }
-    },
-    methods: {
-      isApiListEnableChange(data) {
-        this.$emit('isApiListEnableChange', data);
-      },
-      initTable() {
-        this.selectRows = new Set();
-        this.selectAll = false;
-        this.unSelection = [];
-        this.selectDataCounts = 0;
-        this.condition.moduleIds = this.selectNodeIds;
-        this.condition.projectId = getCurrentProjectID();
-        if (this.currentProtocol != null) {
-          this.condition.protocol = this.currentProtocol;
-        }
-
-        //检查是否只查询本周数据
-        this.getSelectDataRange();
-        this.condition.selectThisWeedData = false;
-        this.condition.apiCaseCoverage = null;
-        switch (this.selectDataRange) {
-          case 'thisWeekCount':
-            this.condition.selectThisWeedData = true;
-            break;
-          case 'uncoverage':
-            this.condition.apiCaseCoverage = 'uncoverage';
-            break;
-          case 'coverage':
-            this.condition.apiCaseCoverage = 'coverage';
-            break;
-          case 'Prepare':
-            this.condition.filters.status = [this.selectDataRange];
-            break;
-          case 'Completed':
-            this.condition.filters.status = [this.selectDataRange];
-            break;
-          case 'Underway':
-            this.condition.filters.status = [this.selectDataRange];
-            break;
-        }
-        if (this.condition.projectId) {
-          this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
-            this.genProtocalFilter(this.condition.protocol);
-            this.total = response.data.itemCount;
-            this.tableData = response.data.listObject;
-            this.unSelection = response.data.listObject.map(s => s.id);
-            this.tableData.forEach(item => {
-              if (item.tags && item.tags.length > 0) {
-                item.tags = JSON.parse(item.tags);
-              }
-            })
-          });
-        }
-      },
-      genProtocalFilter(protocalType){
-        if(protocalType === "HTTP"){
-          this.methodFilters = [
-            {text: 'GET', value: 'GET'},
-            {text: 'POST', value: 'POST'},
-            {text: 'PUT', value: 'PUT'},
-            {text: 'PATCH', value: 'PATCH'},
-            {text: 'DELETE', value: 'DELETE'},
-            {text: 'OPTIONS', value: 'OPTIONS'},
-            {text: 'HEAD', value: 'HEAD'},
-            {text: 'CONNECT', value: 'CONNECT'},
-          ];
-        }else if(protocalType === "TCP"){
-          this.methodFilters = [
-            {text: 'TCP', value: 'TCP'},
-          ];
-        }else if(protocalType === "SQL"){
-          this.methodFilters = [
-            {text: 'SQL', value: 'SQL'},
-          ];
-        }else if(protocalType === "DUBBO"){
-          this.methodFilters = [
-            {text: 'DUBBO', value: 'DUBBO'},
-            {text: 'dubbo://', value: 'dubbo://'},
-          ];
-        }else{
-          this.methodFilters = [
-            {text: 'GET', value: 'GET'},
-            {text: 'POST', value: 'POST'},
-            {text: 'PUT', value: 'PUT'},
-            {text: 'PATCH', value: 'PATCH'},
-            {text: 'DELETE', value: 'DELETE'},
-            {text: 'OPTIONS', value: 'OPTIONS'},
-            {text: 'HEAD', value: 'HEAD'},
-            {text: 'CONNECT', value: 'CONNECT'},
-            {text: 'DUBBO', value: 'DUBBO'},
-            {text: 'dubbo://', value: 'dubbo://'},
-            {text: 'SQL', value: 'SQL'},
-            {text: 'TCP', value: 'TCP'},
-          ];
-        }
-      },
-      getMaintainerOptions() {
-        let workspaceId = localStorage.getItem(WORKSPACE_ID);
-        this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
-          this.valueArr.userId = response.data;
-          this.userFilters = response.data.map(u => {
-            return {text: u.name, value: u.id}
-          });
+    getMaintainerOptions() {
+      let workspaceId = localStorage.getItem(WORKSPACE_ID);
+      this.$post('/user/ws/member/tester/list', {workspaceId: workspaceId}, response => {
+        this.valueArr.userId = response.data;
+        this.userFilters = response.data.map(u => {
+          return {text: u.name, value: u.id}
         });
-      },
-      handleSelect(selection, row) {
-        row.hashTree = [];
-        if (this.selectRows.has(row)) {
-          this.$set(row, "showMore", false);
-          this.selectRows.delete(row);
-        } else {
+      });
+    },
+    handleSelect(selection, row) {
+      row.hashTree = [];
+      if (this.selectRows.has(row)) {
+        this.$set(row, "showMore", false);
+        this.selectRows.delete(row);
+      } else {
+        this.$set(row, "showMore", true);
+        this.selectRows.add(row);
+      }
+      let arr = Array.from(this.selectRows);
+      // 选中1个以上的用例时显示更多操作
+      if (this.selectRows.size === 1) {
+        this.$set(arr[0], "showMore", true);
+      } else if (this.selectRows.size === 2) {
+        arr.forEach(row => {
           this.$set(row, "showMore", true);
-          this.selectRows.add(row);
-        }
-        let arr = Array.from(this.selectRows);
-        // 选中1个以上的用例时显示更多操作
-        if (this.selectRows.size === 1) {
-          this.$set(arr[0], "showMore", true);
-        } else if (this.selectRows.size === 2) {
-          arr.forEach(row => {
-            this.$set(row, "showMore", true);
-          })
-        }
-        this.selectRowsCount(this.selectRows)
-      },
-      handleSelectAll(selection) {
-        if (selection.length > 0) {
-          if (selection.length === 1) {
-            selection.hashTree = [];
-            this.selectRows.add(selection[0]);
-          } else {
-            this.tableData.forEach(item => {
-              item.hashTree = [];
-              this.$set(item, "showMore", true);
-              this.selectRows.add(item);
-            });
-          }
+        })
+      }
+      this.selectRowsCount(this.selectRows)
+    },
+    handleSelectAll(selection) {
+      if (selection.length > 0) {
+        if (selection.length === 1) {
+          selection.hashTree = [];
+          this.selectRows.add(selection[0]);
         } else {
-          this.selectRows.clear();
-          this.tableData.forEach(row => {
-            this.$set(row, "showMore", false);
-          })
-        }
-        this.selectRowsCount(this.selectRows)
-      },
-      search() {
-        this.changeSelectDataRangeAll();
-        this.initTable();
-      },
-      buildPagePath(path) {
-        return path + "/" + this.currentPage + "/" + this.pageSize;
-      },
-
-      editApi(row) {
-        this.$emit('editApi', row);
-      },
-      reductionApi(row) {
-        let tmp = JSON.parse(JSON.stringify(row));
-        tmp.request = null;
-        tmp.response = null;
-        if (tmp.tags instanceof Array) {
-          tmp.tags = JSON.stringify(tmp.tags);
-        }
-        let rows = [tmp];
-        this.$post('/api/definition/reduction/', rows, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.search();
-        });
-      },
-      handleDeleteBatch() {
-        if (this.trashEnable) {
-          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-            confirmButtonText: this.$t('commons.confirm'),
-            callback: (action) => {
-              if (action === 'confirm') {
-                let deleteParam = {};
-                let ids = Array.from(this.selectRows).map(row => row.id);
-                deleteParam.dataIds = ids;
-                deleteParam.projectId = getCurrentProjectID();
-                deleteParam.selectAllDate = this.isSelectAllDate;
-                deleteParam.unSelectIds = this.unSelection;
-                deleteParam = Object.assign(deleteParam, this.condition);
-                this.$post('/api/definition/deleteBatchByParams/', deleteParam, () => {
-                  this.selectRows.clear();
-                  this.initTable();
-                  this.$success(this.$t('commons.delete_success'));
-                });
-              }
-            }
-          });
-        } else {
-          this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
-            confirmButtonText: this.$t('commons.confirm'),
-            callback: (action) => {
-              if (action === 'confirm') {
-                let ids = Array.from(this.selectRows).map(row => row.id);
-                let deleteParam = {};
-                deleteParam.dataIds = ids;
-                deleteParam.projectId = getCurrentProjectID();
-                deleteParam.selectAllDate = this.isSelectAllDate;
-                deleteParam.unSelectIds = this.unSelection;
-                deleteParam = Object.assign(deleteParam, this.condition);
-                this.$post('/api/definition/removeToGcByParams/', deleteParam, () => {
-                  this.selectRows.clear();
-                  this.initTable();
-                  this.$success(this.$t('commons.delete_success'));
-                  this.$refs.caseList.apiCaseClose();
-                });
-              }
-            }
+          this.tableData.forEach(item => {
+            item.hashTree = [];
+            this.$set(item, "showMore", true);
+            this.selectRows.add(item);
           });
         }
-      },
-      handleEditBatch() {
-        if(this.currentProtocol =='HTTP'){
-          this.valueArr.method = REQ_METHOD;
-        }else if(this.currentProtocol =='TCP'){
-          this.valueArr.method = TCP_METHOD;
-        }else if(this.currentProtocol =='SQL'){
-          this.valueArr.method = SQL_METHOD;
-        }else if(this.currentProtocol =='DUBBO'){
-          this.valueArr.method = DUBBO_METHOD;
-        }
-        this.$refs.batchEdit.open();
-      },
-      batchEdit(form) {
-        let arr = Array.from(this.selectRows);
-        let ids = arr.map(row => row.id);
-        let param = {};
-        param[form.type] = form.value;
-        param.ids = ids;
+      } else {
+        this.selectRows.clear();
+        this.tableData.forEach(row => {
+          this.$set(row, "showMore", false);
+        })
+      }
+      this.selectRowsCount(this.selectRows)
+    },
+    search() {
+      this.changeSelectDataRangeAll();
+      this.initTable();
+    },
+    buildPagePath(path) {
+      return path + "/" + this.currentPage + "/" + this.pageSize;
+    },
 
-        param.projectId = getCurrentProjectID();
-        param.selectAllDate = this.isSelectAllDate;
-        param.unSelectIds = this.unSelection;
-        param = Object.assign(param, this.condition);
-
-        this.$post('/api/definition/batch/editByParams', param, () => {
-          this.$success(this.$t('commons.save_success'));
-          this.initTable();
-        });
-      },
-      handleTestCase(api) {
-        this.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 = [];
-        }
-        this.selectApi.url = request.path;
-        this.$refs.caseList.open(this.selectApi);
-      },
-      handleDelete(api) {
-        if (this.trashEnable) {
-          this.$get('/api/definition/delete/' + api.id, () => {
-            this.$success(this.$t('commons.delete_success'));
-            this.initTable();
-          });
-          return;
-        }
-        this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name + " ？", '', {
+    editApi(row) {
+      this.$emit('editApi', row);
+    },
+    reductionApi(row) {
+      let tmp = JSON.parse(JSON.stringify(row));
+      tmp.request = null;
+      tmp.response = null;
+      if (tmp.tags instanceof Array) {
+        tmp.tags = JSON.stringify(tmp.tags);
+      }
+      let rows = [tmp];
+      this.$post('/api/definition/reduction/', rows, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.search();
+      });
+    },
+    handleDeleteBatch() {
+      if (this.trashEnable) {
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              let ids = [api.id];
-              this.$post('/api/definition/removeToGc/', ids, () => {
-                this.$success(this.$t('commons.delete_success'));
+              let deleteParam = {};
+              let ids = Array.from(this.selectRows).map(row => row.id);
+              deleteParam.dataIds = ids;
+              deleteParam.projectId = getCurrentProjectID();
+              deleteParam.selectAllDate = this.isSelectAllDate;
+              deleteParam.unSelectIds = this.unSelection;
+              deleteParam = Object.assign(deleteParam, this.condition);
+              this.$post('/api/definition/deleteBatchByParams/', deleteParam, () => {
+                this.selectRows.clear();
                 this.initTable();
+                this.$success(this.$t('commons.delete_success'));
+              });
+            }
+          }
+        });
+      } else {
+        this.$alert(this.$t('api_test.definition.request.delete_confirm') + "？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              let ids = Array.from(this.selectRows).map(row => row.id);
+              let deleteParam = {};
+              deleteParam.dataIds = ids;
+              deleteParam.projectId = getCurrentProjectID();
+              deleteParam.selectAllDate = this.isSelectAllDate;
+              deleteParam.unSelectIds = this.unSelection;
+              deleteParam = Object.assign(deleteParam, this.condition);
+              this.$post('/api/definition/removeToGcByParams/', deleteParam, () => {
+                this.selectRows.clear();
+                this.initTable();
+                this.$success(this.$t('commons.delete_success'));
                 this.$refs.caseList.apiCaseClose();
               });
             }
           }
         });
-      },
-      getColor(enable, method) {
-        if (enable) {
-          return this.methodColorMap.get(method);
-        }
-      },
-      showExecResult(row) {
-        this.$emit('showExecResult', row);
-      },
-      selectRowsCount(selection) {
-        let selectedIDs = this.getIds(selection);
-        let allIDs = this.tableData.map(s => s.id);
-        this.unSelection = allIDs.filter(function (val) {
-          return selectedIDs.indexOf(val) === -1
-        });
-        if (this.isSelectAllDate) {
-          this.selectDataCounts = this.total - this.unSelection.length;
-        } else {
-          this.selectDataCounts = selection.size;
-        }
-      },
-      isSelectDataAll(dataType) {
-        this.isSelectAllDate = dataType;
-        this.selectRowsCount(this.selectRows)
-        //如果已经全选，不需要再操作了
-        if (this.selectRows.size != this.tableData.length) {
-          this.$refs.apiDefinitionTable.toggleAllSelection(true);
-        }
-      },
-      //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
-      getSelectDataRange() {
-        let dataRange = this.$route.params.dataSelectRange;
-        let dataType = this.$route.params.dataType;
-        if (dataType === 'api') {
-          this.selectDataRange = dataRange;
-        } else {
-          this.selectDataRange = 'all';
-        }
-      },
-      changeSelectDataRangeAll() {
-        this.$emit("changeSelectDataRangeAll", "api");
-      },
-      getIds(rowSets) {
-        let rowArray = Array.from(rowSets)
-        let ids = rowArray.map(s => s.id);
-        return ids;
-      },
-      sort(column) {
-        // 每次只对一个字段排序
-        if (this.condition.orders) {
-          this.condition.orders = [];
-        }
-        _sort(column, this.condition);
-        this.initTable();
-      },
-      filter(filters) {
-        _filter(filters, this.condition);
-        this.initTable();
-      },
-      open() {
-        this.$refs.searchBar.open();
       }
     },
+    handleEditBatch() {
+      if (this.currentProtocol == 'HTTP') {
+        this.valueArr.method = REQ_METHOD;
+      } else if (this.currentProtocol == 'TCP') {
+        this.valueArr.method = TCP_METHOD;
+      } else if (this.currentProtocol == 'SQL') {
+        this.valueArr.method = SQL_METHOD;
+      } else if (this.currentProtocol == 'DUBBO') {
+        this.valueArr.method = DUBBO_METHOD;
+      }
+      this.$refs.batchEdit.open();
+    },
+    batchEdit(form) {
+      let arr = Array.from(this.selectRows);
+      let ids = arr.map(row => row.id);
+      let param = {};
+      param[form.type] = form.value;
+      param.ids = ids;
+
+      param.projectId = getCurrentProjectID();
+      param.selectAllDate = this.isSelectAllDate;
+      param.unSelectIds = this.unSelection;
+      param = Object.assign(param, this.condition);
+
+      this.$post('/api/definition/batch/editByParams', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.initTable();
+      });
+    },
+    moveSave(param) {
+      let arr = Array.from(this.selectRows);
+      let ids = arr.map(row => row.id);
+      param.ids = ids;
+      param.projectId = getCurrentProjectID();
+      param.selectAllDate = this.isSelectAllDate;
+      param.unSelectIds = this.unSelection;
+      param = Object.assign(param, this.condition);
+      param.moduleId=param.nodeId;
+      this.$post('/api/definition/batch/editByParams', param, () => {
+        this.$success(this.$t('commons.save_success'));
+        this.$refs.testCaseBatchMove.close();
+        this.initTable();
+      });
+    },
+    handleTestCase(api) {
+      this.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 = [];
+      }
+      this.selectApi.url = request.path;
+      this.$refs.caseList.open(this.selectApi);
+    },
+    handleDelete(api) {
+      if (this.trashEnable) {
+        this.$get('/api/definition/delete/' + api.id, () => {
+          this.$success(this.$t('commons.delete_success'));
+          this.initTable();
+        });
+        return;
+      }
+      this.$alert(this.$t('api_test.definition.request.delete_confirm') + ' ' + api.name + " ？", '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        callback: (action) => {
+          if (action === 'confirm') {
+            let ids = [api.id];
+            this.$post('/api/definition/removeToGc/', ids, () => {
+              this.$success(this.$t('commons.delete_success'));
+              this.initTable();
+              this.$refs.caseList.apiCaseClose();
+            });
+          }
+        }
+      });
+    },
+    getColor(enable, method) {
+      if (enable) {
+        return this.methodColorMap.get(method);
+      }
+    },
+    showExecResult(row) {
+      this.$emit('showExecResult', row);
+    },
+    selectRowsCount(selection) {
+      let selectedIDs = this.getIds(selection);
+      let allIDs = this.tableData.map(s => s.id);
+      this.unSelection = allIDs.filter(function (val) {
+        return selectedIDs.indexOf(val) === -1
+      });
+      if (this.isSelectAllDate) {
+        this.selectDataCounts = this.total - this.unSelection.length;
+      } else {
+        this.selectDataCounts = selection.size;
+      }
+    },
+    isSelectDataAll(dataType) {
+      this.isSelectAllDate = dataType;
+      this.selectRowsCount(this.selectRows)
+      //如果已经全选，不需要再操作了
+      if (this.selectRows.size != this.tableData.length) {
+        this.$refs.apiDefinitionTable.toggleAllSelection(true);
+      }
+    },
+    //判断是否只显示本周的数据。  从首页跳转过来的请求会带有相关参数
+    getSelectDataRange() {
+      let dataRange = this.$route.params.dataSelectRange;
+      let dataType = this.$route.params.dataType;
+      if (dataType === 'api') {
+        this.selectDataRange = dataRange;
+      } else {
+        this.selectDataRange = 'all';
+      }
+    },
+    changeSelectDataRangeAll() {
+      this.$emit("changeSelectDataRangeAll", "api");
+    },
+    getIds(rowSets) {
+      let rowArray = Array.from(rowSets)
+      let ids = rowArray.map(s => s.id);
+      return ids;
+    },
+    sort(column) {
+      // 每次只对一个字段排序
+      if (this.condition.orders) {
+        this.condition.orders = [];
+      }
+      _sort(column, this.condition);
+      this.initTable();
+    },
+    filter(filters) {
+      _filter(filters, this.condition);
+      this.initTable();
+    },
+    headerDragend(newWidth,oldWidth,column,event){
+      let finalWidth = newWidth;
+      if(column.minWidth>finalWidth){
+        finalWidth = column.minWidth;
+      }
+      column.width = finalWidth;
+      column.realWidth = finalWidth;
+    },
+    open() {
+      this.$refs.searchBar.open();
+    }
+  },
   }
 </script>
 
 <style scoped>
-  .operate-button > div {
-    display: inline-block;
-    margin-left: 10px;
-  }
+.operate-button > div {
+  display: inline-block;
+  margin-left: 10px;
+}
 
-  .request-method {
-    padding: 0 5px;
-    color: #1E90FF;
-  }
+.request-method {
+  padding: 0 5px;
+  color: #1E90FF;
+}
 
-  .api-el-tag {
-    color: white;
-  }
+.api-el-tag {
+  color: white;
+}
 
-  .search-input {
-    float: right;
-    width: 300px;
-    margin-right: 10px;
-  }
+.search-input {
+  float: right;
+  width: 300px;
+  margin-right: 10px;
+}
 
-  .el-tag {
-    margin-left: 10px;
-  }
+.el-tag {
+  margin-left: 10px;
+}
 
-  .ms-select-all >>> th:first-child {
-    margin-top: 20px;
-  }
+.ms-select-all >>> th:first-child {
+  margin-top: 20px;
+}
 
-  .ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
-    top: -2px;
-  }
+.ms-select-all >>> th:nth-child(2) .el-icon-arrow-down {
+  top: -2px;
+}
 
 </style>
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModule.vue b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
index 14cdfdb43f..f5b4248ee4 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModule.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModule.vue
@@ -126,6 +126,7 @@
               buildNodePath(node, {path: ''}, moduleOptions);
             });
             this.$emit('setModuleOptions', moduleOptions);
+            this.$emit('setNodeTree', this.data);
             if (this.$refs.nodeTree) {
               this.$refs.nodeTree.filter(this.condition.filterText);
             }
diff --git a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
index be32a14310..404ad12629 100644
--- a/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
+++ b/frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
@@ -145,7 +145,7 @@ export default {
 }
 
 .filter-input {
-  width: 175px;
+  width: 174px;
   padding-left: 3px;
 }
 
diff --git a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
index 18f539452a..94177448ef 100644
--- a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading="isReloadData">
     <el-row>
       <el-col :span="21" style="padding-bottom: 20px">
         <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;margin: 20px">
@@ -28,7 +28,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item :label="$t('api_test.request.sql.dataSource')" prop="dataSourceId" style="margin-left: 10px">
-                  <el-select v-model="request.dataSourceId" size="small">
+                  <el-select v-model="request.dataSourceId" size="small" @change="reload">
                     <el-option v-for="(item, index) in databaseConfigsOptions" :key="index" :value="item.id" :label="item.name"/>
                   </el-select>
                 </el-form-item>
@@ -143,7 +143,7 @@
         activeName: "variables",
         rules: {
           environmentId: [{required: true, message: this.$t('api_test.definition.request.run_env'), trigger: 'change'}],
-          dataSourceId: [{required: true, message: this.$t('api_test.request.sql.dataSource'), trigger: 'change'}],
+          dataSourceId: [{required: true, message: this.$t('api_test.request.sql.dataSource'), trigger: 'blur'}],
         },
       }
     },
diff --git a/frontend/src/business/components/api/definition/components/response/ResponseResult.vue b/frontend/src/business/components/api/definition/components/response/ResponseResult.vue
index 39e6c7fb40..09eb403717 100644
--- a/frontend/src/business/components/api/definition/components/response/ResponseResult.vue
+++ b/frontend/src/business/components/api/definition/components/response/ResponseResult.vue
@@ -63,23 +63,23 @@
 </template>
 
 <script>
-  import MsAssertionResults from "./AssertionResults";
-  import MsCodeEdit from "../MsCodeEdit";
-  import MsDropdown from "../../../../common/components/MsDropdown";
-  import {BODY_FORMAT} from "../../model/ApiTestModel";
-  import MsSqlResultTable from "./SqlResultTable";
+import MsAssertionResults from "./AssertionResults";
+import MsCodeEdit from "../MsCodeEdit";
+import MsDropdown from "../../../../common/components/MsDropdown";
+import {BODY_FORMAT} from "../../model/ApiTestModel";
+import MsSqlResultTable from "./SqlResultTable";
 
-  export default {
-    name: "MsResponseResult",
+export default {
+  name: "MsResponseResult",
 
-    components: {
-      MsDropdown,
-      MsCodeEdit,
-      MsAssertionResults,
-      MsSqlResultTable
-    },
+  components: {
+    MsDropdown,
+    MsCodeEdit,
+    MsAssertionResults,
+    MsSqlResultTable
+  },
 
-    props: {
+  props: {
       response: Object,
       currentProtocol: String,
     },
@@ -107,7 +107,7 @@
         this.mode = mode;
       },
       setBodyType() {
-        if (!this.response.responseResult.headers) {
+        if (!this.response.responseResult || !this.response.responseResult.headers) {
           return;
         }
         if (this.response.responseResult.headers.indexOf("Content-Type: application/json") > 0) {
diff --git a/frontend/src/business/components/api/definition/model/ApiTestModel.js b/frontend/src/business/components/api/definition/model/ApiTestModel.js
index 8136994191..c551d5f707 100644
--- a/frontend/src/business/components/api/definition/model/ApiTestModel.js
+++ b/frontend/src/business/components/api/definition/model/ApiTestModel.js
@@ -1,5 +1,6 @@
 import {
   Arguments,
+  ConstantTimer as JMXConstantTimer,
   CookieManager,
   DNSCacheManager,
   DubboSample,
@@ -10,6 +11,7 @@ import {
   HTTPSamplerArguments,
   HTTPsamplerFiles,
   HTTPSamplerProxy,
+  IfController as JMXIfController,
   JDBCDataSource,
   JDBCSampler,
   JSONPathAssertion,
@@ -20,12 +22,11 @@ import {
   ResponseCodeAssertion,
   ResponseDataAssertion,
   ResponseHeadersAssertion,
+  TCPSampler,
   TestElement,
   TestPlan,
   ThreadGroup,
   XPath2Extractor,
-  IfController as JMXIfController,
-  ConstantTimer as JMXConstantTimer, TCPSampler,
 } from "./JMX";
 import Mock from "mockjs";
 import {funcFilters} from "@/common/js/func-filter";
@@ -807,12 +808,12 @@ export class AssertionJSR223 extends AssertionType {
 
     this.name = undefined;
     this.script = undefined;
-    this.language = "beanshell";
+    this.scriptLanguage = "beanshell";
     this.set(options);
   }
 
   isValid() {
-    return !!this.script && !!this.language;
+    return !!this.script && !!this.scriptLanguage;
   }
 }
 
diff --git a/frontend/src/business/components/api/report/ApiReportList.vue b/frontend/src/business/components/api/report/ApiReportList.vue
index 14636660fd..743e00c628 100644
--- a/frontend/src/business/components/api/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/report/ApiReportList.vue
@@ -63,12 +63,12 @@ import MsTableHeader from "../../common/components/MsTableHeader";
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsApiReportStatus from "./ApiReportStatus";
-import {_filter, _sort} from "@/common/js/utils";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import ReportTriggerModeItem from "../../common/tableItem/ReportTriggerModeItem";
 import {REPORT_CONFIGS} from "../../common/components/search/search-components";
 import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
 import ShowMoreBtn from "../../track/case/components/ShowMoreBtn";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   components: {
diff --git a/frontend/src/business/components/api/test/ApiTestList.vue b/frontend/src/business/components/api/test/ApiTestList.vue
index 941b67b0aa..d9f6231f5b 100644
--- a/frontend/src/business/components/api/test/ApiTestList.vue
+++ b/frontend/src/business/components/api/test/ApiTestList.vue
@@ -61,31 +61,31 @@
 </template>
 
 <script>
-  import OneClickOperation from './OneClickOperation';
-  import MsTablePagination from "../../common/pagination/TablePagination";
-  import MsTableHeader from "../../common/components/MsTableHeader";
-  import MsTableOperator from "../../common/components/MsTableOperator";
-  import MsContainer from "../../common/components/MsContainer";
-  import MsMainContainer from "../../common/components/MsMainContainer";
-  import MsApiTestStatus from "./ApiTestStatus";
-  import MsTableOperators from "../../common/components/MsTableOperators";
-  import {_filter, _sort} from "@/common/js/utils";
-  import {TEST_CONFIGS} from "../../common/components/search/search-components";
-  import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
-  import ApiCopyDialog from "./components/ApiCopyDialog";
-  import MsUpgrade from "./Upgrade";
+import OneClickOperation from './OneClickOperation';
+import MsTablePagination from "../../common/pagination/TablePagination";
+import MsTableHeader from "../../common/components/MsTableHeader";
+import MsTableOperator from "../../common/components/MsTableOperator";
+import MsContainer from "../../common/components/MsContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
+import MsApiTestStatus from "./ApiTestStatus";
+import MsTableOperators from "../../common/components/MsTableOperators";
+import {TEST_CONFIGS} from "../../common/components/search/search-components";
+import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
+import ApiCopyDialog from "./components/ApiCopyDialog";
+import MsUpgrade from "./Upgrade";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
-  export default {
-    components: {
-      ApiCopyDialog,
-      OneClickOperation,
-      MsTableOperators,
-      MsApiTestStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator, MsUpgrade
-    },
-    data() {
-      return {
-        result: {},
-        condition: {
+export default {
+  components: {
+    ApiCopyDialog,
+    OneClickOperation,
+    MsTableOperators,
+    MsApiTestStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator, MsUpgrade
+  },
+  data() {
+    return {
+      result: {},
+      condition: {
           components: TEST_CONFIGS
         },
         projectId: null,
diff --git a/frontend/src/business/components/api/test/Upgrade.vue b/frontend/src/business/components/api/test/Upgrade.vue
index 51149c0843..0c3b568be8 100644
--- a/frontend/src/business/components/api/test/Upgrade.vue
+++ b/frontend/src/business/components/api/test/Upgrade.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="选则模块"
+    :title="$t('commons.module.select_module')"
     :visible.sync="oneClickOperationVisible"
     width="600px"
     left
@@ -11,7 +11,7 @@
     <ms-node-tree
       v-loading="result.loading"
       :tree-nodes="data"
-      allLabel="默认模块"
+      :allLabel="$t('commons.module.default_module')"
       @add="add"
       :type="'edit'"
       @edit="edit"
diff --git a/frontend/src/business/components/api/test/components/jar/JarConfig.vue b/frontend/src/business/components/api/test/components/jar/JarConfig.vue
index 8539c36d33..a755a8463d 100644
--- a/frontend/src/business/components/api/test/components/jar/JarConfig.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarConfig.vue
@@ -2,28 +2,32 @@
   <el-dialog width="50%" :close-on-click-modal="false" :title="$t('api_test.jar_config.title')" :visible.sync="visible" class="jar-import" @close="close">
     <div v-loading="result.loading">
       <ms-jar-config-from :config="currentConfig" :callback="saveConfig" ref="jarConfigFrom" :read-only="isReadOnly"/>
-      <ms-jar-search-bar @refresh="getJarConfigs" :table-data="configs" ref="jarSearchBar"/>
+      <ms-jar-search-bar v-if="(!isSearchBarQuery && configs.length > 0) || isSearchBarQuery" :condition="condition"
+                         @search="getJarConfigs" :table-data="configs" ref="jarSearchBar"/>
       <ms-jar-config-list @refresh="getJarConfigs" v-if="configs.length > 0" @rowSelect="rowSelect" :table-data="configs" ref="jarConfigList"/>
     </div>
   </el-dialog>
 </template>
 
 <script>
-    import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-    import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
-    import MsJarConfigList from "./JarConfigList";
-    import MsJarConfigFrom from "./JarConfigFrom";
-    import MsJarSearchBar from "./JarSearchBar";
-    export default {
-      name: "MsJarConfig",
-      components: {MsJarConfigFrom, MsJarSearchBar, MsJarConfigList, MsDialogFooter},
-      data() {
-        return {
-          visible: false,
-          result: {},
-          currentConfig: {},
-          configs: []
-        }
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
+import MsJarConfigList from "./JarConfigList";
+import MsJarConfigFrom from "./JarConfigFrom";
+import MsJarSearchBar from "./JarSearchBar";
+
+export default {
+  name: "MsJarConfig",
+  components: {MsJarConfigFrom, MsJarSearchBar, MsJarConfigList, MsDialogFooter},
+  data() {
+    return {
+      visible: false,
+      result: {},
+      currentConfig: {},
+      configs: [],
+      condition: {},
+      isSearchBarQuery: false
+    }
       },
       props: {
         isReadOnly: {
@@ -34,6 +38,8 @@
       methods: {
         open() {
           this.visible = true;
+          this.condition = {};
+
           this.getJarConfigs();
           listenGoBack(this.close);
         },
@@ -54,11 +60,14 @@
             this.getJarConfigs();
           });
         },
-        getJarConfigs(condition) {
-            this.result = this.$post("/jar/list", {name: condition}, response => {
-              this.configs = response.data;
-              this.currentConfig = {};
-            });
+        getJarConfigs(isSearchBarQuery) {
+          if (isSearchBarQuery) {
+            this.isSearchBarQuery = isSearchBarQuery;
+          }
+          this.result = this.$post("/jar/list", this.condition, response => {
+            this.configs = response.data;
+            this.currentConfig = {};
+          });
         },
         rowSelect(config) {
           this.currentConfig = config;
@@ -74,4 +83,9 @@
 
 <style scoped>
 
+   .jar-config-list {
+     max-height: 600px;
+     overflow: scroll;
+   }
+
 </style>
diff --git a/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue b/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue
index 1b2072e1a9..53125bcf17 100644
--- a/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue
+++ b/frontend/src/business/components/api/test/components/jar/JarSearchBar.vue
@@ -1,10 +1,10 @@
 <template>
   <el-input class="jar-header-search"
-            v-model="searchCondition"
+            v-model="condition.name"
             type="text"
             size="small"
             prefix-icon="el-icon-search"
-            @keyup.enter.native="search"
+            @blur="search"
             :placeholder="$t('project.search_by_name_jar')" clearable/>
 </template>
 
@@ -19,19 +19,9 @@
           },
         },
       },
-      data() {
-        return {
-          searchCondition: this.condition
-        };
-      },
-      watch: {
-        inputCondition(value) {
-          this.searchCondition = value;
-        }
-      },
       methods: {
         search() {
-          this.$emit('refresh', this.searchCondition);
+          this.$emit('search', true);
         }
       },
     }
diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js
index 8dec5ba03d..7a3a0b3f5f 100644
--- a/frontend/src/business/components/common/components/search/search-components.js
+++ b/frontend/src/business/components/common/components/search/search-components.js
@@ -172,6 +172,22 @@ export const API_CASE_RESULT = {
   }
 }
 
+export const API_SCENARIO_RESULT = {
+  key: "status",
+  name: 'MsTableSearchSelect',
+  label: 'test_track.plan_view.execute_result',
+  operator: {
+    options: [OPERATORS.IN, OPERATORS.NOT_IN]
+  },
+  options: [
+    {value: 'Success', label: 'api_test.automation.success'},
+    {value: 'Fail', label: 'api_test.automation.fail'}
+  ],
+  props: { // 尾部控件的props，一般为element ui控件的props
+    multiple: true
+  }
+}
+
 export const API_METHOD = {
   key: "method",
   name: 'MsTableSearchSelect',
@@ -442,4 +458,6 @@ export const API_DEFINITION_CONFIGS = [NAME, API_METHOD, API_PATH, API_STATUS, A
 
 export const API_CASE_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS, API_CASE_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR];
 
+export const API_SCENARIO_CONFIGS = [NAME, API_CASE_PRIORITY, API_TAGS, API_SCENARIO_RESULT, UPDATE_TIME, CREATE_TIME, CREATOR];
+
 export const TEST_PLAN_REPORT_CONFIGS = [NAME, TEST_PLAN_NAME,CREATOR, CREATE_TIME, TEST_PLAN_TRIGGER_MODE, TEST_PLAN_STATUS];
diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue
index 35bdad37be..7a88e5947c 100644
--- a/frontend/src/business/components/common/head/HeaderOrgWs.vue
+++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue
@@ -2,25 +2,41 @@
   <el-menu :unique-opened="true" mode="horizontal" router
            class="header-user-menu align-right"
            background-color="#2c2a48"
+           active-text-color="#fff"
+           default-active="1"
            text-color="#fff">
-    <el-submenu index="1" popper-class="submenu"
+    <el-menu-item index="1" v-show="false">Placeholder</el-menu-item>
+    <el-submenu index="1" popper-class="org-ws-submenu"
                 v-roles="['org_admin', 'test_manager', 'test_user', 'test_viewer']">
-      <template v-slot:title>{{$t('commons.organization')}}: {{currentOrganizationName}}</template>
-      <label v-for="(item,index) in organizationList" :key="index">
-        <el-menu-item @click="changeOrg(item)">{{item.name}}
+      <template v-slot:title>{{ $t('commons.organization') }}: {{ currentOrganizationName }}</template>
+      <el-input :placeholder="$t('project.search_by_name')"
+                prefix-icon="el-icon-search"
+                v-model="searchOrg"
+                clearable
+                class="search-input"
+                size="small"/>
+      <div class="org-ws-menu">
+        <el-menu-item @click="changeOrg(item)" v-for="(item,index) in organizationList" :key="index">
+          {{ item.name }}
           <i class="el-icon-check"
              v-if="item.id === currentUserInfo.lastOrganizationId"></i>
         </el-menu-item>
-      </label>
+      </div>
     </el-submenu>
     <el-submenu index="2" popper-class="submenu" v-roles="['test_manager', 'test_user', 'test_viewer']">
-      <template v-slot:title>{{$t('commons.workspace')}}: {{currentWorkspaceName}}</template>
-      <label v-for="(item,index) in workspaceList" :key="index">
-        <el-menu-item @click="changeWs(item)">
-          {{item.name}}
+      <template v-slot:title>{{ $t('commons.workspace') }}: {{ currentWorkspaceName }}</template>
+      <el-input :placeholder="$t('project.search_by_name')"
+                prefix-icon="el-icon-search"
+                v-model="searchWs"
+                clearable
+                class="search-input"
+                size="small"/>
+      <div class="org-ws-menu">
+        <el-menu-item @click="changeWs(item)" v-for="(item,index) in workspaceList" :key="index">
+          {{ item.name }}
           <i class="el-icon-check" v-if="item.id === currentUserInfo.lastWorkspaceId"></i>
         </el-menu-item>
-      </label>
+      </div>
     </el-submenu>
   </el-menu>
 </template>
@@ -34,107 +50,170 @@ import {
   ROLE_TEST_VIEWER,
   WORKSPACE_ID
 } from '../../../../common/js/constants';
-  import {getCurrentUser, hasRoles, saveLocalStorage} from "../../../../common/js/utils";
+import {getCurrentUser, hasRoles, saveLocalStorage} from "../../../../common/js/utils";
 
-  export default {
-    name: "MsHeaderOrgWs",
-    created() {
-      this.initMenuData();
-      this.getCurrentUserInfo();
-    },
-    data() {
-      return {
-        organizationList: [
-          {name: this.$t('organization.none')},
-        ],
-        workspaceList: [
-          {name: this.$t('workspace.none')},
-        ],
-        currentUserInfo: {},
-        currentUserId: getCurrentUser().id,
-        workspaceIds: [],
-        currentOrganizationName: '',
-        currentWorkspaceName: ''
-      }
-    },
-    computed: {
-      currentUser: () => {
-        return getCurrentUser();
-      }
-    },
-    methods: {
-      initMenuData() {
-        if (hasRoles(ROLE_ORG_ADMIN, ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
-          this.$get("/organization/list/userorg/" + encodeURIComponent(this.currentUserId), response => {
-            let data = response.data;
-            this.organizationList = data;
-            let org = data.filter(r => r.id === this.currentUser.lastOrganizationId);
-            if (org.length > 0) {
-              this.currentOrganizationName = org[0].name;
-            }
-          });
-        }
-        if (hasRoles(ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
-          if (!this.currentUser.lastOrganizationId) {
-            return false;
-          }
-          this.$get("/workspace/list/orgworkspace/", response => {
-            let data = response.data;
-            if (data.length === 0) {
-              this.workspaceList = [{name: this.$t('workspace.none')}]
-            } else {
-              this.workspaceList = data;
-              let workspace = data.filter(r => r.id === this.currentUser.lastWorkspaceId);
-              if (workspace.length > 0) {
-                this.currentWorkspaceName = workspace[0].name;
-                localStorage.setItem(WORKSPACE_ID, workspace[0].id);
-              }
-            }
-          })
-        }
-      },
-      getCurrentUserInfo() {
-        this.$get("/user/info/" + encodeURIComponent(this.currentUserId), response => {
-          this.currentUserInfo = response.data;
-        })
-      },
-      changeOrg(data) {
-        let orgId = data.id;
-        if (!orgId) {
-          return false;
-        }
-        this.$post("/user/switch/source/org/" + orgId, {}, response => {
-          saveLocalStorage(response);
-          if (response.data.workspaceId) {
-            localStorage.setItem("workspace_id", response.data.workspaceId);
-          }
-          localStorage.removeItem(PROJECT_ID);
-          this.$router.push('/').then(() => {
-            window.location.reload();
-          }).catch(err => err);
-        });
-      },
-      changeWs(data) {
-        let workspaceId = data.id;
-        if (!workspaceId) {
-          return false;
-        }
-        this.$post("/user/switch/source/ws/" + workspaceId, {}, response => {
-          saveLocalStorage(response);
-          localStorage.setItem("workspace_id", workspaceId);
-          localStorage.removeItem(PROJECT_ID);
-          this.$router.push('/').then(() => {
-            window.location.reload();
-          }).catch(err => err);
-        })
-      }
+export default {
+  name: "MsHeaderOrgWs",
+  created() {
+    this.initMenuData();
+    this.getCurrentUserInfo();
+  },
+  data() {
+    return {
+      organizationList: [
+        {name: this.$t('organization.none')},
+      ],
+      workspaceList: [
+        {name: this.$t('workspace.none')},
+      ],
+      currentUserInfo: {},
+      currentUserId: getCurrentUser().id,
+      workspaceIds: [],
+      currentOrganizationName: '',
+      currentWorkspaceName: '',
+      searchOrg: '',
+      searchWs: '',
+      orgListCopy: [{name: this.$t('organization.none')}],
+      wsListCopy: [{name: this.$t('workspace.none')}]
     }
+  },
+  computed: {
+    currentUser: () => {
+      return getCurrentUser();
+    }
+  },
+  watch: {
+    searchOrg(val) {
+      this.query('org', val);
+    },
+    searchWs(val) {
+      this.query('ws', val);
+    }
+  },
+  methods: {
+    initMenuData() {
+      if (hasRoles(ROLE_ORG_ADMIN, ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+        this.$get("/organization/list/userorg/" + encodeURIComponent(this.currentUserId), response => {
+          let data = response.data;
+          this.organizationList = data;
+          this.orgListCopy = data;
+          let org = data.filter(r => r.id === this.currentUser.lastOrganizationId);
+          if (org.length > 0) {
+            this.currentOrganizationName = org[0].name;
+          }
+        });
+      }
+      if (hasRoles(ROLE_TEST_VIEWER, ROLE_TEST_USER, ROLE_TEST_MANAGER)) {
+        if (!this.currentUser.lastOrganizationId) {
+          return false;
+        }
+        this.$get("/workspace/list/orgworkspace/", response => {
+          let data = response.data;
+          if (data.length === 0) {
+            this.workspaceList = [{name: this.$t('workspace.none')}]
+          } else {
+            this.workspaceList = data;
+            this.wsListCopy = data;
+            let workspace = data.filter(r => r.id === this.currentUser.lastWorkspaceId);
+            if (workspace.length > 0) {
+              this.currentWorkspaceName = workspace[0].name;
+              localStorage.setItem(WORKSPACE_ID, workspace[0].id);
+            }
+          }
+        })
+      }
+    },
+    getCurrentUserInfo() {
+      this.$get("/user/info/" + encodeURIComponent(this.currentUserId), response => {
+        this.currentUserInfo = response.data;
+      })
+    },
+    changeOrg(data) {
+      let orgId = data.id;
+      if (!orgId) {
+        return false;
+      }
+      this.$post("/user/switch/source/org/" + orgId, {}, response => {
+        saveLocalStorage(response);
+        if (response.data.workspaceId) {
+          localStorage.setItem("workspace_id", response.data.workspaceId);
+        }
+        localStorage.removeItem(PROJECT_ID);
+        this.$router.push('/').then(() => {
+          window.location.reload();
+        }).catch(err => err);
+      });
+    },
+    changeWs(data) {
+      let workspaceId = data.id;
+      if (!workspaceId) {
+        return false;
+      }
+      this.$post("/user/switch/source/ws/" + workspaceId, {}, response => {
+        saveLocalStorage(response);
+        localStorage.setItem("workspace_id", workspaceId);
+        localStorage.removeItem(PROJECT_ID);
+        this.$router.push('/').then(() => {
+          window.location.reload();
+        }).catch(err => err);
+      })
+    },
+    query(sign, queryString) {
+      if (sign === 'org') {
+        this.organizationList = queryString ? this.orgListCopy.filter(this.createFilter(queryString)) : this.orgListCopy;
+      }
+      if (sign === 'ws') {
+        this.workspaceList = queryString ? this.wsListCopy.filter(this.createFilter(queryString)) : this.wsListCopy;
+      }
+    },
+    createFilter(queryString) {
+      return item => {
+        return (item.name.toLowerCase().indexOf(queryString.toLowerCase()) !== -1);
+      };
+    },
   }
+}
 </script>
 
 <style scoped>
-  .el-icon-check {
-    color: #44b349;
-    margin-left: 10px;
-  }
+.el-icon-check {
+  color: #44b349;
+  margin-left: 10px;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+  position: fixed;
+}
+
+::-webkit-scrollbar-thumb {
+  border-radius: 1em;
+  background-color: #595591;
+  position: fixed;
+}
+
+::-webkit-scrollbar-track {
+  border-radius: 1em;
+  background-color: transparent;
+  position: fixed;
+}
+
+.org-ws-menu {
+  height: 180px;
+  overflow: auto;
+}
+
+.search-input {
+  padding: 0;
+  margin-top: -4px;
+  background-color: #595591;
+}
+
+.search-input >>> .el-input__inner {
+  border-radius: 0;
+  background-color: #2d2a49;
+  color: #d2ced8;
+  border-color: #b4aebe;
+}
 </style>
diff --git a/frontend/src/business/components/common/json-schema/schema/editor/main.vue b/frontend/src/business/components/common/json-schema/schema/editor/main.vue
index 0f613f555c..68d79571bf 100644
--- a/frontend/src/business/components/common/json-schema/schema/editor/main.vue
+++ b/frontend/src/business/components/common/json-schema/schema/editor/main.vue
@@ -3,8 +3,8 @@
     <el-row class="row" :gutter="20">
       <el-col :span="8" class="ms-col-name">
         <div :style="{marginLeft:`${10*deep}px`}" class="ms-col-name-c"/>
-        <span v-if="pickValue.type==='object'" :class="hidden? 'el-tree-node__expand-icon el-icon-caret-right':
-            'expanded el-tree-node__expand-icon el-icon-caret-right'" @click="hidden = !hidden"/>
+        <span v-if="pickValue.type==='object'" :class="hidden? 'el-icon-caret-left ms-transform':
+            'el-icon-caret-bottom'" @click="hidden = !hidden"/>
         <span v-else style="width:10px;display:inline-block"></span>
         <input class="el-input el-input__inner" style="height: 32px" :disabled="disabled || root" :value="pickKey" @blur="onInputName" size="small"/>
 
@@ -393,4 +393,8 @@
     border-left: 4px solid #783887;
     margin: 0px 0px 10px;
   }
+  .ms-transform {
+    transform: rotate(-180deg);
+    transition: 0ms;
+  }
 </style>
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 1257af30cd..13a512d91e 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -293,12 +293,12 @@ export default {
       };
       this.result = this.$request(config).then(response => {
         const content = response.data;
-        const blob = new Blob([content]);
+        const blob = new Blob([content], {type: "application/octet-stream"});
         if ("download" in document.createElement("a")) {
           // 非IE下载
           //  chrome/firefox
           let aTag = document.createElement('a');
-          aTag.download = this.reportId + ".jtl";
+          aTag.download = this.reportId + ".zip";
           aTag.href = URL.createObjectURL(blob);
           aTag.click();
           URL.revokeObjectURL(aTag.href)
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
index 8034e345ea..8e46a0708d 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
@@ -93,13 +93,15 @@ import MsTablePagination from "../../common/pagination/TablePagination";
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsPerformanceReportStatus from "./PerformanceReportStatus";
-import {_filter, _sort, getCurrentProjectID} from "../../../../common/js/utils";
+import {getCurrentProjectID} from "../../../../common/js/utils";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import ReportTriggerModeItem from "../../common/tableItem/ReportTriggerModeItem";
 import {REPORT_CONFIGS} from "../../common/components/search/search-components";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
 import ShowMoreBtn from "../../track/case/components/ShowMoreBtn";
+import {_filter, _sort} from "@/common/js/tableUtils";
+
 
 export default {
   name: "PerformanceTestReport",
diff --git a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
index ee34766b45..234783b9d2 100644
--- a/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue
@@ -14,11 +14,11 @@
             <el-form :inline="true">
               <el-form-item :label="$t('load_test.thread_num')">
                 <el-input-number
-                  :disabled="true"
-                  :placeholder="$t('load_test.input_thread_num')"
-                  v-model="threadGroup.threadNumber"
-                  :min="1"
-                  size="mini"/>
+                    :disabled="true"
+                    :placeholder="$t('load_test.input_thread_num')"
+                    v-model="threadGroup.threadNumber"
+                    :min="1"
+                    size="mini"/>
               </el-form-item>
               <br>
               <el-form-item>
@@ -31,72 +31,72 @@
               <div v-if="threadGroup.threadType === 'DURATION'">
                 <el-form-item :label="$t('load_test.duration')">
                   <el-input-number
-                    :disabled="true"
-                    v-model="threadGroup.duration"
-                    :min="1"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      v-model="threadGroup.duration"
+                      :min="1"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
                   &nbsp;
                   <el-input-number
-                    :disabled="true "
-                    v-model="threadGroup.rpsLimit"
-                    @change="calculateChart(threadGroup)"
-                    :min="1"
-                    size="mini"/>
+                      :disabled="true "
+                      v-model="threadGroup.rpsLimit"
+                      @change="calculateChart(threadGroup)"
+                      :min="1"
+                      size="mini"/>
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.ramp_up_time_within')">
                   <el-input-number
-                    :disabled="true"
-                    :min="1"
-                    :max="threadGroup.duration"
-                    v-model="threadGroup.rampUpTime"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      :max="threadGroup.duration"
+                      v-model="threadGroup.rampUpTime"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                 </el-form-item>
                 <el-form-item :label="$t('load_test.ramp_up_time_minutes')">
                   <el-input-number
-                    :disabled="true"
-                    :min="1"
-                    :max="Math.min(threadGroup.threadNumber, threadGroup.rampUpTime)"
-                    v-model="threadGroup.step"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      :max="Math.min(threadGroup.threadNumber, threadGroup.rampUpTime)"
+                      v-model="threadGroup.step"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                 </el-form-item>
                 <el-form-item :label="$t('load_test.ramp_up_time_times')"/>
               </div>
               <div v-if="threadGroup.threadType === 'ITERATION'">
                 <el-form-item :label="$t('load_test.iterate_num')">
                   <el-input-number
-                    :disabled="true"
-                    v-model="threadGroup.iterateNum"
-                    :min="1"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      v-model="threadGroup.iterateNum"
+                      :min="1"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.rps_limit')">
                   <el-switch v-model="threadGroup.rpsLimitEnable" @change="calculateTotalChart()"/>
                   &nbsp;
                   <el-input-number
-                    :disabled="true || !threadGroup.rpsLimitEnable"
-                    v-model="threadGroup.rpsLimit"
-                    @change="calculateChart(threadGroup)"
-                    :min="1"
-                    size="mini"/>
+                      :disabled="true || !threadGroup.rpsLimitEnable"
+                      v-model="threadGroup.rpsLimit"
+                      @change="calculateChart(threadGroup)"
+                      :min="1"
+                      size="mini"/>
                 </el-form-item>
                 <br>
                 <el-form-item :label="$t('load_test.ramp_up_time_within')">
                   <el-input-number
-                    :disabled="true"
-                    :min="1"
-                    v-model="threadGroup.iterateRampUp"
-                    @change="calculateChart(threadGroup)"
-                    size="mini"/>
+                      :disabled="true"
+                      :min="1"
+                      v-model="threadGroup.iterateRampUp"
+                      @change="calculateChart(threadGroup)"
+                      size="mini"/>
                 </el-form-item>
                 <el-form-item :label="$t('load_test.ramp_up_time_seconds')"/>
               </div>
@@ -129,11 +129,11 @@ const ITERATE_RAMP_UP = "iterateRampUpTime";
 
 const hexToRgba = function (hex, opacity) {
   return 'rgba(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5)) + ','
-    + parseInt('0x' + hex.slice(5, 7)) + ',' + opacity + ')';
+      + parseInt('0x' + hex.slice(5, 7)) + ',' + opacity + ')';
 }
 const hexToRgb = function (hex) {
   return 'rgb(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5))
-    + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
+      + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
 }
 
 export default {
@@ -469,11 +469,12 @@ export default {
     },
   },
   watch: {
-    'report.testId': {
+    report: {
       handler() {
         this.getJmxContent();
       },
-    }
+      deep: true
+    },
   }
 }
 </script>
diff --git a/frontend/src/business/components/performance/test/PerformanceTestList.vue b/frontend/src/business/components/performance/test/PerformanceTestList.vue
index 0b3af35206..5090c4a609 100644
--- a/frontend/src/business/components/performance/test/PerformanceTestList.vue
+++ b/frontend/src/business/components/performance/test/PerformanceTestList.vue
@@ -89,11 +89,12 @@ import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsPerformanceTestStatus from "./PerformanceTestStatus";
 import MsTableOperators from "../../common/components/MsTableOperators";
-import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
+import {getCurrentProjectID} from "@/common/js/utils";
 import MsTableHeader from "../../common/components/MsTableHeader";
 import {TEST_CONFIGS} from "../../common/components/search/search-components";
 import {LIST_CHANGE, PerformanceEvent} from "@/business/components/common/head/ListEvent";
 import {WORKSPACE_ID} from "@/common/js/constants";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   components: {
diff --git a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
index 023fa1bad2..6c6348bc68 100644
--- a/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
@@ -128,7 +128,7 @@ export default {
   components: {MsTableOperatorButton},
   data() {
     return {
-      timeout: 2000,
+      timeout: 60000,
       responseTimeout: null,
       statusCode: [],
       domains: [],
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 44dfbfb158..f26c83f681 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -10,8 +10,9 @@
         <el-table-column prop="description" :label="$t('commons.description')"/>
         <el-table-column :label="$t('commons.member')">
           <template v-slot:default="scope">
-            <el-button type="text" class="member-size" @click="cellClick(scope.row)">{{scope.row.memberSize}}
-            </el-button>
+            <el-link type="primary" class="member-size" @click="cellClick(scope.row)">
+              {{ scope.row.memberSize }}
+            </el-link>
           </template>
         </el-table-column>
         <el-table-column :label="$t('commons.operating')">
@@ -506,7 +507,6 @@
 
   .member-size {
     text-decoration: underline;
-    cursor: pointer;
   }
 
   .select-width {
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 79ce46bc13..6bbf92a0f3 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -114,9 +114,7 @@ export default {
           }
         ],
         phone: [
-          {required: true, message: this.$t('user.input_phone'), trigger: 'blur'},
           {
-            required: false,
             pattern: PHONE_REGEX,
             message: this.$t('member.mobile_number_format_is_incorrect'),
             trigger: 'blur'
diff --git a/frontend/src/business/components/settings/project/MsProject.vue b/frontend/src/business/components/settings/project/MsProject.vue
index ac1bc85cc5..1f111a35cc 100644
--- a/frontend/src/business/components/settings/project/MsProject.vue
+++ b/frontend/src/business/components/settings/project/MsProject.vue
@@ -92,33 +92,35 @@
 </template>
 
 <script>
-  import MsCreateBox from "../CreateBox";
-  import {Message} from "element-ui";
-  import MsTablePagination from "../../common/pagination/TablePagination";
-  import MsTableHeader from "../../common/components/MsTableHeader";
-  import MsTableOperator from "../../common/components/MsTableOperator";
-  import MsDialogFooter from "../../common/components/MsDialogFooter";
-  import {_sort, getCurrentProjectID, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
-  import MsContainer from "../../common/components/MsContainer";
-  import MsMainContainer from "../../common/components/MsMainContainer";
-  import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
-  import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
-  import ApiEnvironmentConfig from "../../api/test/components/ApiEnvironmentConfig";
-  import TemplateComponent from "../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
-  import {PROJECT_ID} from "@/common/js/constants";
-  import MsJarConfig from "../../api/test/components/jar/JarConfig";
-  import MsTableButton from "../../common/components/MsTableButton";
-  export default {
-    name: "MsProject",
-    components: {
-      MsTableButton,
-      MsJarConfig,
-      TemplateComponent,
-      ApiEnvironmentConfig,
-      MsTableOperatorButton,
-      MsDeleteConfirm,
-      MsMainContainer,
-      MsContainer, MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader, MsDialogFooter
+import MsCreateBox from "../CreateBox";
+import {Message} from "element-ui";
+import MsTablePagination from "../../common/pagination/TablePagination";
+import MsTableHeader from "../../common/components/MsTableHeader";
+import MsTableOperator from "../../common/components/MsTableOperator";
+import MsDialogFooter from "../../common/components/MsDialogFooter";
+import {getCurrentProjectID, getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import MsContainer from "../../common/components/MsContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
+import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
+import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
+import ApiEnvironmentConfig from "../../api/test/components/ApiEnvironmentConfig";
+import TemplateComponent from "../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
+import {PROJECT_ID} from "@/common/js/constants";
+import MsJarConfig from "../../api/test/components/jar/JarConfig";
+import MsTableButton from "../../common/components/MsTableButton";
+import {_sort} from "@/common/js/tableUtils";
+
+export default {
+  name: "MsProject",
+  components: {
+    MsTableButton,
+    MsJarConfig,
+    TemplateComponent,
+    ApiEnvironmentConfig,
+    MsTableOperatorButton,
+    MsDeleteConfirm,
+    MsMainContainer,
+    MsContainer, MsTableOperator, MsCreateBox, MsTablePagination, MsTableHeader, MsDialogFooter
     },
     data() {
       return {
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index cbe63d7ee1..adf3841cb6 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -399,9 +399,7 @@ export default {
           }
         ],
         phone: [
-          {required: true, message: this.$t('user.input_phone'), trigger: 'blur'},
           {
-            required: true,
             pattern: PHONE_REGEX,
             message: this.$t('user.mobile_number_format_is_incorrect'),
             trigger: 'blur'
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index f63ddc8a7d..01457e1860 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -29,6 +29,7 @@
         @filter-change="filter"
         @select-all="handleSelectAll"
         @select="handleSelect"
+        @header-dragend="headerDragend"
         @cell-mouse-enter="showPopover"
         row-key="id"
         class="test-content adjust-table ms-select-all-fixed"
@@ -145,7 +146,7 @@
           </template>
         </el-table-column>
         <el-table-column fixed="right"
-          :label="$t('commons.operating')" min-width="150">
+                         :label="$t('commons.operating')" min-width="150">
           <template v-slot:default="scope">
             <ms-table-operator :is-tester-permission="true" @editClick="handleEdit(scope.row)"
                                @deleteClick="handleDelete(scope.row)">
@@ -186,7 +187,6 @@ import MethodTableItem from "../../common/tableItems/planview/MethodTableItem";
 import MsTableOperator from "../../../common/components/MsTableOperator";
 import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 import MsTableButton from "../../../common/components/MsTableButton";
-import {_filter, _sort} from "@/common/js/utils";
 import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-components";
 import ShowMoreBtn from "./ShowMoreBtn";
 import BatchEdit from "./BatchEdit";
@@ -197,7 +197,15 @@ import TestCaseDetail from "./TestCaseDetail";
 import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
 import {getCurrentProjectID} from "../../../../../common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
-import {_handleSelect, _handleSelectAll} from "../../../../../common/js/tableUtils";
+import {
+  _filter,
+  _handleSelect,
+  _handleSelectAll,
+  _sort,
+  getSelectDataCounts,
+  setUnSelectIds,
+  toggleAllSelection
+} from "@/common/js/tableUtils";
 import BatchMove from "./BatchMove";
 
 export default {
@@ -431,13 +439,14 @@ export default {
     },
     handleSelectAll(selection) {
       _handleSelectAll(this, selection, this.tableData, this.selectRows);
-      this.setUnSelectIds();
+      setUnSelectIds(this.tableData, this.condition, this.selectRows);
+      this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
     },
     handleSelect(selection, row) {
       _handleSelect(this, selection, row, this.selectRows);
-      this.setUnSelectIds();
+      setUnSelectIds(this.tableData, this.condition, this.selectRows);
+      this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
     },
-
     importTestCase() {
       if (!getCurrentProjectID()) {
         this.$warning(this.$t('commons.check_project_tip'));
@@ -544,23 +553,17 @@ export default {
     },
     isSelectDataAll(data) {
       this.condition.selectAll = data;
-      this.setUnSelectIds();
-      //如果已经全选，不需要再操作了
-      if (this.selectRows.size != this.tableData.length) {
-        this.$refs.table.toggleAllSelection(true);
-      }
+      setUnSelectIds(this.tableData, this.condition, this.selectRows);
+      this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
+      toggleAllSelection(this.$refs.table, this.tableData, this.selectRows);
     },
-    setUnSelectIds() {
-      let ids = Array.from(this.selectRows).map(o => o.id);
-      let allIDs = this.tableData.map(o => o.id);
-      this.condition.unSelectIds = allIDs.filter(function (val) {
-        return ids.indexOf(val) === -1
-      });
-      if (this.condition.selectAll) {
-        this.selectDataCounts = this.total - this.condition.unSelectIds.length;
-      } else {
-        this.selectDataCounts = this.selectRows.size;
+    headerDragend(newWidth,oldWidth,column,event){
+      let finalWidth = newWidth;
+      if(column.minWidth>finalWidth){
+        finalWidth = column.minWidth;
       }
+      column.width = finalWidth;
+      column.realWidth = finalWidth;
     },
     moveSave(param) {
       param.condition = this.condition;
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 80fa8678ba..f6cab53407 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -37,15 +37,15 @@
                 <plan-status-table-item :value="scope.row.status"/>
               </span>
               <el-dropdown-menu slot="dropdown" chang>
-                <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{id: scope.row.id, status: 'Prepare'}">
+                <el-dropdown-item :disabled="!isTestManagerOrTestUser" :command="{item: scope.row, status: 'Prepare'}">
                   {{ $t('test_track.plan.plan_status_prepare') }}
                 </el-dropdown-item>
                 <el-dropdown-item :disabled="!isTestManagerOrTestUser"
-                                  :command="{id: scope.row.id, status: 'Underway'}">
+                                  :command="{item: scope.row, status: 'Underway'}">
                   {{ $t('test_track.plan.plan_status_running') }}
                 </el-dropdown-item>
                 <el-dropdown-item :disabled="!isTestManagerOrTestUser"
-                                  :command="{id: scope.row.id, status: 'Completed'}">
+                                  :command="{item: scope.row, status: 'Completed'}">
                   {{ $t('test_track.plan.plan_status_completed') }}
                 </el-dropdown-item>
               </el-dropdown-menu>
@@ -158,7 +158,7 @@ import MsTableOperatorButton from "../../../common/components/MsTableOperatorBut
 import MsTableOperator from "../../../common/components/MsTableOperator";
 import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableItem";
 import PlanStageTableItem from "../../common/tableItems/plan/PlanStageTableItem";
-import {_filter, _sort, checkoutTestManagerOrTestUser} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import TestReportTemplateList from "../view/comonents/TestReportTemplateList";
 import TestCaseReportView from "../view/comonents/report/TestCaseReportView";
 import MsDeleteConfirm from "../../../common/components/MsDeleteConfirm";
@@ -166,6 +166,8 @@ import {TEST_PLAN_CONFIGS} from "../../../common/components/search/search-compon
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {getCurrentProjectID} from "../../../../../common/js/utils";
 import MsScheduleMaintain from "@/business/components/api/automation/schedule/ScheduleMaintain"
+import {_filter, _sort} from "@/common/js/tableUtils";
+
 
 export default {
   name: "TestPlanList",
@@ -255,20 +257,25 @@ export default {
       this.$emit('testPlanEdit', testPlan);
     },
     statusChange(param) {
+      console.log(this.tableData);
+      let oldStatus = param.item.status;
+      let newStatus = param.status;
+      param = param.item;
+      param.status = newStatus;
       this.$post('/test/plan/edit', param, () => {
         for (let i = 0; i < this.tableData.length; i++) {
           if (this.tableData[i].id == param.id) { //  手动修改当前状态后，前端结束时间先用当前时间，等刷新后变成后台数据（相等）
-            if (this.tableData[i].status !== "Completed" && param.status === "Completed") {
-              this.tableData[i].actualEndTime = new Date();
+            if (oldStatus !== "Completed" && newStatus === "Completed") {
+              this.tableData[i].actualEndTime = Date.now();
             } //  非完成->已完成，结束时间=null
-            else if (this.tableData[i].status !== "Underway" && param.status === "Underway") {
-              this.tableData[i].actualStartTime = new Date();
+            else if (oldStatus !== "Underway" && newStatus === "Underway") {
+              this.tableData[i].actualStartTime = Date.now();
               this.tableData[i].actualEndTime = "";
             } //  非进行中->进行中，结束时间=null
-            else if (this.tableData[i].status !== "Prepare" && param.status === "Prepare") {
+            else if (oldStatus !== "Prepare" && newStatus === "Prepare") {
               this.tableData[i].actualStartTime = this.tableData[i].actualEndTime = "";
             } //  非未开始->未开始，结束时间=null
-            this.tableData[i].status = param.status;
+            this.tableData[i].status = newStatus;
             break;
           }
         }
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index 29e90f71c3..0a271a9a83 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -132,13 +132,15 @@ import {API_METHOD_COLOUR, CASE_PRIORITY, RESULT_MAP} from "../../../../../api/d
 import {getCurrentProjectID} from "@/common/js/utils";
 import ApiListContainer from "../../../../../api/definition/components/list/ApiListContainer";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
-import {_filter, _sort, getBodyUploadFiles, getUUID} from "../../../../../../../common/js/utils";
+import {getBodyUploadFiles, getUUID} from "../../../../../../../common/js/utils";
 import TestPlanCaseListHeader from "./TestPlanCaseListHeader";
 import MsRun from "../../../../../api/definition/components/Run";
 import TestPlanApiCaseResult from "./TestPlanApiCaseResult";
 import TestPlan from "../../../../../api/definition/components/jmeter/components/test-plan";
 import ThreadGroup from "../../../../../api/definition/components/jmeter/components/thread-group";
 import {WORKSPACE_ID} from "@/common/js/constants";
+import {_filter, _sort} from "@/common/js/tableUtils";
+
 
 export default {
   name: "TestPlanApiCaseList",
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 65ab346889..a4da33838a 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -35,6 +35,7 @@
         @select="handleSelectionChange"
         row-key="id"
         @row-click="showDetail"
+        @header-dragend="headerDragend"
         :data="tableData">
 
         <el-table-column
@@ -48,17 +49,23 @@
           prop="num"
           sortable="custom"
           :label="$t('commons.id')"
+          min-width="120px"
+
           show-overflow-tooltip>
         </el-table-column>
         <el-table-column
           prop="name"
           :label="$t('commons.name')"
+          min-width="120px"
+
           show-overflow-tooltip>
         </el-table-column>
         <el-table-column
           prop="priority"
           :filters="priorityFilters"
           column-key="priority"
+          min-width="100px"
+
           :label="$t('test_track.case.priority')">
           <template v-slot:default="scope">
             <priority-table-item :value="scope.row.priority" ref="priority"/>
@@ -70,13 +77,16 @@
           :filters="typeFilters"
           column-key="type"
           :label="$t('test_track.case.type')"
+          min-width="80px"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <type-table-item :value="scope.row.type"/>
           </template>
         </el-table-column>
 
-        <el-table-column prop="tags" :label="$t('commons.tag')">
+        <el-table-column prop="tags" :label="$t('commons.tag')" min-width="120px"
+                         >
           <template v-slot:default="scope">
             <div v-for="(tag, index) in scope.row.showTags" :key="tag + '_' + index">
               <ms-tag type="success" effect="plain" :content="tag"/>
@@ -89,6 +99,8 @@
           :filters="methodFilters"
           column-key="method"
           :label="$t('test_track.case.method')"
+          min-width="100px"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <method-table-item :value="scope.row.method"/>
@@ -98,17 +110,23 @@
         <el-table-column
           prop="nodePath"
           :label="$t('test_track.case.module')"
+          min-width="120px"
+
           show-overflow-tooltip>
         </el-table-column>
 
         <el-table-column
           prop="projectName"
           :label="$t('test_track.plan.plan_project')"
+          min-width="120px"
+
           show-overflow-tooltip>
         </el-table-column>
 
         <el-table-column
           :label="$t('test_track.issue.issue')"
+          min-width="80px"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <el-popover
@@ -141,6 +159,8 @@
         <el-table-column
           prop="executorName"
           :filters="executorFilters"
+          min-width="100px"
+
           column-key="executor"
           :label="$t('test_track.plan_view.executor')">
         </el-table-column>
@@ -149,6 +169,8 @@
           prop="status"
           :filters="statusFilters"
           column-key="status"
+          min-width="100px"
+
           :label="$t('test_track.plan_view.execute_result')">
           <template v-slot:default="scope">
             <span @click.stop="clickt = 'stop'">
@@ -181,6 +203,8 @@
           sortable
           prop="updateTime"
           :label="$t('commons.update_time')"
+          min-width="120px"
+
           show-overflow-tooltip>
           <template v-slot:default="scope">
             <span>{{ scope.row.updateTime | timestampFormatDate }}</span>
@@ -226,21 +250,21 @@ import MsTableButton from '../../../../../common/components/MsTableButton';
 import NodeBreadcrumb from '../../../../common/NodeBreadcrumb';
 
 import {ROLE_TEST_MANAGER, ROLE_TEST_USER, TokenKey, WORKSPACE_ID} from "@/common/js/constants";
-import {_filter, _sort, checkoutTestManagerOrTestUser, hasRoles} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser, hasRoles} from "@/common/js/utils";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
 import StatusTableItem from "../../../../common/tableItems/planview/StatusTableItem";
 import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem";
 import MethodTableItem from "../../../../common/tableItems/planview/MethodTableItem";
 import MsTableOperator from "../../../../../common/components/MsTableOperator";
 import MsTableOperatorButton from "../../../../../common/components/MsTableOperatorButton";
-import TestReportTemplateList from "../TestReportTemplateList";
-import TestCaseReportView from "../report/TestCaseReportView";
 import {TEST_CASE_CONFIGS} from "../../../../../common/components/search/search-components";
 import ShowMoreBtn from "../../../../case/components/ShowMoreBtn";
 import BatchEdit from "../../../../case/components/BatchEdit";
 import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
 import {hub} from "@/business/components/track/plan/event-bus";
 import MsTag from "@/business/components/common/components/MsTag";
+import {_filter, _sort} from "@/common/js/tableUtils";
+
 
 export default {
   name: "FunctionalTestCaseList",
@@ -572,6 +596,14 @@ export default {
       _sort(column, this.condition);
       this.initTableData();
     },
+    headerDragend(newWidth,oldWidth,column,event){
+      let finalWidth = newWidth;
+      if(column.minWidth>finalWidth){
+        finalWidth = column.minWidth;
+      }
+      column.width = finalWidth;
+      column.realWidth = finalWidth;
+    },
     batchEdit(form) {
       let param = {};
       param[form.type] = form.value;
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
index 60933b1857..bae9178cbc 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestCaseFunctionalRelevance.vue
@@ -70,28 +70,29 @@
 
 <script>
 
-  import NodeTree from '../../../../common/NodeTree';
-  import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
-  import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem";
-  import MsTableSearchBar from "../../../../../common/components/MsTableSearchBar";
-  import MsTableAdvSearchBar from "../../../../../common/components/search/MsTableAdvSearchBar";
-  import MsTableHeader from "../../../../../common/components/MsTableHeader";
-  import {TEST_CASE_CONFIGS} from "../../../../../common/components/search/search-components";
-  import elTableInfiniteScroll from 'el-table-infinite-scroll';
-  import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
-  import {_filter} from "../../../../../../../common/js/utils";
+import NodeTree from '../../../../common/NodeTree';
+import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
+import TypeTableItem from "../../../../common/tableItems/planview/TypeTableItem";
+import MsTableSearchBar from "../../../../../common/components/MsTableSearchBar";
+import MsTableAdvSearchBar from "../../../../../common/components/search/MsTableAdvSearchBar";
+import MsTableHeader from "../../../../../common/components/MsTableHeader";
+import {TEST_CASE_CONFIGS} from "../../../../../common/components/search/search-components";
+import elTableInfiniteScroll from 'el-table-infinite-scroll';
+import TestCaseRelevanceBase from "../base/TestCaseRelevanceBase";
+import {_filter} from "@/common/js/tableUtils";
 
-  export default {
-    name: "TestCaseFunctionalRelevance",
-    components: {
-      TestCaseRelevanceBase,
-      NodeTree,
-      PriorityTableItem,
-      TypeTableItem,
-      MsTableSearchBar,
-      MsTableAdvSearchBar,
-      MsTableHeader,
-    },
+
+export default {
+  name: "TestCaseFunctionalRelevance",
+  components: {
+    TestCaseRelevanceBase,
+    NodeTree,
+    PriorityTableItem,
+    TypeTableItem,
+    MsTableSearchBar,
+    MsTableAdvSearchBar,
+    MsTableHeader,
+  },
     directives: {
       'el-table-infinite-scroll': elTableInfiniteScroll
     },
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
index 9fd49ac10e..fdca4113f2 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
@@ -57,11 +57,9 @@
         'redirectCharType',
         'clickType'
       ],
-      // activated() {
-      //   this.search();
-      //   this.checkTipsType();
-      // },
-      // mounted() {
+      mounted() {
+        this.initData();
+      },
       activated(){
         this.initData();
         this.openTestCaseEdit(this.$route.path);
diff --git a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
index 4c7e051301..199c8d4bb7 100644
--- a/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/load/TestPlanLoadCaseList.vue
@@ -107,11 +107,11 @@
 import TestPlanLoadCaseListHeader
   from "@/business/components/track/plan/view/comonents/load/TestPlanLoadCaseListHeader";
 import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
-import {_filter, _sort} from "@/common/js/utils";
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import MsPerformanceTestStatus from "@/business/components/performance/test/PerformanceTestStatus";
 import MsTableOperatorButton from "@/business/components/common/components/MsTableOperatorButton";
 import LoadCaseReport from "@/business/components/track/plan/view/comonents/load/LoadCaseReport";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   name: "TestPlanLoadCaseList",
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ApiFailureCasesList.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ApiFailureCasesList.vue
index e8ee8e8118..9ef2c282de 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ApiFailureCasesList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ApiFailureCasesList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="failure-cases-list">
     <div class="failure-cases-list-header">
-      接口测试用例
+      {{$t('test_track.plan.api_case')}}
     </div>
 
     <el-table
@@ -28,7 +28,7 @@
 
       <el-table-column
         prop="createUser"
-        :label="'创建人'"
+        :label="$t('api_test.automation.creator')"
         show-overflow-tooltip/>
 
       <el-table-column prop="lastResult" :label="$t('api_test.automation.last_result')">
@@ -60,9 +60,23 @@
       name: "ApiFailureCasesList",
       components: {MsTag, PriorityTableItem, TypeTableItem, MethodTableItem, StatusTableItem},
       props: ['apiTestCases'],
+      watch: {
+        apiTestCases() {
+          this.parseTags();
+        }
+      },
       methods: {
         goFailureTestCase(row) {
           this.$emit("openFailureTestCase", row);
+        },
+        parseTags() {
+          if (this.apiTestCases) {
+            this.apiTestCases.forEach(item => {
+              if (item.tags && item.tags.length > 0) {
+                item.tags = JSON.parse(item.tags);
+              }
+            });
+          }
         }
       }
     }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue
index 7370bcbedd..20431cf5de 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/ScenarioFailureCasesList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="failure-cases-list">
     <div class="failure-cases-list-header">
-      场景测试用例
+      {{$t('test_track.plan.scenario_case')}}
     </div>
 
     <el-table
@@ -64,9 +64,21 @@
       name: "ScenarioFailureCasesList",
       components: {MsTag, PriorityTableItem, TypeTableItem, MethodTableItem, StatusTableItem},
       props: ['scenarioTestCases'],
+      watch: {
+        scenarioTestCases() {
+          this.parseTags();
+        }
+      },
       methods: {
         goFailureTestCase(row) {
           this.$emit("openFailureTestCase", row);
+        },
+        parseTags() {
+          this.scenarioTestCases.forEach(item => {
+            if (item.tags && item.tags.length > 0) {
+              item.tags = JSON.parse(item.tags);
+            }
+          });
         }
       }
     }
diff --git a/frontend/src/business/components/track/report/components/TestPlanReportList.vue b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
index 33a79a1d4b..a9b2ec3191 100644
--- a/frontend/src/business/components/track/report/components/TestPlanReportList.vue
+++ b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
@@ -64,7 +64,7 @@ import MsTablePagination from '../../../../components/common/pagination/TablePag
 import MsTableHeader from "@/business/components/common/components/MsTableHeader";
 import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
 import MsTableOperator from "../../../common/components/MsTableOperator";
-import {_filter, _sort, checkoutTestManagerOrTestUser} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import {TEST_PLAN_REPORT_CONFIGS} from "../../../common/components/search/search-components";
 import {getCurrentProjectID} from "../../../../../common/js/utils";
 import TestPlanReportView from "@/business/components/track/report/components/TestPlanReportView";
@@ -72,14 +72,16 @@ import ReportTriggerModeItem from "@/business/components/common/tableItem/Report
 import MsTag from "@/business/components/common/components/MsTag";
 import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
 import MsTableSelectAll from "@/business/components/common/components/table/MsTableSelectAll";
+import {_filter, _sort} from "@/common/js/tableUtils";
+
 
 export default {
   name: "TestPlanReportList",
   components: {
     TestPlanReportView,
     MsTableOperator, MsTableOperatorButton, MsTableHeader, MsTablePagination,
-    ReportTriggerModeItem,MsTag,
-    ShowMoreBtn,MsTableSelectAll,
+    ReportTriggerModeItem, MsTag,
+    ShowMoreBtn, MsTableSelectAll,
   },
   data() {
     return {
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 249a3dfb67..b31874208b 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -88,12 +88,11 @@ import MsTableHeader from "../../../common/components/MsTableHeader";
 import MsCreateBox from "../../../settings/CreateBox";
 import MsTablePagination from "../../../common/pagination/TablePagination";
 import {
-  _filter,
-  _sort,
   checkoutTestManagerOrTestUser,
   getCurrentProjectID,
   getCurrentWorkspaceId
 } from "../../../../../common/js/utils";
+import {_filter, _sort} from "@/common/js/tableUtils";
 import PlanStatusTableItem from "../../common/tableItems/plan/PlanStatusTableItem";
 
 export default {
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
index d66ad25fc2..bb4279afc9 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
@@ -94,31 +94,32 @@
 
 <script>
 
-  import NodeTree from "../../../common/NodeTree";
-  import MsDialogFooter from "../../../../common/components/MsDialogFooter";
-  import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
-  import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
-  import MsTableSearchBar from "../../../../common/components/MsTableSearchBar";
-  import MsTableAdvSearchBar from "../../../../common/components/search/MsTableAdvSearchBar";
-  import MsTableHeader from "../../../../common/components/MsTableHeader";
-  import SwitchProject from "../../../case/components/SwitchProject";
-  import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
-  import {_filter} from "../../../../../../common/js/utils";
-  import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
-  import elTableInfiniteScroll from 'el-table-infinite-scroll';
-  import SelectMenu from "../../../common/SelectMenu";
+import NodeTree from "../../../common/NodeTree";
+import MsDialogFooter from "../../../../common/components/MsDialogFooter";
+import PriorityTableItem from "../../../common/tableItems/planview/PriorityTableItem";
+import TypeTableItem from "../../../common/tableItems/planview/TypeTableItem";
+import MsTableSearchBar from "../../../../common/components/MsTableSearchBar";
+import MsTableAdvSearchBar from "../../../../common/components/search/MsTableAdvSearchBar";
+import MsTableHeader from "../../../../common/components/MsTableHeader";
+import SwitchProject from "../../../case/components/SwitchProject";
+import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
+import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
+import elTableInfiniteScroll from 'el-table-infinite-scroll';
+import SelectMenu from "../../../common/SelectMenu";
+import {_filter} from "@/common/js/tableUtils";
 
-  export default {
-    name: "TestReviewRelevance",
-    components: {
-      SelectMenu,
-      NodeTree,
-      MsDialogFooter,
-      PriorityTableItem,
-      TypeTableItem,
-      MsTableSearchBar,
-      MsTableAdvSearchBar,
-      MsTableHeader,
+
+export default {
+  name: "TestReviewRelevance",
+  components: {
+    SelectMenu,
+    NodeTree,
+    MsDialogFooter,
+    PriorityTableItem,
+    TypeTableItem,
+    MsTableSearchBar,
+    MsTableAdvSearchBar,
+    MsTableHeader,
       SwitchProject,
       ReviewStatus
 
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index cdf59070ff..6557ffa1a9 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -146,6 +146,9 @@
         @refreshTable="search"/>
 
     </el-card>
+
+    <batch-edit ref="batchEdit" @batchEdit="batchEdit"
+                :type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
   </div>
 </template>
 
@@ -166,11 +169,12 @@ import MsTableButton from "../../../../common/components/MsTableButton";
 import ShowMoreBtn from "../../../case/components/ShowMoreBtn";
 import BatchEdit from "../../../case/components/BatchEdit";
 import MsTablePagination from '../../../../common/pagination/TablePagination';
-import {_filter, _sort, checkoutTestManagerOrTestUser, hasRoles} from "../../../../../../common/js/utils";
+import {checkoutTestManagerOrTestUser, hasRoles} from "../../../../../../common/js/utils";
 import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
 import {ROLE_TEST_MANAGER, ROLE_TEST_USER} from "../../../../../../common/js/constants";
 import TestReviewTestCaseEdit from "./TestReviewTestCaseEdit";
 import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
+import {_filter, _sort} from "@/common/js/tableUtils";
 
 export default {
   name: "TestReviewTestCaseList",
@@ -214,21 +218,21 @@ export default {
       ],
       showMore: false,
       buttons: [
+        {
+          name: this.$t('test_track.case.batch_edit_case'), handleClick: this.handleEditBatch
+        },
         {
           name: this.$t('test_track.case.batch_unlink'), handleClick: this.handleDeleteBatch
         }
       ],
       typeArr: [
-        {id: 'status', name: this.$t('test_track.plan_view.execute_result')},
-        {id: 'executor', name: this.$t('test_track.plan_view.executor')},
+        {id: 'status', name: this.$t('test_track.review_view.execute_result')},
       ],
       valueArr: {
-        executor: [],
         status: [
-          {name: this.$t('test_track.plan_view.pass'), id: 'Pass'},
-          {name: this.$t('test_track.plan_view.failure'), id: 'Failure'},
-          {name: this.$t('test_track.plan_view.blocking'), id: 'Blocking'},
-          {name: this.$t('test_track.plan_view.skip'), id: 'Skip'}
+          {name: this.$t('test_track.case.status_prepare'), id: 'Prepare'},
+          {name: this.$t('test_track.case.status_pass'), id: 'Pass'},
+          {name: this.$t('test_track.case.status_un_pass'), id: 'UnPass'},
         ]
       },
     }
@@ -261,9 +265,7 @@ export default {
       if (this.reviewId) {
         this.condition.reviewId = this.reviewId;
       }
-      if (this.selectNodeIds && this.selectNodeIds.length > 0) {
-        this.condition.nodeIds = this.selectNodeIds;
-      }
+      this.condition.nodeIds = this.selectNodeIds;
       if (this.reviewId) {
         this.result = this.$post(this.buildPagePath('/test/review/case/list'), this.condition, response => {
           let data = response.data;
@@ -339,6 +341,23 @@ export default {
         this.$success(this.$t('test_track.cancel_relevance_success'));
       });
     },
+    handleEditBatch() {
+      this.$refs.batchEdit.open(this.selectRows.size);
+    },
+    batchEdit(form) {
+      let reviewId = this.reviewId;
+      let param = {};
+      param[form.type] = form.value;
+      param.ids = Array.from(this.selectRows).map(row => row.caseId);
+      param.reviewId = reviewId;
+      this.$post('/test/review/case/batch/edit/status', param, () => {
+        this.selectRows.clear();
+        this.status = '';
+        this.$post('/test/case/review/edit/status/' + reviewId);
+        this.$success(this.$t('commons.save_success'));
+        this.$emit('refresh');
+      });
+    },
     handleSelectAll(selection) {
       if (selection.length > 0) {
         this.tableData.forEach(item => {
diff --git a/frontend/src/common/css/main.css b/frontend/src/common/css/main.css
index 02f89454da..6cffe9887d 100644
--- a/frontend/src/common/css/main.css
+++ b/frontend/src/common/css/main.css
@@ -122,8 +122,8 @@ html,body {
 
 /* 滚动条样式 */
 ::-webkit-scrollbar{
-  width: 5px;
-  height: 5px;
+  width: 10px;
+  height: 10px;
   position: fixed;
 }
 ::-webkit-scrollbar-thumb{
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index fcd06333bd..c52cc7ab71 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -1,3 +1,4 @@
+import {humpToLine} from "@/common/js/utils";
 
 export function _handleSelectAll(component, selection, tableData, selectRows) {
   if (selection.length > 0) {
@@ -33,3 +34,73 @@ export function _handleSelect(component, selection, row, selectRows) {
     component.$set(row, "showMore", true);
   })
 }
+
+// 设置 unSelectIds 查询条件，返回当前选中的条数
+export function setUnSelectIds(tableData, condition, selectRows) {
+  let ids = Array.from(selectRows).map(o => o.id);
+  let allIDs = tableData.map(o => o.id);
+  condition.unSelectIds = allIDs.filter(function (val) {
+    return ids.indexOf(val) === -1
+  });
+
+}
+
+export function getSelectDataCounts(condition, total, selectRows) {
+  if (condition.selectAll) {
+    return total - condition.unSelectIds.length;
+  } else {
+    return selectRows.size;
+  }
+}
+
+// 全选操作
+export function toggleAllSelection(table, tableData, selectRows) {
+  //如果已经全选，不需要再操作了
+  if (selectRows.size != tableData.length) {
+    table.toggleAllSelection(true);
+  }
+}
+
+
+//表格数据过滤
+export function _filter(filters, condition) {
+  if (!condition.filters) {
+    condition.filters = {};
+  }
+  for (let filter in filters) {
+    if (filters.hasOwnProperty(filter)) {
+      if (filters[filter] && filters[filter].length > 0) {
+        condition.filters[humpToLine(filter)] = filters[filter];
+      } else {
+        condition.filters[humpToLine(filter)] = null;
+      }
+    }
+  }
+}
+
+//表格数据排序
+export function _sort(column, condition) {
+  column.prop = humpToLine(column.prop);
+  if (column.order === 'descending') {
+    column.order = 'desc';
+  } else {
+    column.order = 'asc';
+  }
+  if (!condition.orders) {
+    condition.orders = [];
+  }
+  let hasProp = false;
+  condition.orders.forEach(order => {
+    if (order.name === column.prop) {
+      order.type = column.order;
+      hasProp = true;
+    }
+  });
+  if (!hasProp) {
+    condition.orders.push({name: column.prop, type: column.order});
+  }
+}
+
+
+
+
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index 30602936cc..deca536429 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -1,13 +1,13 @@
 import {
   LicenseKey,
+  PROJECT_ID,
   REFRESH_SESSION_USER_URL,
   ROLE_ADMIN,
   ROLE_ORG_ADMIN,
   ROLE_TEST_MANAGER,
   ROLE_TEST_USER,
   ROLE_TEST_VIEWER,
-  TokenKey,
-  PROJECT_ID
+  TokenKey
 } from "./constants";
 import axios from "axios";
 import {jsPDF} from "jspdf";
@@ -138,45 +138,6 @@ export function humpToLine(name) {
   return name.replace(/([A-Z])/g, "_$1").toLowerCase();
 }
 
-//表格数据过滤
-export function _filter(filters, condition) {
-  if (!condition.filters) {
-    condition.filters = {};
-  }
-  for (let filter in filters) {
-    if (filters.hasOwnProperty(filter)) {
-      if (filters[filter] && filters[filter].length > 0) {
-        condition.filters[humpToLine(filter)] = filters[filter];
-      } else {
-        condition.filters[humpToLine(filter)] = null;
-      }
-    }
-  }
-}
-
-//表格数据排序
-export function _sort(column, condition) {
-  column.prop = humpToLine(column.prop);
-  if (column.order === 'descending') {
-    column.order = 'desc';
-  } else {
-    column.order = 'asc';
-  }
-  if (!condition.orders) {
-    condition.orders = [];
-  }
-  let hasProp = false;
-  condition.orders.forEach(order => {
-    if (order.name === column.prop) {
-      order.type = column.order;
-      hasProp = true;
-    }
-  });
-  if (!hasProp) {
-    condition.orders.push({name: column.prop, type: column.order});
-  }
-}
-
 export function downloadFile(name, content) {
   const blob = new Blob([content]);
   if ("download" in document.createElement("a")) {
@@ -322,21 +283,23 @@ export function _getBodyUploadFiles(request, bodyUploadFiles, obj) {
     body = request.body;
   }
   if (body) {
-    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;
+    if (body.kvs) {
+      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);
             }
-            obj.bodyUploadIds.push(item.id);
-            bodyUploadFiles.push(item.file);
-          }
-        });
-      }
-    });
+          });
+        }
+      });
+    }
     if (body.binary) {
       body.binary.forEach(param => {
         if (param.files) {
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f2f87f9f20..81bdf4740b 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -1,7 +1,7 @@
 export default {
   commons: {
-    cover:'Cover',
-    not_cover:'Not Cover',
+    cover: 'Cover',
+    not_cover: 'Not Cover',
     import_mode: 'Import mode',
     import_module: 'Import module',
     please_fill_in_the_template: 'Please fill in the template',
@@ -187,7 +187,11 @@ export default {
       review: "all"
     },
     image: 'Image',
-    tag: 'Tag'
+    tag: 'Tag',
+    module: {
+      select_module: "Select module",
+      default_module: "Default module",
+    }
   },
   license: {
     title: 'Authorization management',
@@ -208,8 +212,8 @@ export default {
   display: {
     title: 'Theme',
     logo: 'System LOGO',
-    loginLogo: 'Picture on the right side of the login page',
-    loginImage: 'Login page upper left corner LOGO',
+    loginLogo: 'Login page upper left corner LOGO',
+    loginImage: 'Picture on the right side of the login page',
     loginTitle: 'Login page prompt information',
     pageTitle: 'Page Title',
   },
@@ -516,6 +520,8 @@ export default {
     },
     definition: {
       api_title: "Api test",
+      case_title: "Test Case",
+      doc_title: "Document",
       api_name: "Api name",
       api_status: "Api status",
       api_type: "Api type",
@@ -526,18 +532,19 @@ export default {
       api_case_status: "Ise case status",
       api_case_passing_rate: "Use case pass rate",
       create_tip: "Note: Detailed interface information can be filled out on the edit page",
+      api_import: "Api Import",
       select_comp: {
         no_data: "No Data",
         add_data: "Add Data"
       },
       request: {
         grade_info: "Filter by rank",
-        grade_order_asc: "from high to low by use case level",
-        grade_order_desc: "from low to high by use case level,",
+        grade_order_asc: "from low to high by use case level",
+        grade_order_desc: "from high to low by use case level",
         create_time_order_asc: "by creation time from front to back",
-        create_time_order_desc: "from back to front by creation time,",
+        create_time_order_desc: "from back to front by creation time",
         update_time_order_asc: "by update time from front to back",
-        update_time_order_desc: "from back to front by update time,",
+        update_time_order_desc: "from back to front by update time",
         run_env: "Operating environment",
         select_case: "Search use cases",
         case: "Case",
@@ -584,6 +591,7 @@ export default {
         create_info: 'Create',
         update_info: 'Update',
         batch_edit: "Batch edit",
+        batch_move: "Batch move",
         path_valid_info: "The request path is invalid",
         other_config: "Other Config",
         message_template: "Message Template",
@@ -1131,6 +1139,8 @@ export default {
       plan_delete_confirm: "All use cases under this plan will be deleted,confirm delete test plan: ",
       plan_delete_tip: "The test plan is under way, please confirm and delete it!",
       plan_delete: "Delete test plan",
+      api_case: "Api case",
+      scenario_case: "Scenario case",
       load_case: {
         case: "Load Case",
         execution_status: "Execution status",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 909e53b66a..b3175485e4 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -188,7 +188,11 @@ export default {
       review: "全部评审"
     },
     image: '镜像',
-    tag: '标签'
+    tag: '标签',
+    module: {
+      select_module: "选择模块",
+      default_module: "默认模块",
+    }
   },
   license: {
     title: '授权管理',
@@ -209,8 +213,8 @@ export default {
   display: {
     title: '显示设置',
     logo: '系统 LOGO',
-    loginLogo: '登陆页面右侧图片',
-    loginImage: '登录页左上角 LOGO',
+    loginLogo: '登录页左上角 LOGO',
+    loginImage: '登陆页面右侧图片',
     loginTitle: '登陆页面提示信息',
     pageTitle: '页面 Title',
   },
@@ -516,6 +520,8 @@ export default {
     },
     definition: {
       api_title: "接口列表",
+      case_title: "用例列表",
+      doc_title: "文档",
       api_name: "接口名称",
       api_status: "接口状态",
       api_type: "请求类型",
@@ -526,14 +532,15 @@ export default {
       api_case_status: "用例状态",
       api_case_passing_rate: "用例通过率",
       create_tip: "注: 详细的接口信息可以在编辑页面填写",
+      api_import: "接口导入",
       select_comp: {
         no_data: "无数据",
         add_data: "去添加"
       },
       request: {
         grade_info: "按等级筛选",
-        grade_order_asc: "按用例等级从高到低",
-        grade_order_desc: "按用例等级从低到高",
+        grade_order_asc: "按用例等级从低到高",
+        grade_order_desc: "按用例等级从高到低",
         create_time_order_asc: "按创建时间从前到后",
         create_time_order_desc: "按创建时间从后到前",
         update_time_order_asc: "按更新时间从前到后",
@@ -585,6 +592,7 @@ export default {
         create_info: '创建',
         update_info: '更新',
         batch_edit: "批量编辑",
+        batch_move:"批量移动",
         path_valid_info: "请求路径无效",
         other_config: "其他设置",
         message_template: "报文模版",
@@ -1135,6 +1143,8 @@ export default {
       plan_delete_confirm: "将删除该测试计划下所有用例，确认删除测试计划: ",
       plan_delete_tip: "该测试计划正在进行中，请确认再删除！",
       plan_delete: "删除计划",
+      api_case: "接口测试用例",
+      scenario_case: "场景测试用例",
       load_case: {
         case: "性能用例",
         execution_status: "执行状态",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index fa0b55d3c0..fa41525062 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -188,7 +188,11 @@ export default {
       review: "全部評審"
     },
     image: '鏡像',
-    tag: '標簽'
+    tag: '標簽',
+    module: {
+      select_module: "選擇模塊",
+      default_module: "默認模塊",
+    }
   },
   license: {
     title: '授權管理',
@@ -209,8 +213,8 @@ export default {
   display: {
     title: '顯示設置',
     logo: '系統 LOGO',
-    loginLogo: '登陸頁面右側圖片',
-    loginImage: '登錄頁左上角 LOGO',
+    loginLogo: '登錄頁左上角 LOGO',
+    loginImage: '登陸頁面右側圖片',
     loginTitle: '登陸頁面提示信息',
     pageTitle: '頁面 Title',
   },
@@ -515,6 +519,8 @@ export default {
     },
     definition: {
       api_title: "接口列表",
+      case_title: "用例列表",
+      doc_title: "文檔",
       api_name: "接口名稱",
       api_status: "接口狀態",
       api_type: "請求類型",
@@ -525,14 +531,15 @@ export default {
       api_case_status: "用例狀態",
       api_case_passing_rate: "用例通過率",
       create_tip: "註: 詳細的接口信息可以在編輯頁面填寫",
+      api_import: "接口導入",
       select_comp: {
         no_data: "無數據",
         add_data: "去添加"
       },
       request: {
         grade_info: "按等級篩選",
-        grade_order_asc: "按用例等級從高到低",
-        grade_order_desc: "按用例等級從低到高",
+        grade_order_asc: "按用例等級從低到高",
+        grade_order_desc: "按用例等級從高到低",
         create_time_order_asc: "按創建時間從前到後",
         create_time_order_desc: "按創建時間從後到前",
         update_time_order_asc: "按更新時間從前到後",
@@ -584,6 +591,7 @@ export default {
         create_info: '創建',
         update_info: '更新',
         batch_edit: "批量編輯",
+        batch_move:"批量移動",
         path_valid_info: "請求路徑無效",
         other_config: "其他設置",
         message_template: "報文模版",
@@ -1133,6 +1141,8 @@ export default {
       plan_delete_confirm: "將刪除該測試計劃下所有用例，確認刪除測試計劃: ",
       plan_delete_tip: "該測試計劃正在進行中，請確認再刪除！",
       plan_delete: "刪除計劃",
+      api_case: "接口測試用例",
+      scenario_case: "場景測試用例",
       load_case: {
         case: "性能用例",
         execution_status: "執行狀態",
diff --git a/frontend/src/login/Login.vue b/frontend/src/login/Login.vue
index 73a287cc60..6dec041ed8 100644
--- a/frontend/src/login/Login.vue
+++ b/frontend/src/login/Login.vue
@@ -8,7 +8,7 @@
             <img :src="'/display/file/loginLogo'" alt="">
           </div>
           <div class="welcome">
-            <span>{{ $t('commons.welcome') }}</span>
+            <span>{{ loginTitle }}</span>
           </div>
         </div>
 
@@ -46,7 +46,7 @@
       <div class="divider"/>
 
       <el-col :span="12">
-        <img class="login-image" :src="'/display/file/loginImage'">
+        <img class="login-image" :src="'/display/file/loginImage'" alt="">
       </el-col>
 
     </el-row>
@@ -85,7 +85,7 @@ export default {
       msg: '',
       ready: false,
       openLdap: false,
-      loginTitle: this.$t("commons.login") + " MeterSphere",
+      loginTitle: this.$t("commons.welcome"),
       authSources: [],
       loginUrl: 'signin',
     }
@@ -200,6 +200,7 @@ export default {
 
 .title img {
   width: 293px;
+  max-height: 60px;
   margin-top: 165px;
 }
 

From eb815f9182bb2bb3c138cececcd015573774a9ab Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 5 Feb 2021 10:58:43 +0800
Subject: [PATCH 06/23] Merge branch 'master' of
 https://github.com/metersphere/metersphere

# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
---
 .../api/service/ApiAutomationService.java     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 2decf1ba4a..07a2571646 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -95,16 +95,6 @@ public class ApiAutomationService {
         return list;
     }
 
-    public List<ApiScenarioWithBLOBs> get(ApiScenarioRequest request) {
-        ApiScenarioExample example = new ApiScenarioExample();
-        if (CollectionUtils.isNotEmpty(request.getIds())) {
-            example.createCriteria().andIdIn(request.getIds());
-        } else {
-            example.createCriteria().andProjectIdEqualTo(request.getProjectId());
-        }
-        return apiScenarioMapper.selectByExampleWithBLOBs(example);
-    }
-
     /**
      * 初始化部分参数
      *
@@ -541,7 +531,6 @@ public class ApiAutomationService {
         ParameterConfig config = new ParameterConfig();
         config.setConfig(envConfig);
         HashTree hashTree = request.getTestElement().generateHashTree(config);
-
         // 调用执行方法
         createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
                 SessionUtils.getUserId());
@@ -750,6 +739,16 @@ public class ApiAutomationService {
         }
     }
 
+    public List<ApiScenarioWithBLOBs> get(ApiScenarioRequest request) {
+        ApiScenarioExample example = new ApiScenarioExample();
+        if (CollectionUtils.isNotEmpty(request.getIds())) {
+            example.createCriteria().andIdIn(request.getIds());
+        } else {
+            example.createCriteria().andProjectIdEqualTo(request.getProjectId());
+        }
+        return apiScenarioMapper.selectByExampleWithBLOBs(example);
+    }
+
     public List<ApiScenarioWithBLOBs> getWithBLOBs(ApiScenarioWithBLOBs request) {
         ApiScenarioExample example = new ApiScenarioExample();
         example.createCriteria().andNameEqualTo(request.getName()).andProjectIdEqualTo(request.getProjectId()).andStatusNotEqualTo("Trash").andIdNotEqualTo(request.getId());

From fc625a27f350cdfa58b7588c61df624183d9ca78 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 5 Feb 2021 15:32:39 +0800
Subject: [PATCH 07/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5Jmeter=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E7=BB=93=E6=9E=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 71 ++++++++++---------
 .../scenario/common/ScenarioImport.vue        |  6 +-
 .../scenario/component/ComponentConfig.vue    |  5 +-
 .../component/JmeterElementComponent.vue      | 57 +++++++++++++++
 4 files changed, 100 insertions(+), 39 deletions(-)
 create mode 100644 frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 7963944b20..5b2f459ba2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -23,7 +23,6 @@ import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.base.domain.ApiScenarioModule;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
-import io.metersphere.base.domain.TestPlan;
 import io.metersphere.commons.utils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -34,7 +33,7 @@ import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
 import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
 import org.apache.jmeter.save.SaveService;
-import org.apache.jmeter.testelement.TestElement;
+import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jorphan.collections.HashTree;
 
 import java.io.InputStream;
@@ -51,13 +50,16 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             Object scriptWrapper = SaveService.loadElement(inputSource);
             HashTree testPlan = this.getHashTree(scriptWrapper);
             MsScenario scenario = new MsScenario();
-            scenario.setHashTree(new LinkedList<>());
+            scenario.setReferenced("REF");
+            LinkedList<MsTestElement> hashTrees = new LinkedList<>();
+            scenario.setHashTree(hashTrees);
             getTree(testPlan, scenario);
-
+            this.projectId = request.getProjectId();
 
             ScenarioImport scenarioImport = new ScenarioImport();
             scenarioImport.setData(paseObj(scenario, request));
             scenarioImport.setProjectid(request.getProjectId());
+            return scenarioImport;
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -141,47 +143,52 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         msTCPSampler.setPassword(tcpSampler.getProperty(ConfigTestElement.PASSWORD).getStringValue());
     }
 
-    private void getTree(HashTree tree, MsScenario scenario) {
+    private void getTree(HashTree tree, MsTestElement scenario) {
         for (Object key : tree.keySet()) {
+            MsTestElement elementNode = null;
+            if (CollectionUtils.isEmpty(scenario.getHashTree())) {
+                scenario.setHashTree(new LinkedList<>());
+            }
             if (key instanceof TestPlan) {
                 scenario.setName(((TestPlan) key).getName());
+                elementNode = new MsJmeterElement();
+                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
+                elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
+                ((MsJmeterElement) elementNode).setJmeterElement(key);
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof ThreadGroup) {
-                MsScenario msScenario = new MsScenario(((ThreadGroup) key).getName());
-                if (CollectionUtils.isEmpty(scenario.getHashTree())) {
-                    List<MsTestElement> msTestElementList = new LinkedList<>();
-                    msTestElementList.add(msScenario);
-                }
-                scenario.getHashTree().add(msScenario);
+                elementNode = new MsScenario(((ThreadGroup) key).getName());
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof HTTPSamplerProxy) {
-                MsHTTPSamplerProxy element = new MsHTTPSamplerProxy();
-                element.setBody(new Body());
+                elementNode = new MsHTTPSamplerProxy();
+                ((MsHTTPSamplerProxy) elementNode).setBody(new Body());
                 HTTPSamplerProxy request = (HTTPSamplerProxy) key;
-                convertHttpSampler(element, request);
-                scenario.getHashTree().add(element);
+                convertHttpSampler((MsHTTPSamplerProxy) elementNode, request);
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof TCPSampler) {
-                MsTCPSampler msTCPSampler = new MsTCPSampler();
+                elementNode = new MsTCPSampler();
                 TCPSampler tcpSampler = (TCPSampler) key;
-                convertTCPSampler(msTCPSampler, tcpSampler);
-                scenario.getHashTree().add(msTCPSampler);
+                convertTCPSampler((MsTCPSampler) elementNode, tcpSampler);
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof MsDubboSampler) {
 
             } else if (key instanceof MsJDBCSampler) {
 
             } else if (key instanceof JSR223Sampler) {
                 JSR223Sampler jsr223Sampler = (JSR223Sampler) key;
-                MsJSR223Processor processor = new MsJSR223Processor();
-                BeanUtils.copyBean(processor, jsr223Sampler);
-                scenario.getHashTree().add(processor);
+                elementNode = new MsJSR223Processor();
+                BeanUtils.copyBean(elementNode, jsr223Sampler);
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof JSR223PostProcessor) {
                 JSR223PostProcessor jsr223Sampler = (JSR223PostProcessor) key;
-                MsJSR223PostProcessor processor = new MsJSR223PostProcessor();
-                BeanUtils.copyBean(processor, jsr223Sampler);
-                scenario.getHashTree().add(processor);
+                elementNode = new MsJSR223PostProcessor();
+                BeanUtils.copyBean(elementNode, jsr223Sampler);
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof JSR223PreProcessor) {
                 JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
-                MsJSR223PreProcessor processor = new MsJSR223PreProcessor();
-                BeanUtils.copyBean(processor, jsr223Sampler);
-                scenario.getHashTree().add(processor);
+                elementNode = new MsJSR223PreProcessor();
+                BeanUtils.copyBean(elementNode, jsr223Sampler);
+                scenario.getHashTree().add(elementNode);
             } else if (key instanceof MsAssertions) {
 
             } else if (key instanceof MsExtract) {
@@ -193,15 +200,15 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             } else if (key instanceof MsLoopController) {
 
             } else {
-                MsJmeterElement jmeterElement = new MsJmeterElement();
+                elementNode = new MsJmeterElement();
                 JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
-                jmeterElement.setName(jsonObject.get(TestElement.NAME) == null ? "" : jsonObject.get(TestElement.NAME).toString());
-                jmeterElement.setJmeterElement(key);
-                scenario.getHashTree().add(jmeterElement);
+                elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
+                ((MsJmeterElement) elementNode).setJmeterElement(key);
+                scenario.getHashTree().add(elementNode);
             }
             HashTree node = tree.get(key);
             if (node != null) {
-                getTree(node, scenario);
+                getTree(node, elementNode);
             }
         }
     }
diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
index f004db640a..b739caabda 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -117,7 +117,7 @@
             value: 'Jmeter',
             tip: this.$t('api_test.api_import.jmeter_tip'),
             exportTip: this.$t('api_test.api_import.jmeter_export_tip'),
-            suffixes: new Set(['json'])
+            suffixes: new Set(['jmx'])
           }
         ],
         selectedPlatform: {},
@@ -194,10 +194,6 @@
       save() {
         this.$refs.form.validate(valid => {
           if (valid) {
-            if ((this.selectedPlatformValue != 'Swagger2' || (this.selectedPlatformValue == 'Swagger2' && !this.swaggerUrlEable)) && !this.formData.file) {
-              this.$warning(this.$t('commons.please_upload'));
-              return;
-            }
             let param = this.buildParam();
             this.result = this.$fileUpload('/api/automation/import', param.file, null, this.buildParam(), response => {
               let res = response.data;
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 5a2cbd94d7..5e856e86a4 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -16,10 +16,11 @@
   import MsApiComponent from "./ApiComponent";
   import MsLoopController from "./LoopController";
   import MsApiScenarioComponent from "./ApiScenarioComponent";
+  import JmeterElementComponent from "./JmeterElementComponent";
 
   export default {
     name: "ComponentConfig",
-    components: {MsConstantTimer, MsIfController, MsJsr233Processor, MsApiAssertions, MsApiExtract, MsApiComponent, MsLoopController, MsApiScenarioComponent},
+    components: {MsConstantTimer, MsIfController, MsJsr233Processor, MsApiAssertions, MsApiExtract, MsApiComponent, MsLoopController, MsApiScenarioComponent, JmeterElementComponent},
     props: {
       type: String,
       scenario: {},
@@ -72,7 +73,7 @@
           case "AuthManager":
             break;
           default:
-            name = "MsApiComponent";
+            name = "JmeterElementComponent";
             break;
         }
         return name;
diff --git a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
new file mode 100644
index 0000000000..403c117df7
--- /dev/null
+++ b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
@@ -0,0 +1,57 @@
+<template>
+  <api-base-component
+    @copy="copyRow"
+    @remove="remove"
+    :data="request"
+    :draggable="draggable"
+    :color="defColor"
+    :background-color="defBackgroundColor"
+    :title="defTitle">
+
+  </api-base-component>
+</template>
+
+<script>
+  import MsCodeEdit from "../../../../common/components/MsCodeEdit";
+  import MsInstructionsIcon from "../../../../common/components/MsInstructionsIcon";
+  import MsDropdown from "../../../../common/components/MsDropdown";
+  import ApiBaseComponent from "../common/ApiBaseComponent";
+  import Jsr233ProcessorContent from "../common/Jsr233ProcessorContent";
+
+  export default {
+    name: "JmeterElementComponent",
+    components: {Jsr233ProcessorContent, ApiBaseComponent, MsDropdown, MsInstructionsIcon, MsCodeEdit},
+    props: {
+      draggable: {
+        type: Boolean,
+        default: false,
+      },
+      isReadOnly: {
+        type: Boolean,
+        default:
+          false
+      },
+      request: {
+        type: Object,
+      },
+      defTitle: {type: String, default: "Jmeter组建"},
+      defColor: {type: String, default: "#606260"},
+      defBackgroundColor: {type: String, default: "#F4F4FF"},
+      node: {},
+    },
+    methods: {
+      remove() {
+        this.$emit('remove', this.jsr223Processor, this.node);
+      },
+      copyRow() {
+        this.$emit('copyRow', this.jsr223Processor, this.node);
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-divider {
+    margin-bottom: 10px;
+  }
+</style>

From 4e148354741819581b14a303c5af69a30d45785d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sun, 7 Feb 2021 09:47:16 +0800
Subject: [PATCH 08/23] Merge branch 'master' of
 https://github.com/metersphere/metersphere

# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
---
 .../api/automation/scenario/ApiScenarioModule.vue      | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 595ab1b639..e26a05ebaf 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -46,17 +46,11 @@
 </template>
 
 <script>
-import SelectMenu from "../../../track/common/SelectMenu";
-import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
-import {getCurrentProjectID} from "@/common/js/utils";
-import MsNodeTree from "../../../track/common/NodeTree";
-import {buildNodePath} from "../../definition/model/NodeTree";
-import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
+  import {getCurrentProjectID} from "@/common/js/utils";
+  import {buildNodePath} from "../../definition/model/NodeTree";
   import SelectMenu from "../../../track/common/SelectMenu";
   import MsAddBasisScenario from "@/business/components/api/automation/scenario/AddBasisScenario";
-  import {getCurrentProjectID} from "@/common/js/utils";
   import MsNodeTree from "../../../track/common/NodeTree";
-  import {buildNodePath} from "../../definition/model/NodeTree";
   import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
   import ApiImport from "./common/ScenarioImport";
 

From d25d6f54cfba4843eea50ad1dc0528b18662df7e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sun, 7 Feb 2021 11:16:22 +0800
Subject: [PATCH 09/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5jmx=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 96 ++++++++++++++++---
 .../scenario/component/ComponentConfig.vue    |  5 +-
 2 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 5b2f459ba2..ae8ceedbb4 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -8,7 +8,11 @@ import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.definition.request.assertions.MsAssertions;
 import io.metersphere.api.dto.definition.request.controller.MsIfController;
 import io.metersphere.api.dto.definition.request.controller.MsLoopController;
+import io.metersphere.api.dto.definition.request.controller.loop.CountController;
+import io.metersphere.api.dto.definition.request.controller.loop.MsForEachController;
+import io.metersphere.api.dto.definition.request.controller.loop.MsWhileController;
 import io.metersphere.api.dto.definition.request.extract.MsExtract;
+import io.metersphere.api.dto.definition.request.extract.MsExtractRegex;
 import io.metersphere.api.dto.definition.request.processors.MsJSR223Processor;
 import io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor;
 import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
@@ -23,10 +27,18 @@ import io.metersphere.api.dto.scenario.KeyValue;
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.base.domain.ApiScenarioModule;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.commons.constants.LoopConstants;
 import io.metersphere.commons.utils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.control.ForeachController;
+import org.apache.jmeter.control.IfController;
+import org.apache.jmeter.control.LoopController;
+import org.apache.jmeter.control.WhileController;
 import org.apache.jmeter.extractor.JSR223PostProcessor;
+import org.apache.jmeter.extractor.RegexExtractor;
+import org.apache.jmeter.extractor.XPath2Extractor;
+import org.apache.jmeter.extractor.json.jsonpath.JSONPostProcessor;
 import org.apache.jmeter.modifiers.JSR223PreProcessor;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
@@ -34,6 +46,7 @@ import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
 import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.timers.ConstantTimer;
 import org.apache.jorphan.collections.HashTree;
 
 import java.io.InputStream;
@@ -130,6 +143,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
 
     private void convertTCPSampler(MsTCPSampler msTCPSampler, TCPSampler tcpSampler) {
         tcpSampler.setName(tcpSampler.getName());
+        msTCPSampler.setType("TCPSampler");
         msTCPSampler.setServer(tcpSampler.getServer());
         msTCPSampler.setPort(tcpSampler.getPort() + "");
         msTCPSampler.setCtimeout(tcpSampler.getConnectTimeout() + "");
@@ -144,6 +158,12 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
     }
 
     private void getTree(HashTree tree, MsTestElement scenario) {
+        // 提取数据单独处理
+        MsExtract extract = new MsExtract();
+        extract.setType("Extract");
+        extract.setJson(new LinkedList<>());
+        extract.setRegex(new LinkedList<>());
+        extract.setXpath(new LinkedList<>());
         for (Object key : tree.keySet()) {
             MsTestElement elementNode = null;
             if (CollectionUtils.isEmpty(scenario.getHashTree())) {
@@ -155,21 +175,16 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
                 elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
                 ((MsJmeterElement) elementNode).setJmeterElement(key);
-                scenario.getHashTree().add(elementNode);
             } else if (key instanceof ThreadGroup) {
                 elementNode = new MsScenario(((ThreadGroup) key).getName());
-                scenario.getHashTree().add(elementNode);
             } else if (key instanceof HTTPSamplerProxy) {
                 elementNode = new MsHTTPSamplerProxy();
                 ((MsHTTPSamplerProxy) elementNode).setBody(new Body());
-                HTTPSamplerProxy request = (HTTPSamplerProxy) key;
-                convertHttpSampler((MsHTTPSamplerProxy) elementNode, request);
-                scenario.getHashTree().add(elementNode);
+                convertHttpSampler((MsHTTPSamplerProxy) elementNode, (HTTPSamplerProxy) key);
             } else if (key instanceof TCPSampler) {
                 elementNode = new MsTCPSampler();
                 TCPSampler tcpSampler = (TCPSampler) key;
                 convertTCPSampler((MsTCPSampler) elementNode, tcpSampler);
-                scenario.getHashTree().add(elementNode);
             } else if (key instanceof MsDubboSampler) {
 
             } else if (key instanceof MsJDBCSampler) {
@@ -178,34 +193,85 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 JSR223Sampler jsr223Sampler = (JSR223Sampler) key;
                 elementNode = new MsJSR223Processor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-                scenario.getHashTree().add(elementNode);
             } else if (key instanceof JSR223PostProcessor) {
                 JSR223PostProcessor jsr223Sampler = (JSR223PostProcessor) key;
                 elementNode = new MsJSR223PostProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-                scenario.getHashTree().add(elementNode);
             } else if (key instanceof JSR223PreProcessor) {
                 JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
                 elementNode = new MsJSR223PreProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-                scenario.getHashTree().add(elementNode);
             } else if (key instanceof MsAssertions) {
 
-            } else if (key instanceof MsExtract) {
+            } else if (key instanceof RegexExtractor) {
+                MsExtractRegex regex = new MsExtractRegex();
+                RegexExtractor regexExtractor = (RegexExtractor) key;
+                if (regexExtractor.useRequestHeaders()) {
+                    regex.setUseHeaders("request_headers");
+                } else if (regexExtractor.useBody()) {
+                    regex.setUseHeaders("false");
+                } else if (regexExtractor.useUnescapedBody()) {
+                    regex.setUseHeaders("unescaped");
+                } else if (regexExtractor.useBodyAsDocument()) {
+                    regex.setUseHeaders("as_document");
+                } else if (regexExtractor.useUrl()) {
+                    regex.setUseHeaders("URL");
+                }
+                regex.setType("Regex");
+                regex.setExpression(regexExtractor.getRegex());
+                regex.setVariable(regexExtractor.getRefName());
 
-            } else if (key instanceof MsConstantTimer) {
+            } else if (key instanceof XPath2Extractor) {
 
-            } else if (key instanceof MsIfController) {
-
-            } else if (key instanceof MsLoopController) {
+            } else if (key instanceof JSONPostProcessor) {
 
+            } else if (key instanceof ConstantTimer) {
+                elementNode = new MsConstantTimer();
+                BeanUtils.copyBean(elementNode, key);
+                elementNode.setType("ConstantTimer");
+            } else if (key instanceof IfController) {
+                elementNode = new MsIfController();
+                BeanUtils.copyBean(elementNode, key);
+                elementNode.setType("IfController");
+            } else if (key instanceof LoopController) {
+                elementNode = new MsLoopController();
+                BeanUtils.copyBean(elementNode, key);
+                elementNode.setType("LoopController");
+                ((MsLoopController) elementNode).setLoopType(LoopConstants.LOOP_COUNT.name());
+                LoopController loopController = (LoopController) key;
+                CountController countController = new CountController();
+                countController.setLoops(loopController.getLoops());
+                countController.setProceed(true);
+                ((MsLoopController) elementNode).setCountController(countController);
+            } else if (key instanceof WhileController) {
+                elementNode = new MsLoopController();
+                BeanUtils.copyBean(elementNode, key);
+                elementNode.setType("LoopController");
+                ((MsLoopController) elementNode).setLoopType(LoopConstants.WHILE.name());
+                WhileController whileController = (WhileController) key;
+                MsWhileController countController = new MsWhileController();
+                countController.setValue(whileController.getCondition());
+                ((MsLoopController) elementNode).setWhileController(countController);
+            } else if (key instanceof ForeachController) {
+                elementNode = new MsLoopController();
+                BeanUtils.copyBean(elementNode, key);
+                elementNode.setType("LoopController");
+                ((MsLoopController) elementNode).setLoopType(LoopConstants.FOREACH.name());
+                ForeachController foreachController = (ForeachController) key;
+                MsForEachController countController = new MsForEachController();
+                countController.setInputVal(foreachController.getInputValString());
+                countController.setReturnVal(foreachController.getReturnValString());
+                ((MsLoopController) elementNode).setForEachController(countController);
             } else {
                 elementNode = new MsJmeterElement();
+                elementNode.setType("JmeterElement");
                 JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
                 elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
                 ((MsJmeterElement) elementNode).setJmeterElement(key);
-                scenario.getHashTree().add(elementNode);
             }
+            elementNode.setResourceId(UUID.randomUUID().toString());
+            elementNode.setId(UUID.randomUUID().toString());
+            scenario.getHashTree().add(elementNode);
             HashTree node = tree.get(key);
             if (node != null) {
                 getTree(node, elementNode);
diff --git a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
index 5e856e86a4..e2375c5c8b 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ComponentConfig.vue
@@ -72,9 +72,12 @@
             break;
           case "AuthManager":
             break;
-          default:
+          case "JmeterElement":
             name = "JmeterElementComponent";
             break;
+          default:
+            name = "MsApiComponent";
+            break;
         }
         return name;
       }

From 726044ee619fa90d315bbd7746573c9d9036fa6e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 8 Feb 2021 11:24:10 +0800
Subject: [PATCH 10/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5jmx=20=E9=92=88=E5=AF=B9?=
 =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=E5=8D=8F=E8=AE=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 157 +++++++++++++++++-
 1 file changed, 148 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index ae8ceedbb4..e5c592deaf 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -2,17 +2,22 @@ package io.metersphere.api.dto.automation.parse;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
+import io.github.ningyu.jmeter.plugin.dubbo.sample.MethodArgument;
+import io.github.ningyu.jmeter.plugin.util.Constants;
 import io.metersphere.api.dto.ApiTestImportRequest;
 import io.metersphere.api.dto.definition.request.MsScenario;
 import io.metersphere.api.dto.definition.request.MsTestElement;
-import io.metersphere.api.dto.definition.request.assertions.MsAssertions;
+import io.metersphere.api.dto.definition.request.assertions.*;
 import io.metersphere.api.dto.definition.request.controller.MsIfController;
 import io.metersphere.api.dto.definition.request.controller.MsLoopController;
 import io.metersphere.api.dto.definition.request.controller.loop.CountController;
 import io.metersphere.api.dto.definition.request.controller.loop.MsForEachController;
 import io.metersphere.api.dto.definition.request.controller.loop.MsWhileController;
 import io.metersphere.api.dto.definition.request.extract.MsExtract;
+import io.metersphere.api.dto.definition.request.extract.MsExtractJSONPath;
 import io.metersphere.api.dto.definition.request.extract.MsExtractRegex;
+import io.metersphere.api.dto.definition.request.extract.MsExtractXPath;
 import io.metersphere.api.dto.definition.request.processors.MsJSR223Processor;
 import io.metersphere.api.dto.definition.request.processors.post.MsJSR223PostProcessor;
 import io.metersphere.api.dto.definition.request.processors.pre.MsJSR223PreProcessor;
@@ -20,6 +25,9 @@ import io.metersphere.api.dto.definition.request.sampler.MsDubboSampler;
 import io.metersphere.api.dto.definition.request.sampler.MsHTTPSamplerProxy;
 import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
 import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
+import io.metersphere.api.dto.definition.request.sampler.dubbo.MsConfigCenter;
+import io.metersphere.api.dto.definition.request.sampler.dubbo.MsConsumerAndService;
+import io.metersphere.api.dto.definition.request.sampler.dubbo.MsRegistryCenter;
 import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
 import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
 import io.metersphere.api.dto.scenario.Body;
@@ -30,6 +38,7 @@ import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.commons.constants.LoopConstants;
 import io.metersphere.commons.utils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.control.ForeachController;
 import org.apache.jmeter.control.IfController;
@@ -43,6 +52,7 @@ import org.apache.jmeter.modifiers.JSR223PreProcessor;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
+import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
 import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestPlan;
@@ -164,6 +174,12 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         extract.setJson(new LinkedList<>());
         extract.setRegex(new LinkedList<>());
         extract.setXpath(new LinkedList<>());
+        // 断言规则
+        MsAssertions assertions = new MsAssertions();
+        assertions.setJsonPath(new LinkedList<>());
+        assertions.setJsr223(new LinkedList<>());
+        assertions.setXpath2(new LinkedList<>());
+        assertions.setType("Assertions");
         for (Object key : tree.keySet()) {
             MsTestElement elementNode = null;
             if (CollectionUtils.isEmpty(scenario.getHashTree())) {
@@ -185,10 +201,74 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 elementNode = new MsTCPSampler();
                 TCPSampler tcpSampler = (TCPSampler) key;
                 convertTCPSampler((MsTCPSampler) elementNode, tcpSampler);
-            } else if (key instanceof MsDubboSampler) {
+            } else if (key instanceof DubboSample) {
+                DubboSample sampler = (DubboSample) key;
+                elementNode = new MsDubboSampler();
+                elementNode.setType("DubboSampler");
+                ((MsDubboSampler) elementNode).setProtocol("dubbo://");
+                ((MsDubboSampler) elementNode).set_interface(sampler.getPropertyAsString("FIELD_DUBBO_INTERFACE"));
+                ((MsDubboSampler) elementNode).setMethod(sampler.getPropertyAsString("FIELD_DUBBO_METHOD"));
 
-            } else if (key instanceof MsJDBCSampler) {
+                MsConfigCenter configCenter = new MsConfigCenter();
+                configCenter.setProtocol(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_PROTOCOL"));
+                configCenter.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_GROUP"));
+                configCenter.setNamespace(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_NAMESPACE"));
+                configCenter.setUsername(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_USER_NAME"));
+                configCenter.setPassword(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_PASSWORD"));
+                configCenter.setAddress(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_ADDRESS"));
+                configCenter.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_TIMEOUT"));
+                ((MsDubboSampler) elementNode).setConfigCenter(configCenter);
 
+                MsRegistryCenter registryCenter = new MsRegistryCenter();
+                registryCenter.setProtocol(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_PROTOCOL"));
+                registryCenter.setAddress(sampler.getPropertyAsString("FIELD_DUBBO_ADDRESS"));
+                registryCenter.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_GROUP"));
+                registryCenter.setUsername(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_USER_NAME"));
+                registryCenter.setPassword(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_PASSWORD"));
+                registryCenter.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_TIMEOUT"));
+                ((MsDubboSampler) elementNode).setRegistryCenter(registryCenter);
+
+                MsConsumerAndService consumerAndService = new MsConsumerAndService();
+                consumerAndService.setAsync(sampler.getPropertyAsString("FIELD_DUBBO_ASYNC"));
+                consumerAndService.setCluster(sampler.getPropertyAsString("FIELD_DUBBO_CLUSTER"));
+                consumerAndService.setConnections(sampler.getPropertyAsString("FIELD_DUBBO_CONNECTIONS"));
+                consumerAndService.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_GROUP"));
+                consumerAndService.setLoadBalance(sampler.getPropertyAsString("FIELD_DUBBO_LOADBALANCE"));
+                consumerAndService.setVersion(sampler.getPropertyAsString("FIELD_DUBBO_VERSION"));
+                consumerAndService.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_TIMEOUT"));
+                ((MsDubboSampler) elementNode).setConsumerAndService(consumerAndService);
+
+                List<MethodArgument> methodArguments = Constants.getMethodArgs(sampler);
+                if (CollectionUtils.isNotEmpty(methodArguments)) {
+                    List<KeyValue> methodArgs = new LinkedList<>();
+                    methodArguments.forEach(item -> {
+                        KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
+                        methodArgs.add(keyValue);
+                    });
+                    ((MsDubboSampler) elementNode).setArgs(methodArgs);
+                }
+
+                List<MethodArgument> arguments = Constants.getAttachmentArgs(sampler);
+                if (CollectionUtils.isNotEmpty(arguments)) {
+                    List<KeyValue> methodArgs = new LinkedList<>();
+                    arguments.forEach(item -> {
+                        KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
+                        methodArgs.add(keyValue);
+                    });
+                    ((MsDubboSampler) elementNode).setAttachmentArgs(methodArgs);
+                }
+
+            } else if (key instanceof JDBCSampler) {
+                MsJDBCSampler msJDBCSampler = new MsJDBCSampler();
+                JDBCSampler jdbcSampler = (JDBCSampler) key;
+                msJDBCSampler.setType("JDBCSampler");
+                msJDBCSampler.setName(jdbcSampler.getName());
+                msJDBCSampler.setProtocol("SQL");
+                msJDBCSampler.setQuery(jdbcSampler.getQuery());
+                msJDBCSampler.setQueryTimeout(Long.parseLong(jdbcSampler.getQueryTimeout()));
+                msJDBCSampler.setResultVariable(jdbcSampler.getResultVariable());
+                msJDBCSampler.setVariableNames(jdbcSampler.getVariableNames());
+                elementNode = msJDBCSampler;
             } else if (key instanceof JSR223Sampler) {
                 JSR223Sampler jsr223Sampler = (JSR223Sampler) key;
                 elementNode = new MsJSR223Processor();
@@ -201,8 +281,46 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
                 elementNode = new MsJSR223PreProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-            } else if (key instanceof MsAssertions) {
-
+            } else if (key instanceof ResponseAssertion) {
+                MsAssertionRegex assertionRegex = new MsAssertionRegex();
+                ResponseAssertion assertion = (ResponseAssertion) key;
+                assertionRegex.setDescription(assertion.getName());
+                assertionRegex.setAssumeSuccess(assertion.getAssumeSuccess());
+                assertionRegex.setExpression(assertion.getTestStrings().getStringValue());
+                if (assertion.isTestFieldRequestData()) {
+                    assertionRegex.setSubject("Response Data");
+                }
+                if (assertion.isTestFieldResponseCode()) {
+                    assertionRegex.setSubject("Response Code");
+                }
+                if (assertion.isTestFieldRequestHeaders()) {
+                    assertionRegex.setSubject("Response Headers");
+                }
+                assertions.getRegex().add(assertionRegex);
+            } else if (key instanceof JSONPathAssertion) {
+                MsAssertionJsonPath assertionJsonPath = new MsAssertionJsonPath();
+                JSONPathAssertion jsonPathAssertion = (JSONPathAssertion) key;
+                assertionJsonPath.setDescription(jsonPathAssertion.getName());
+                assertionJsonPath.setExpression(jsonPathAssertion.getJsonPath());
+                assertionJsonPath.setExpect(jsonPathAssertion.getExpectedValue());
+                assertions.getJsonPath().add(assertionJsonPath);
+            } else if (key instanceof XPath2Assertion) {
+                MsAssertionXPath2 assertionXPath2 = new MsAssertionXPath2();
+                XPath2Assertion xPath2Assertion = (XPath2Assertion) key;
+                assertionXPath2.setExpression(xPath2Assertion.getXPathString());
+                assertions.getXpath2().add(assertionXPath2);
+            } else if (key instanceof JSR223Assertion) {
+                MsAssertionJSR223 msAssertionJSR223 = new MsAssertionJSR223();
+                JSR223Assertion jsr223Assertion = (JSR223Assertion) key;
+                msAssertionJSR223.setName(jsr223Assertion.getName());
+                msAssertionJSR223.setScript(jsr223Assertion.getScript());
+                msAssertionJSR223.setScriptLanguage(jsr223Assertion.getScriptLanguage());
+                assertions.getJsr223().add(msAssertionJSR223);
+            } else if (key instanceof DurationAssertion) {
+                MsAssertionDuration assertionDuration = new MsAssertionDuration();
+                DurationAssertion durationAssertion = (DurationAssertion) key;
+                assertionDuration.setValue(durationAssertion.getProperty("DurationAssertion.duration").getIntValue());
+                assertions.setDuration(assertionDuration);
             } else if (key instanceof RegexExtractor) {
                 MsExtractRegex regex = new MsExtractRegex();
                 RegexExtractor regexExtractor = (RegexExtractor) key;
@@ -217,14 +335,25 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 } else if (regexExtractor.useUrl()) {
                     regex.setUseHeaders("URL");
                 }
-                regex.setType("Regex");
+                regex.setType("Extract");
                 regex.setExpression(regexExtractor.getRegex());
                 regex.setVariable(regexExtractor.getRefName());
-
+                extract.setName(regexExtractor.getName());
+                extract.getRegex().add(regex);
             } else if (key instanceof XPath2Extractor) {
-
+                XPath2Extractor xPath2Extractor = (XPath2Extractor) key;
+                MsExtractXPath xPath = new MsExtractXPath();
+                xPath.setVariable(xPath2Extractor.getRefName());
+                xPath.setExpression(xPath2Extractor.getXPathQuery());
+                xPath.setType("Extract");
+                extract.getXpath().add(xPath);
             } else if (key instanceof JSONPostProcessor) {
-
+                JSONPostProcessor jsonPostProcessor = (JSONPostProcessor) key;
+                MsExtractJSONPath jsonPath = new MsExtractJSONPath();
+                jsonPath.setVariable(jsonPostProcessor.getRefNames());
+                jsonPath.setExpression(jsonPostProcessor.getJsonPathExpressions());
+                jsonPath.setType("Extract");
+                extract.getJson().add(jsonPath);
             } else if (key instanceof ConstantTimer) {
                 elementNode = new MsConstantTimer();
                 BeanUtils.copyBean(elementNode, key);
@@ -269,6 +398,16 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
                 ((MsJmeterElement) elementNode).setJmeterElement(key);
             }
+            //提取参数
+            if (CollectionUtils.isNotEmpty(extract.getJson()) || CollectionUtils.isNotEmpty(extract.getRegex()) || CollectionUtils.isNotEmpty(extract.getXpath())) {
+                elementNode = extract;
+            }
+            //断言规则
+            if (CollectionUtils.isNotEmpty(assertions.getRegex()) || CollectionUtils.isNotEmpty(assertions.getJsonPath())
+                    || CollectionUtils.isNotEmpty(assertions.getJsr223()) || CollectionUtils.isNotEmpty(assertions.getXpath2()) || assertions.getDuration() != null) {
+                elementNode = assertions;
+            }
+
             elementNode.setResourceId(UUID.randomUUID().toString());
             elementNode.setId(UUID.randomUUID().toString());
             scenario.getHashTree().add(elementNode);

From e7df89b1e2ef78740fa029e3c4fb34f010e34f3e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Mon, 8 Feb 2021 18:27:22 +0800
Subject: [PATCH 11/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5jmx=E5=AF=B9=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E8=AF=B7=E6=B1=82=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 408 ++++++++++--------
 .../automation/scenario/EditApiScenario.vue   |   4 +-
 .../component/JmeterElementComponent.vue      |   2 +-
 3 files changed, 238 insertions(+), 176 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index e5c592deaf..b40763924c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -1,7 +1,6 @@
 package io.metersphere.api.dto.automation.parse;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
 import io.github.ningyu.jmeter.plugin.dubbo.sample.MethodArgument;
 import io.github.ningyu.jmeter.plugin.util.Constants;
@@ -38,6 +37,7 @@ import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.commons.constants.LoopConstants;
 import io.metersphere.commons.utils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.control.ForeachController;
@@ -55,6 +55,7 @@ import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
 import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
 import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
 import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.timers.ConstantTimer;
 import org.apache.jorphan.collections.HashTree;
@@ -74,9 +75,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             HashTree testPlan = this.getHashTree(scriptWrapper);
             MsScenario scenario = new MsScenario();
             scenario.setReferenced("REF");
-            LinkedList<MsTestElement> hashTrees = new LinkedList<>();
-            scenario.setHashTree(hashTrees);
-            getTree(testPlan, scenario);
+            jmterHashTree(testPlan, scenario);
             this.projectId = request.getProjectId();
 
             ScenarioImport scenarioImport = new ScenarioImport();
@@ -167,202 +166,251 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         msTCPSampler.setPassword(tcpSampler.getProperty(ConfigTestElement.PASSWORD).getStringValue());
     }
 
-    private void getTree(HashTree tree, MsTestElement scenario) {
+    private void convertDubboSample(MsDubboSampler elementNode, DubboSample sampler) {
+        elementNode.setType("DubboSampler");
+        elementNode.setProtocol("dubbo://");
+        elementNode.set_interface(sampler.getPropertyAsString("FIELD_DUBBO_INTERFACE"));
+        elementNode.setMethod(sampler.getPropertyAsString("FIELD_DUBBO_METHOD"));
+
+        MsConfigCenter configCenter = new MsConfigCenter();
+        configCenter.setProtocol(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_PROTOCOL"));
+        configCenter.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_GROUP"));
+        configCenter.setNamespace(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_NAMESPACE"));
+        configCenter.setUsername(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_USER_NAME"));
+        configCenter.setPassword(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_PASSWORD"));
+        configCenter.setAddress(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_ADDRESS"));
+        configCenter.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_TIMEOUT"));
+        elementNode.setConfigCenter(configCenter);
+
+        MsRegistryCenter registryCenter = new MsRegistryCenter();
+        registryCenter.setProtocol(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_PROTOCOL"));
+        registryCenter.setAddress(sampler.getPropertyAsString("FIELD_DUBBO_ADDRESS"));
+        registryCenter.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_GROUP"));
+        registryCenter.setUsername(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_USER_NAME"));
+        registryCenter.setPassword(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_PASSWORD"));
+        registryCenter.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_TIMEOUT"));
+        elementNode.setRegistryCenter(registryCenter);
+
+        MsConsumerAndService consumerAndService = new MsConsumerAndService();
+        consumerAndService.setAsync(sampler.getPropertyAsString("FIELD_DUBBO_ASYNC"));
+        consumerAndService.setCluster(sampler.getPropertyAsString("FIELD_DUBBO_CLUSTER"));
+        consumerAndService.setConnections(sampler.getPropertyAsString("FIELD_DUBBO_CONNECTIONS"));
+        consumerAndService.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_GROUP"));
+        consumerAndService.setLoadBalance(sampler.getPropertyAsString("FIELD_DUBBO_LOADBALANCE"));
+        consumerAndService.setVersion(sampler.getPropertyAsString("FIELD_DUBBO_VERSION"));
+        consumerAndService.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_TIMEOUT"));
+        elementNode.setConsumerAndService(consumerAndService);
+
+        List<MethodArgument> methodArguments = Constants.getMethodArgs(sampler);
+        if (CollectionUtils.isNotEmpty(methodArguments)) {
+            List<KeyValue> methodArgs = new LinkedList<>();
+            methodArguments.forEach(item -> {
+                KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
+                methodArgs.add(keyValue);
+            });
+            elementNode.setArgs(methodArgs);
+        }
+
+        List<MethodArgument> arguments = Constants.getAttachmentArgs(sampler);
+        if (CollectionUtils.isNotEmpty(arguments)) {
+            List<KeyValue> methodArgs = new LinkedList<>();
+            arguments.forEach(item -> {
+                KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
+                methodArgs.add(keyValue);
+            });
+            elementNode.setAttachmentArgs(methodArgs);
+        }
+    }
+
+    private void convertJDBCSampler(MsJDBCSampler msJDBCSampler, JDBCSampler jdbcSampler) {
+        msJDBCSampler.setType("JDBCSampler");
+        msJDBCSampler.setName(jdbcSampler.getName());
+        msJDBCSampler.setProtocol("SQL");
+        msJDBCSampler.setQuery(jdbcSampler.getQuery());
+        msJDBCSampler.setQueryTimeout(StringUtils.isNotEmpty(jdbcSampler.getQueryTimeout()) ? Long.parseLong(jdbcSampler.getQueryTimeout()) : 0L);
+        msJDBCSampler.setResultVariable(jdbcSampler.getResultVariable());
+        msJDBCSampler.setVariableNames(jdbcSampler.getVariableNames());
+    }
+
+    private void convertMsExtract(MsExtract extract, Object key) {
         // 提取数据单独处理
-        MsExtract extract = new MsExtract();
         extract.setType("Extract");
         extract.setJson(new LinkedList<>());
         extract.setRegex(new LinkedList<>());
         extract.setXpath(new LinkedList<>());
-        // 断言规则
-        MsAssertions assertions = new MsAssertions();
+        if (key instanceof RegexExtractor) {
+            MsExtractRegex regex = new MsExtractRegex();
+            RegexExtractor regexExtractor = (RegexExtractor) key;
+            if (regexExtractor.useRequestHeaders()) {
+                regex.setUseHeaders("request_headers");
+            } else if (regexExtractor.useBody()) {
+                regex.setUseHeaders("false");
+            } else if (regexExtractor.useUnescapedBody()) {
+                regex.setUseHeaders("unescaped");
+            } else if (regexExtractor.useBodyAsDocument()) {
+                regex.setUseHeaders("as_document");
+            } else if (regexExtractor.useUrl()) {
+                regex.setUseHeaders("URL");
+            }
+            regex.setExpression(regexExtractor.getRegex());
+            regex.setVariable(regexExtractor.getRefName());
+            extract.setName(regexExtractor.getName());
+            extract.getRegex().add(regex);
+        } else if (key instanceof XPath2Extractor) {
+            XPath2Extractor xPath2Extractor = (XPath2Extractor) key;
+            MsExtractXPath xPath = new MsExtractXPath();
+            xPath.setVariable(xPath2Extractor.getRefName());
+            xPath.setExpression(xPath2Extractor.getXPathQuery());
+
+            extract.setName(xPath2Extractor.getName());
+            extract.getXpath().add(xPath);
+        } else if (key instanceof JSONPostProcessor) {
+            JSONPostProcessor jsonPostProcessor = (JSONPostProcessor) key;
+            MsExtractJSONPath jsonPath = new MsExtractJSONPath();
+            jsonPath.setVariable(jsonPostProcessor.getRefNames());
+            jsonPath.setExpression(jsonPostProcessor.getJsonPathExpressions());
+            extract.setName(jsonPostProcessor.getName());
+            extract.getJson().add(jsonPath);
+        }
+    }
+
+    private void convertMsAssertions(MsAssertions assertions, Object key) {
         assertions.setJsonPath(new LinkedList<>());
         assertions.setJsr223(new LinkedList<>());
         assertions.setXpath2(new LinkedList<>());
+        assertions.setRegex(new LinkedList<>());
+        assertions.setDuration(new MsAssertionDuration());
         assertions.setType("Assertions");
+        if (key instanceof ResponseAssertion) {
+            MsAssertionRegex assertionRegex = new MsAssertionRegex();
+            ResponseAssertion assertion = (ResponseAssertion) key;
+            assertionRegex.setDescription(assertion.getName());
+            assertionRegex.setAssumeSuccess(assertion.getAssumeSuccess());
+            assertionRegex.setExpression(assertion.getTestStrings().getStringValue());
+            if (assertion.isTestFieldRequestData()) {
+                assertionRegex.setSubject("Response Data");
+            }
+            if (assertion.isTestFieldResponseCode()) {
+                assertionRegex.setSubject("Response Code");
+            }
+            if (assertion.isTestFieldRequestHeaders()) {
+                assertionRegex.setSubject("Response Headers");
+            }
+            assertions.setName(assertion.getName());
+            assertions.getRegex().add(assertionRegex);
+        } else if (key instanceof JSONPathAssertion) {
+            MsAssertionJsonPath assertionJsonPath = new MsAssertionJsonPath();
+            JSONPathAssertion jsonPathAssertion = (JSONPathAssertion) key;
+            assertionJsonPath.setDescription(jsonPathAssertion.getName());
+            assertionJsonPath.setExpression(jsonPathAssertion.getJsonPath());
+            assertionJsonPath.setExpect(jsonPathAssertion.getExpectedValue());
+            assertions.setName(jsonPathAssertion.getName());
+            assertions.getJsonPath().add(assertionJsonPath);
+        } else if (key instanceof XPath2Assertion) {
+            MsAssertionXPath2 assertionXPath2 = new MsAssertionXPath2();
+            XPath2Assertion xPath2Assertion = (XPath2Assertion) key;
+            assertionXPath2.setExpression(xPath2Assertion.getXPathString());
+            assertions.setName(xPath2Assertion.getName());
+            assertions.getXpath2().add(assertionXPath2);
+        } else if (key instanceof JSR223Assertion) {
+            MsAssertionJSR223 msAssertionJSR223 = new MsAssertionJSR223();
+            JSR223Assertion jsr223Assertion = (JSR223Assertion) key;
+            msAssertionJSR223.setName(jsr223Assertion.getName());
+            msAssertionJSR223.setScript(jsr223Assertion.getScript());
+            msAssertionJSR223.setScriptLanguage(jsr223Assertion.getScriptLanguage());
+            assertions.setName(jsr223Assertion.getName());
+
+            assertions.getJsr223().add(msAssertionJSR223);
+        } else if (key instanceof DurationAssertion) {
+            MsAssertionDuration assertionDuration = new MsAssertionDuration();
+            DurationAssertion durationAssertion = (DurationAssertion) key;
+            assertionDuration.setValue(durationAssertion.getProperty("DurationAssertion.duration").getIntValue());
+            assertions.setName(durationAssertion.getName());
+            assertions.setDuration(assertionDuration);
+        }
+    }
+
+    private void jmterHashTree(HashTree tree, MsTestElement scenario) {
         for (Object key : tree.keySet()) {
             MsTestElement elementNode = null;
             if (CollectionUtils.isEmpty(scenario.getHashTree())) {
                 scenario.setHashTree(new LinkedList<>());
             }
+            // 测试计划
             if (key instanceof TestPlan) {
                 scenario.setName(((TestPlan) key).getName());
                 elementNode = new MsJmeterElement();
-                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
-                elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
+                elementNode.setName(((TestPlan) key).getName());
                 ((MsJmeterElement) elementNode).setJmeterElement(key);
-            } else if (key instanceof ThreadGroup) {
+            }
+            // 线程组
+            else if (key instanceof ThreadGroup) {
                 elementNode = new MsScenario(((ThreadGroup) key).getName());
-            } else if (key instanceof HTTPSamplerProxy) {
+            }
+            // HTTP请求
+            else if (key instanceof HTTPSamplerProxy) {
                 elementNode = new MsHTTPSamplerProxy();
                 ((MsHTTPSamplerProxy) elementNode).setBody(new Body());
                 convertHttpSampler((MsHTTPSamplerProxy) elementNode, (HTTPSamplerProxy) key);
-            } else if (key instanceof TCPSampler) {
+            }
+            // TCP请求
+            else if (key instanceof TCPSampler) {
                 elementNode = new MsTCPSampler();
                 TCPSampler tcpSampler = (TCPSampler) key;
                 convertTCPSampler((MsTCPSampler) elementNode, tcpSampler);
-            } else if (key instanceof DubboSample) {
+            }
+            // DUBBO请求
+            else if (key instanceof DubboSample) {
                 DubboSample sampler = (DubboSample) key;
                 elementNode = new MsDubboSampler();
-                elementNode.setType("DubboSampler");
-                ((MsDubboSampler) elementNode).setProtocol("dubbo://");
-                ((MsDubboSampler) elementNode).set_interface(sampler.getPropertyAsString("FIELD_DUBBO_INTERFACE"));
-                ((MsDubboSampler) elementNode).setMethod(sampler.getPropertyAsString("FIELD_DUBBO_METHOD"));
-
-                MsConfigCenter configCenter = new MsConfigCenter();
-                configCenter.setProtocol(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_PROTOCOL"));
-                configCenter.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_GROUP"));
-                configCenter.setNamespace(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_NAMESPACE"));
-                configCenter.setUsername(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_USER_NAME"));
-                configCenter.setPassword(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_PASSWORD"));
-                configCenter.setAddress(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_ADDRESS"));
-                configCenter.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_CONFIG_CENTER_TIMEOUT"));
-                ((MsDubboSampler) elementNode).setConfigCenter(configCenter);
-
-                MsRegistryCenter registryCenter = new MsRegistryCenter();
-                registryCenter.setProtocol(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_PROTOCOL"));
-                registryCenter.setAddress(sampler.getPropertyAsString("FIELD_DUBBO_ADDRESS"));
-                registryCenter.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_GROUP"));
-                registryCenter.setUsername(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_USER_NAME"));
-                registryCenter.setPassword(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_PASSWORD"));
-                registryCenter.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_REGISTRY_TIMEOUT"));
-                ((MsDubboSampler) elementNode).setRegistryCenter(registryCenter);
-
-                MsConsumerAndService consumerAndService = new MsConsumerAndService();
-                consumerAndService.setAsync(sampler.getPropertyAsString("FIELD_DUBBO_ASYNC"));
-                consumerAndService.setCluster(sampler.getPropertyAsString("FIELD_DUBBO_CLUSTER"));
-                consumerAndService.setConnections(sampler.getPropertyAsString("FIELD_DUBBO_CONNECTIONS"));
-                consumerAndService.setGroup(sampler.getPropertyAsString("FIELD_DUBBO_GROUP"));
-                consumerAndService.setLoadBalance(sampler.getPropertyAsString("FIELD_DUBBO_LOADBALANCE"));
-                consumerAndService.setVersion(sampler.getPropertyAsString("FIELD_DUBBO_VERSION"));
-                consumerAndService.setTimeout(sampler.getPropertyAsString("FIELD_DUBBO_TIMEOUT"));
-                ((MsDubboSampler) elementNode).setConsumerAndService(consumerAndService);
-
-                List<MethodArgument> methodArguments = Constants.getMethodArgs(sampler);
-                if (CollectionUtils.isNotEmpty(methodArguments)) {
-                    List<KeyValue> methodArgs = new LinkedList<>();
-                    methodArguments.forEach(item -> {
-                        KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
-                        methodArgs.add(keyValue);
-                    });
-                    ((MsDubboSampler) elementNode).setArgs(methodArgs);
-                }
-
-                List<MethodArgument> arguments = Constants.getAttachmentArgs(sampler);
-                if (CollectionUtils.isNotEmpty(arguments)) {
-                    List<KeyValue> methodArgs = new LinkedList<>();
-                    arguments.forEach(item -> {
-                        KeyValue keyValue = new KeyValue(item.getParamType(), item.getParamValue());
-                        methodArgs.add(keyValue);
-                    });
-                    ((MsDubboSampler) elementNode).setAttachmentArgs(methodArgs);
-                }
-
-            } else if (key instanceof JDBCSampler) {
-                MsJDBCSampler msJDBCSampler = new MsJDBCSampler();
+                convertDubboSample((MsDubboSampler) elementNode, sampler);
+            }
+            // JDBC请求
+            else if (key instanceof JDBCSampler) {
+                elementNode = new MsJDBCSampler();
                 JDBCSampler jdbcSampler = (JDBCSampler) key;
-                msJDBCSampler.setType("JDBCSampler");
-                msJDBCSampler.setName(jdbcSampler.getName());
-                msJDBCSampler.setProtocol("SQL");
-                msJDBCSampler.setQuery(jdbcSampler.getQuery());
-                msJDBCSampler.setQueryTimeout(Long.parseLong(jdbcSampler.getQueryTimeout()));
-                msJDBCSampler.setResultVariable(jdbcSampler.getResultVariable());
-                msJDBCSampler.setVariableNames(jdbcSampler.getVariableNames());
-                elementNode = msJDBCSampler;
+                convertJDBCSampler((MsJDBCSampler) elementNode, jdbcSampler);
             } else if (key instanceof JSR223Sampler) {
                 JSR223Sampler jsr223Sampler = (JSR223Sampler) key;
                 elementNode = new MsJSR223Processor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-            } else if (key instanceof JSR223PostProcessor) {
+            }
+            // 后置脚本
+            else if (key instanceof JSR223PostProcessor) {
                 JSR223PostProcessor jsr223Sampler = (JSR223PostProcessor) key;
                 elementNode = new MsJSR223PostProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-            } else if (key instanceof JSR223PreProcessor) {
+            }
+            // 前置脚本
+            else if (key instanceof JSR223PreProcessor) {
                 JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
                 elementNode = new MsJSR223PreProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-            } else if (key instanceof ResponseAssertion) {
-                MsAssertionRegex assertionRegex = new MsAssertionRegex();
-                ResponseAssertion assertion = (ResponseAssertion) key;
-                assertionRegex.setDescription(assertion.getName());
-                assertionRegex.setAssumeSuccess(assertion.getAssumeSuccess());
-                assertionRegex.setExpression(assertion.getTestStrings().getStringValue());
-                if (assertion.isTestFieldRequestData()) {
-                    assertionRegex.setSubject("Response Data");
-                }
-                if (assertion.isTestFieldResponseCode()) {
-                    assertionRegex.setSubject("Response Code");
-                }
-                if (assertion.isTestFieldRequestHeaders()) {
-                    assertionRegex.setSubject("Response Headers");
-                }
-                assertions.getRegex().add(assertionRegex);
-            } else if (key instanceof JSONPathAssertion) {
-                MsAssertionJsonPath assertionJsonPath = new MsAssertionJsonPath();
-                JSONPathAssertion jsonPathAssertion = (JSONPathAssertion) key;
-                assertionJsonPath.setDescription(jsonPathAssertion.getName());
-                assertionJsonPath.setExpression(jsonPathAssertion.getJsonPath());
-                assertionJsonPath.setExpect(jsonPathAssertion.getExpectedValue());
-                assertions.getJsonPath().add(assertionJsonPath);
-            } else if (key instanceof XPath2Assertion) {
-                MsAssertionXPath2 assertionXPath2 = new MsAssertionXPath2();
-                XPath2Assertion xPath2Assertion = (XPath2Assertion) key;
-                assertionXPath2.setExpression(xPath2Assertion.getXPathString());
-                assertions.getXpath2().add(assertionXPath2);
-            } else if (key instanceof JSR223Assertion) {
-                MsAssertionJSR223 msAssertionJSR223 = new MsAssertionJSR223();
-                JSR223Assertion jsr223Assertion = (JSR223Assertion) key;
-                msAssertionJSR223.setName(jsr223Assertion.getName());
-                msAssertionJSR223.setScript(jsr223Assertion.getScript());
-                msAssertionJSR223.setScriptLanguage(jsr223Assertion.getScriptLanguage());
-                assertions.getJsr223().add(msAssertionJSR223);
-            } else if (key instanceof DurationAssertion) {
-                MsAssertionDuration assertionDuration = new MsAssertionDuration();
-                DurationAssertion durationAssertion = (DurationAssertion) key;
-                assertionDuration.setValue(durationAssertion.getProperty("DurationAssertion.duration").getIntValue());
-                assertions.setDuration(assertionDuration);
-            } else if (key instanceof RegexExtractor) {
-                MsExtractRegex regex = new MsExtractRegex();
-                RegexExtractor regexExtractor = (RegexExtractor) key;
-                if (regexExtractor.useRequestHeaders()) {
-                    regex.setUseHeaders("request_headers");
-                } else if (regexExtractor.useBody()) {
-                    regex.setUseHeaders("false");
-                } else if (regexExtractor.useUnescapedBody()) {
-                    regex.setUseHeaders("unescaped");
-                } else if (regexExtractor.useBodyAsDocument()) {
-                    regex.setUseHeaders("as_document");
-                } else if (regexExtractor.useUrl()) {
-                    regex.setUseHeaders("URL");
-                }
-                regex.setType("Extract");
-                regex.setExpression(regexExtractor.getRegex());
-                regex.setVariable(regexExtractor.getRefName());
-                extract.setName(regexExtractor.getName());
-                extract.getRegex().add(regex);
-            } else if (key instanceof XPath2Extractor) {
-                XPath2Extractor xPath2Extractor = (XPath2Extractor) key;
-                MsExtractXPath xPath = new MsExtractXPath();
-                xPath.setVariable(xPath2Extractor.getRefName());
-                xPath.setExpression(xPath2Extractor.getXPathQuery());
-                xPath.setType("Extract");
-                extract.getXpath().add(xPath);
-            } else if (key instanceof JSONPostProcessor) {
-                JSONPostProcessor jsonPostProcessor = (JSONPostProcessor) key;
-                MsExtractJSONPath jsonPath = new MsExtractJSONPath();
-                jsonPath.setVariable(jsonPostProcessor.getRefNames());
-                jsonPath.setExpression(jsonPostProcessor.getJsonPathExpressions());
-                jsonPath.setType("Extract");
-                extract.getJson().add(jsonPath);
-            } else if (key instanceof ConstantTimer) {
+            }
+            // 提取参数
+            else if (key instanceof ResponseAssertion || key instanceof JSONPathAssertion || key instanceof XPath2Assertion || key instanceof JSR223Assertion || key instanceof DurationAssertion) {
+                elementNode = new MsAssertions();
+                convertMsAssertions((MsAssertions) elementNode, key);
+            }
+            // 断言规则
+            else if (key instanceof RegexExtractor || key instanceof XPath2Extractor || key instanceof JSONPostProcessor) {
+                elementNode = new MsExtract();
+                convertMsExtract((MsExtract) elementNode, key);
+            }
+            // 定时器
+            else if (key instanceof ConstantTimer) {
                 elementNode = new MsConstantTimer();
                 BeanUtils.copyBean(elementNode, key);
                 elementNode.setType("ConstantTimer");
-            } else if (key instanceof IfController) {
+            }
+            // IF条件控制器
+            else if (key instanceof IfController) {
                 elementNode = new MsIfController();
                 BeanUtils.copyBean(elementNode, key);
                 elementNode.setType("IfController");
-            } else if (key instanceof LoopController) {
+            }
+            // 次数循环控制器
+            else if (key instanceof LoopController) {
                 elementNode = new MsLoopController();
                 BeanUtils.copyBean(elementNode, key);
                 elementNode.setType("LoopController");
@@ -372,7 +420,9 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 countController.setLoops(loopController.getLoops());
                 countController.setProceed(true);
                 ((MsLoopController) elementNode).setCountController(countController);
-            } else if (key instanceof WhileController) {
+            }
+            // While循环控制器
+            else if (key instanceof WhileController) {
                 elementNode = new MsLoopController();
                 BeanUtils.copyBean(elementNode, key);
                 elementNode.setType("LoopController");
@@ -381,7 +431,9 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 MsWhileController countController = new MsWhileController();
                 countController.setValue(whileController.getCondition());
                 ((MsLoopController) elementNode).setWhileController(countController);
-            } else if (key instanceof ForeachController) {
+            }
+            // Foreach 循环控制器
+            else if (key instanceof ForeachController) {
                 elementNode = new MsLoopController();
                 BeanUtils.copyBean(elementNode, key);
                 elementNode.setType("LoopController");
@@ -391,29 +443,39 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 countController.setInputVal(foreachController.getInputValString());
                 countController.setReturnVal(foreachController.getReturnValString());
                 ((MsLoopController) elementNode).setForEachController(countController);
-            } else {
+            }
+            // 平台不能识别的Jmeter步骤
+            else {
                 elementNode = new MsJmeterElement();
                 elementNode.setType("JmeterElement");
-                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(key));
-                elementNode.setName(jsonObject.get("name") == null ? "" : jsonObject.get("name").toString());
+                TestElement testElement = (TestElement) key;
+                elementNode.setName(testElement.getName());
                 ((MsJmeterElement) elementNode).setJmeterElement(key);
             }
-            //提取参数
-            if (CollectionUtils.isNotEmpty(extract.getJson()) || CollectionUtils.isNotEmpty(extract.getRegex()) || CollectionUtils.isNotEmpty(extract.getXpath())) {
-                elementNode = extract;
-            }
-            //断言规则
-            if (CollectionUtils.isNotEmpty(assertions.getRegex()) || CollectionUtils.isNotEmpty(assertions.getJsonPath())
-                    || CollectionUtils.isNotEmpty(assertions.getJsr223()) || CollectionUtils.isNotEmpty(assertions.getXpath2()) || assertions.getDuration() != null) {
-                elementNode = assertions;
-            }
-
             elementNode.setResourceId(UUID.randomUUID().toString());
             elementNode.setId(UUID.randomUUID().toString());
-            scenario.getHashTree().add(elementNode);
+            elementNode.setIndex(scenario.getHashTree().size() + 1 + "");
+            // 提取参数
+            if (elementNode instanceof MsExtract) {
+                if (CollectionUtils.isNotEmpty(((MsExtract) elementNode).getJson()) || CollectionUtils.isNotEmpty(((MsExtract) elementNode).getRegex()) || CollectionUtils.isNotEmpty(((MsExtract) elementNode).getXpath())) {
+                    scenario.getHashTree().add(elementNode);
+                }
+            }
+            //断言规则
+            else if (elementNode instanceof MsAssertions) {
+                if (CollectionUtils.isNotEmpty(((MsAssertions) elementNode).getRegex()) || CollectionUtils.isNotEmpty(((MsAssertions) elementNode).getJsonPath())
+                        || CollectionUtils.isNotEmpty(((MsAssertions) elementNode).getJsr223()) || CollectionUtils.isNotEmpty(((MsAssertions) elementNode).getXpath2()) || ((MsAssertions) elementNode).getDuration() != null) {
+                    scenario.getHashTree().add(elementNode);
+                }
+            }
+            // 争取其他请求
+            else {
+                scenario.getHashTree().add(elementNode);
+            }
+            // 递归子项
             HashTree node = tree.get(key);
             if (node != null) {
-                getTree(node, elementNode);
+                jmterHashTree(node, elementNode);
             }
         }
     }
diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 21ffb284f9..67122ce1ac 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -393,7 +393,7 @@
           },
           {
             title: this.$t('api_test.automation.scenario_import'),
-            show: this.operatingElements.indexOf('scenario') === 0,
+            show: this.operatingElements && this.operatingElements.indexOf('scenario') === 0,
             titleColor: "#606266",
             titleBgColor: "#F4F4F5",
             icon: "movie",
@@ -437,7 +437,7 @@
       },
       showButton(...names) {
         for (const name of names) {
-          if (this.operatingElements.includes(name)) {
+          if (name && this.operatingElements && this.operatingElements.includes(name)) {
             return true;
           }
         }
diff --git a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
index 403c117df7..9f44b0dd85 100644
--- a/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/JmeterElementComponent.vue
@@ -34,7 +34,7 @@
       request: {
         type: Object,
       },
-      defTitle: {type: String, default: "Jmeter组建"},
+      defTitle: {type: String, default: "Jmeter组件"},
       defColor: {type: String, default: "#606260"},
       defBackgroundColor: {type: String, default: "#F4F4FF"},
       node: {},

From 16283572c7d42665e6fc322f016bbd8fd8f8b992 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 9 Feb 2021 14:56:14 +0800
Subject: [PATCH 12/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5jmx=20=E5=A2=9E=E5=8A=A0HashTre?=
 =?UTF-8?q?e=20=E6=9C=89=E5=BA=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  |    2 +-
 .../base/mapper/SwaggerUrlProjectMapper.xml   |  437 ++++---
 .../apache/jorphan/collections/HashTree.java  | 1095 +++++++++++++++++
 3 files changed, 1313 insertions(+), 221 deletions(-)
 create mode 100644 backend/src/main/java/org/apache/jorphan/collections/HashTree.java

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index b40763924c..e1030e02e1 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -332,7 +332,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
 
     private void jmterHashTree(HashTree tree, MsTestElement scenario) {
         for (Object key : tree.keySet()) {
-            MsTestElement elementNode = null;
+            MsTestElement elementNode;
             if (CollectionUtils.isEmpty(scenario.getHashTree())) {
                 scenario.setHashTree(new LinkedList<>());
             }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
index e520c74530..ffa39fb45e 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
@@ -1,231 +1,228 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.metersphere.base.mapper.SwaggerUrlProjectMapper">
-    <resultMap id="BaseResultMap" type="io.metersphere.base.domain.SwaggerUrlProject">
-        <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="project_id" jdbcType="VARCHAR" property="projectId"/>
-        <result column="swagger_url" jdbcType="VARCHAR" property="swaggerUrl"/>
-        <result column="module_id" jdbcType="VARCHAR" property="moduleId"/>
-        <result column="module_path" jdbcType="VARCHAR" property="modulePath"/>
-        <result column="mode_id" jdbcType="VARCHAR" property="modeId"/>
-    </resultMap>
-    <sql id="Example_Where_Clause">
-        <where>
-            <foreach collection="oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
-                                <when test="criterion.noValue">
-                                    and ${criterion.condition}
-                                </when>
-                                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
-                                </when>
-                                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                </when>
-                                <when test="criterion.listValue">
-                                    and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
-                                             separator=",">
-                                        #{listItem}
-                                    </foreach>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
+  <resultMap id="BaseResultMap" type="io.metersphere.base.domain.SwaggerUrlProject">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="swagger_url" jdbcType="VARCHAR" property="swaggerUrl" />
+    <result column="module_id" jdbcType="VARCHAR" property="moduleId" />
+    <result column="module_path" jdbcType="VARCHAR" property="modulePath" />
+    <result column="mode_id" jdbcType="VARCHAR" property="modeId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
             </foreach>
-        </where>
-    </sql>
-    <sql id="Update_By_Example_Where_Clause">
-        <where>
-            <foreach collection="example.oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
-                                <when test="criterion.noValue">
-                                    and ${criterion.condition}
-                                </when>
-                                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
-                                </when>
-                                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                </when>
-                                <when test="criterion.listValue">
-                                    and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
-                                             separator=",">
-                                        #{listItem}
-                                    </foreach>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
             </foreach>
-        </where>
-    </sql>
-    <sql id="Base_Column_List">
-        id, project_id, swagger_url, module_id, module_path, mode_id
-    </sql>
-    <select id="selectByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample"
-            resultMap="BaseResultMap">
-        select
-        <if test="distinct">
-            distinct
+          </trim>
         </if>
-        <include refid="Base_Column_List"/>
-        from swagger_url_project
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-        <if test="orderByClause != null">
-            order by ${orderByClause}
-        </if>
-    </select>
-    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from swagger_url_project
-        where id = #{id,jdbcType=VARCHAR}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-        delete
-        from swagger_url_project
-        where id = #{id,jdbcType=VARCHAR}
-    </delete>
-    <delete id="deleteByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample">
-        delete from swagger_url_project
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-    </delete>
-    <insert id="insert" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
-        insert into swagger_url_project (id, project_id, swagger_url,
-                                         module_id, module_path, mode_id)
-        values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{swaggerUrl,jdbcType=VARCHAR},
-                #{moduleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{modeId,jdbcType=VARCHAR})
-    </insert>
-    <insert id="insertSelective" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
-        insert into swagger_url_project
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="projectId != null">
-                project_id,
-            </if>
-            <if test="swaggerUrl != null">
-                swagger_url,
-            </if>
-            <if test="moduleId != null">
-                module_id,
-            </if>
-            <if test="modulePath != null">
-                module_path,
-            </if>
-            <if test="modeId != null">
-                mode_id,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=VARCHAR},
-            </if>
-            <if test="projectId != null">
-                #{projectId,jdbcType=VARCHAR},
-            </if>
-            <if test="swaggerUrl != null">
-                #{swaggerUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="moduleId != null">
-                #{moduleId,jdbcType=VARCHAR},
-            </if>
-            <if test="modulePath != null">
-                #{modulePath,jdbcType=VARCHAR},
-            </if>
-            <if test="modeId != null">
-                #{modeId,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <select id="countByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample"
-            resultType="java.lang.Long">
-        select count(*) from swagger_url_project
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-    </select>
-    <update id="updateByExampleSelective" parameterType="map">
-        update swagger_url_project
-        <set>
-            <if test="record.id != null">
-                id = #{record.id,jdbcType=VARCHAR},
-            </if>
-            <if test="record.projectId != null">
-                project_id = #{record.projectId,jdbcType=VARCHAR},
-            </if>
-            <if test="record.swaggerUrl != null">
-                swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="record.moduleId != null">
-                module_id = #{record.moduleId,jdbcType=VARCHAR},
-            </if>
-            <if test="record.modulePath != null">
-                module_path = #{record.modulePath,jdbcType=VARCHAR},
-            </if>
-            <if test="record.modeId != null">
-                mode_id = #{record.modeId,jdbcType=VARCHAR},
-            </if>
-        </set>
-        <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause"/>
-        </if>
-    </update>
-    <update id="updateByExample" parameterType="map">
-        update swagger_url_project
-        set id = #{record.id,jdbcType=VARCHAR},
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, project_id, swagger_url, module_id, module_path, mode_id
+  </sql>
+  <select id="selectByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from swagger_url_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from swagger_url_project
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from swagger_url_project
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample">
+    delete from swagger_url_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
+    insert into swagger_url_project (id, project_id, swagger_url, 
+      module_id, module_path, mode_id
+      )
+    values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{swaggerUrl,jdbcType=VARCHAR}, 
+      #{moduleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{modeId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
+    insert into swagger_url_project
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="swaggerUrl != null">
+        swagger_url,
+      </if>
+      <if test="moduleId != null">
+        module_id,
+      </if>
+      <if test="modulePath != null">
+        module_path,
+      </if>
+      <if test="modeId != null">
+        mode_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="swaggerUrl != null">
+        #{swaggerUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="moduleId != null">
+        #{moduleId,jdbcType=VARCHAR},
+      </if>
+      <if test="modulePath != null">
+        #{modulePath,jdbcType=VARCHAR},
+      </if>
+      <if test="modeId != null">
+        #{modeId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.metersphere.base.domain.SwaggerUrlProjectExample" resultType="java.lang.Long">
+    select count(*) from swagger_url_project
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update swagger_url_project
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectId != null">
         project_id = #{record.projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.swaggerUrl != null">
         swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.moduleId != null">
         module_id = #{record.moduleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modulePath != null">
         module_path = #{record.modulePath,jdbcType=VARCHAR},
-        mode_id = #{record.modeId,jdbcType=VARCHAR}
-        <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause"/>
-        </if>
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
-        update swagger_url_project
-        <set>
-            <if test="projectId != null">
-                project_id = #{projectId,jdbcType=VARCHAR},
-            </if>
-            <if test="swaggerUrl != null">
-                swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="moduleId != null">
-                module_id = #{moduleId,jdbcType=VARCHAR},
-            </if>
-            <if test="modulePath != null">
-                module_path = #{modulePath,jdbcType=VARCHAR},
-            </if>
-            <if test="modeId != null">
-                mode_id = #{modeId,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=VARCHAR}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
-        update swagger_url_project
-        set project_id  = #{projectId,jdbcType=VARCHAR},
-            swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
-            module_id   = #{moduleId,jdbcType=VARCHAR},
-            module_path = #{modulePath,jdbcType=VARCHAR},
-            mode_id     = #{modeId,jdbcType=VARCHAR}
-        where id = #{id,jdbcType=VARCHAR}
-    </update>
+      </if>
+      <if test="record.modeId != null">
+        mode_id = #{record.modeId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update swagger_url_project
+    set id = #{record.id,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
+      module_id = #{record.moduleId,jdbcType=VARCHAR},
+      module_path = #{record.modulePath,jdbcType=VARCHAR},
+      mode_id = #{record.modeId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
+    update swagger_url_project
+    <set>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="swaggerUrl != null">
+        swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="moduleId != null">
+        module_id = #{moduleId,jdbcType=VARCHAR},
+      </if>
+      <if test="modulePath != null">
+        module_path = #{modulePath,jdbcType=VARCHAR},
+      </if>
+      <if test="modeId != null">
+        mode_id = #{modeId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.metersphere.base.domain.SwaggerUrlProject">
+    update swagger_url_project
+    set project_id = #{projectId,jdbcType=VARCHAR},
+      swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
+      module_id = #{moduleId,jdbcType=VARCHAR},
+      module_path = #{modulePath,jdbcType=VARCHAR},
+      mode_id = #{modeId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/org/apache/jorphan/collections/HashTree.java b/backend/src/main/java/org/apache/jorphan/collections/HashTree.java
new file mode 100644
index 0000000000..828ab5861a
--- /dev/null
+++ b/backend/src/main/java/org/apache/jorphan/collections/HashTree.java
@@ -0,0 +1,1095 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jorphan.collections;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.*;
+
+/**
+ * This class is used to create a tree structure of objects. Each element in the
+ * tree is also a key to the next node down in the tree. It provides many ways
+ * to add objects and branches, as well as many ways to retrieve.
+ * <p>
+ * HashTree implements the Map interface for convenience reasons. The main
+ * difference between a Map and a HashTree is that the HashTree organizes the
+ * data into a recursive tree structure, and provides the means to manipulate
+ * that structure.
+ * <p>
+ * Of special interest is the {@link #traverse(HashTreeTraverser)} method, which
+ * provides an expedient way to traverse any HashTree by implementing the
+ * {@link HashTreeTraverser} interface in order to perform some operation on the
+ * tree, or to extract information from the tree.
+ *
+ * @see HashTreeTraverser
+ * @see SearchByClass
+ */
+public class HashTree implements Serializable, Map<Object, HashTree>, Cloneable {
+
+    private static final long serialVersionUID = 240L;
+
+    // Used for the RuntimeException to short-circuit the traversal
+    private static final String FOUND = "found"; // $NON-NLS-1$
+
+    // N.B. The keys can be either JMeterTreeNode or TestElement
+    protected final Map<Object, HashTree> data;
+
+    /**
+     * Creates an empty new HashTree.
+     */
+    public HashTree() {
+        this(null, null);
+    }
+
+    /**
+     * Allow subclasses to provide their own Map.
+     * @param _map {@link Map} to use
+     */
+    protected HashTree(Map<Object, HashTree> _map) {
+        this(_map, null);
+    }
+
+    /**
+     * Creates a new HashTree and adds the given object as a top-level node.
+     *
+     * @param key
+     *            name of the new top-level node
+     */
+    public HashTree(Object key) {
+        this(new LinkedHashMap<Object, HashTree>(), key);
+    }
+
+    /**
+     * Uses the new HashTree if not null and adds the given object as a
+     * top-level node if not null
+     *
+     * @param _map
+     *            the map to be used. If <code>null</code> a new {@link LinkedHashMap}
+     *            will be created
+     * @param key
+     *            the object to be used as the key for the root node (may be
+     *            <code>null</code>, in which case no root node will be created)
+     */
+    private HashTree(Map<Object, HashTree> _map, Object key) {
+        if(_map != null) {
+            data = _map;
+        } else {
+            data = new LinkedHashMap<>();
+        }
+        if(key != null) {
+            data.put(key, new HashTree());
+        }
+    }
+
+    /**
+     * The Map given must also be a HashTree, otherwise an
+     * UnsupportedOperationException is thrown. If it is a HashTree, this is
+     * like calling the add(HashTree) method.
+     *
+     * @see #add(HashTree)
+     * @see Map#putAll(Map)
+     */
+    @Override
+    public void putAll(Map<?, ? extends HashTree> map) {
+        if (map instanceof HashTree) {
+            this.add((HashTree) map);
+        } else {
+            throw new UnsupportedOperationException("can only putAll other HashTree objects");
+        }
+    }
+
+    /**
+     * Exists to satisfy the Map interface.
+     *
+     * @see Map#entrySet()
+     */
+    @Override
+    public Set<Entry<Object, HashTree>> entrySet() {
+        return data.entrySet();
+    }
+
+    /**
+     * Implemented as required by the Map interface, but is not very useful
+     * here. All 'values' in a HashTree are HashTree's themselves.
+     *
+     * @param value
+     *            Object to be tested as a value.
+     * @return True if the HashTree contains the value, false otherwise.
+     * @see Map#containsValue(Object)
+     */
+    @Override
+    public boolean containsValue(Object value) {
+        return data.containsValue(value);
+    }
+
+    /**
+     * This is the same as calling HashTree.add(key,value).
+     *
+     * @param key
+     *            to use
+     * @param value
+     *            to store against key
+     * @see Map#put(Object, Object)
+     */
+    @Override
+    public HashTree put(Object key, HashTree value) {
+        HashTree previous = data.get(key);
+        add(key, value);
+        return previous;
+    }
+
+    /**
+     * Clears the HashTree of all contents.
+     *
+     * @see Map#clear()
+     */
+    @Override
+    public void clear() {
+        data.clear();
+    }
+
+    /**
+     * Returns a collection of all the sub-trees of the current tree.
+     *
+     * @see Map#values()
+     */
+    @Override
+    public Collection<HashTree> values() {
+        return data.values();
+    }
+
+    /**
+     * Adds a key as a node at the current level and then adds the given
+     * HashTree to that new node.
+     *
+     * @param key
+     *            key to create in this tree
+     * @param subTree
+     *            sub tree to add to the node created for the first argument.
+     */
+    public void add(Object key, HashTree subTree) {
+        add(key).add(subTree);
+    }
+
+    /**
+     * Adds all the nodes and branches of the given tree to this tree. Is like
+     * merging two trees. Duplicates are ignored.
+     *
+     * @param newTree the tree to be added
+     */
+    public void add(HashTree newTree) {
+        for (Object item : newTree.list()) {
+            add(item).add(newTree.getTree(item));
+        }
+    }
+
+    /**
+     * Creates a new HashTree and adds all the objects in the given collection
+     * as top-level nodes in the tree.
+     *
+     * @param keys
+     *            a collection of objects to be added to the created HashTree.
+     */
+    public HashTree(Collection<?> keys) {
+        data = new LinkedHashMap<>();
+        for (Object o : keys) {
+            data.put(o, new HashTree());
+        }
+    }
+
+    /**
+     * Creates a new HashTree and adds all the objects in the given array as
+     * top-level nodes in the tree.
+     *
+     * @param keys
+     *            array with names for the new top-level nodes
+     */
+    public HashTree(Object[] keys) {
+        data = new LinkedHashMap<>();
+        for (Object key : keys) {
+            data.put(key, new HashTree());
+        }
+    }
+
+    /**
+     * If the HashTree contains the given object as a key at the top level, then
+     * a true result is returned, otherwise false.
+     *
+     * @param o
+     *            Object to be tested as a key.
+     * @return True if the HashTree contains the key, false otherwise.
+     * @see Map#containsKey(Object)
+     */
+    @Override
+    public boolean containsKey(Object o) {
+        return data.containsKey(o);
+    }
+
+    /**
+     * If the HashTree is empty, true is returned, false otherwise.
+     *
+     * @return True if HashTree is empty, false otherwise.
+     */
+    @Override
+    public boolean isEmpty() {
+        return data.isEmpty();
+    }
+
+    /**
+     * Sets a key and it's value in the HashTree. It actually sets up a key, and
+     * then creates a node for the key and sets the value to the new node, as a
+     * key. Any previous nodes that existed under the given key are lost.
+     *
+     * @param key
+     *            key to be set up
+     * @param value
+     *            value to be set up as a key in the secondary node
+     */
+    public void set(Object key, Object value) {
+        data.put(key, createNewTree(value));
+    }
+
+    /**
+     * Sets a key into the current tree and assigns it a HashTree as its
+     * subtree. Any previous entries under the given key are removed.
+     *
+     * @param key
+     *            key to be set up
+     * @param t
+     *            HashTree that the key maps to
+     */
+    public void set(Object key, HashTree t) {
+        data.put(key, t);
+    }
+
+    /**
+     * Sets a key and its values in the HashTree. It sets up a key in the
+     * current node, and then creates a node for that key, and sets all the
+     * values in the array as keys in the new node. Any keys previously held
+     * under the given key are lost.
+     *
+     * @param key
+     *            Key to be set up
+     * @param values
+     *            Array of objects to be added as keys in the secondary node
+     */
+    public void set(Object key, Object[] values) {
+        data.put(key, createNewTree(Arrays.asList(values)));
+    }
+
+    /**
+     * Sets a key and its values in the HashTree. It sets up a key in the
+     * current node, and then creates a node for that key, and set all the
+     * values in the array as keys in the new node. Any keys previously held
+     * under the given key are removed.
+     *
+     * @param key
+     *            key to be set up
+     * @param values
+     *            Collection of objects to be added as keys in the secondary
+     *            node
+     */
+    public void set(Object key, Collection<?> values) {
+        data.put(key, createNewTree(values));
+    }
+
+    /**
+     * Sets a series of keys into the HashTree. It sets up the first object in
+     * the key array as a key in the current node, recurses into the next
+     * HashTree node through that key and adds the second object in the array.
+     * Continues recursing in this manner until the end of the first array is
+     * reached, at which point all the values of the second array are set as
+     * keys to the bottom-most node. All previous keys of that bottom-most node
+     * are removed.
+     *
+     * @param treePath
+     *            array of keys to put into HashTree
+     * @param values
+     *            array of values to be added as keys to bottom-most node
+     */
+    public void set(Object[] treePath, Object[] values) {
+        if (treePath != null && values != null) {
+            set(Arrays.asList(treePath), Arrays.asList(values));
+        }
+    }
+
+    /**
+     * Sets a series of keys into the HashTree. It sets up the first object in
+     * the key array as a key in the current node, recurses into the next
+     * HashTree node through that key and adds the second object in the array.
+     * Continues recursing in this manner until the end of the first array is
+     * reached, at which point all the values of the Collection of values are
+     * set as keys to the bottom-most node. Any keys previously held by the
+     * bottom-most node are lost.
+     *
+     * @param treePath
+     *            array of keys to put into HashTree
+     * @param values
+     *            Collection of values to be added as keys to bottom-most node
+     */
+    public void set(Object[] treePath, Collection<?> values) {
+        if (treePath != null) {
+            set(Arrays.asList(treePath), values);
+        }
+    }
+
+    /**
+     * Sets a series of keys into the HashTree. It sets up the first object in
+     * the key list as a key in the current node, recurses into the next
+     * HashTree node through that key and adds the second object in the list.
+     * Continues recursing in this manner until the end of the first list is
+     * reached, at which point all the values of the array of values are set as
+     * keys to the bottom-most node. Any previously existing keys of that bottom
+     * node are removed.
+     *
+     * @param treePath
+     *            collection of keys to put into HashTree
+     * @param values
+     *            array of values to be added as keys to bottom-most node
+     */
+    public void set(Collection<?> treePath, Object[] values) {
+        HashTree tree = addTreePath(treePath);
+        tree.set(Arrays.asList(values));
+    }
+
+    /**
+     * Sets the nodes of the current tree to be the objects of the given
+     * collection. Any nodes previously in the tree are removed.
+     *
+     * @param values
+     *            Collection of objects to set as nodes.
+     */
+    public void set(Collection<?> values) {
+        clear();
+        this.add(values);
+    }
+
+    /**
+     * Sets a series of keys into the HashTree. It sets up the first object in
+     * the key list as a key in the current node, recurses into the next
+     * HashTree node through that key and adds the second object in the list.
+     * Continues recursing in this manner until the end of the first list is
+     * reached, at which point all the values of the Collection of values are
+     * set as keys to the bottom-most node. Any previously existing keys of that
+     * bottom node are lost.
+     *
+     * @param treePath
+     *            list of keys to put into HashTree
+     * @param values
+     *            collection of values to be added as keys to bottom-most node
+     */
+    public void set(Collection<?> treePath, Collection<?> values) {
+        HashTree tree = addTreePath(treePath);
+        tree.set(values);
+    }
+
+    /**
+     * Adds an key into the HashTree at the current level. If a HashTree exists
+     * for the key already, no new tree will be added
+     *
+     * @param key
+     *            key to be added to HashTree
+     * @return newly generated tree, if no tree was found for the given key;
+     *         existing key otherwise
+     */
+    public HashTree add(Object key) {
+        if (!data.containsKey(key)) {
+            HashTree newTree = createNewTree();
+            data.put(key, newTree);
+            return newTree;
+        }
+        return getTree(key);
+    }
+
+    /**
+     * Adds all the given objects as nodes at the current level.
+     *
+     * @param keys
+     *            Array of Keys to be added to HashTree.
+     */
+    public void add(Object[] keys) {
+        for (Object key : keys) {
+            add(key);
+        }
+    }
+
+    /**
+     * Adds a bunch of keys into the HashTree at the current level.
+     *
+     * @param keys
+     *            Collection of Keys to be added to HashTree.
+     */
+    public void add(Collection<?> keys) {
+        for (Object o : keys) {
+            add(o);
+        }
+    }
+
+    /**
+     * Adds a key and it's value in the HashTree. The first argument becomes a
+     * node at the current level, and the second argument becomes a node of it.
+     *
+     * @param key
+     *            key to be added
+     * @param value
+     *            value to be added as a key in the secondary node
+     * @return HashTree for which <code>value</code> is the key
+     */
+    public HashTree add(Object key, Object value) {
+        return add(key).add(value);
+    }
+
+    /**
+     * Adds a key and it's values in the HashTree. The first argument becomes a
+     * node at the current level, and adds all the values in the array to the
+     * new node.
+     *
+     * @param key
+     *            key to be added
+     * @param values
+     *            array of objects to be added as keys in the secondary node
+     */
+    public void add(Object key, Object[] values) {
+        add(key).add(values);
+    }
+
+    /**
+     * Adds a key as a node at the current level and then adds all the objects
+     * in the second argument as nodes of the new node.
+     *
+     * @param key
+     *            key to be added
+     * @param values
+     *            Collection of objects to be added as keys in the secondary
+     *            node
+     */
+    public void add(Object key, Collection<?> values) {
+        add(key).add(values);
+    }
+
+    /**
+     * Adds a series of nodes into the HashTree using the given path. The first
+     * argument is an array that represents a path to a specific node in the
+     * tree. If the path doesn't already exist, it is created (the objects are
+     * added along the way). At the path, all the objects in the second argument
+     * are added as nodes.
+     *
+     * @param treePath
+     *            an array of objects representing a path
+     * @param values
+     *            array of values to be added as keys to bottom-most node
+     */
+    public void add(Object[] treePath, Object[] values) {
+        if (treePath != null) {
+            add(Arrays.asList(treePath), Arrays.asList(values));
+        }
+    }
+
+    /**
+     * Adds a series of nodes into the HashTree using the given path. The first
+     * argument is an array that represents a path to a specific node in the
+     * tree. If the path doesn't already exist, it is created (the objects are
+     * added along the way). At the path, all the objects in the second argument
+     * are added as nodes.
+     *
+     * @param treePath
+     *            an array of objects representing a path
+     * @param values
+     *            collection of values to be added as keys to bottom-most node
+     */
+    public void add(Object[] treePath, Collection<?> values) {
+        if (treePath != null) {
+            add(Arrays.asList(treePath), values);
+        }
+    }
+
+    public HashTree add(Object[] treePath, Object value) {
+        return add(Arrays.asList(treePath), value);
+    }
+
+    /**
+     * Adds a series of nodes into the HashTree using the given path. The first
+     * argument is a List that represents a path to a specific node in the tree.
+     * If the path doesn't already exist, it is created (the objects are added
+     * along the way). At the path, all the objects in the second argument are
+     * added as nodes.
+     *
+     * @param treePath
+     *            a list of objects representing a path
+     * @param values
+     *            array of values to be added as keys to bottom-most node
+     */
+    public void add(Collection<?> treePath, Object[] values) {
+        HashTree tree = addTreePath(treePath);
+        tree.add(Arrays.asList(values));
+    }
+
+    /**
+     * Adds a series of nodes into the HashTree using the given path. The first
+     * argument is a List that represents a path to a specific node in the tree.
+     * If the path doesn't already exist, it is created (the objects are added
+     * along the way). At the path, the object in the second argument is added
+     * as a node.
+     *
+     * @param treePath
+     *            a list of objects representing a path
+     * @param value
+     *            Object to add as a node to bottom-most node
+     * @return HashTree for which <code>value</code> is the key
+     */
+    public HashTree add(Collection<?> treePath, Object value) {
+        HashTree tree = addTreePath(treePath);
+        return tree.add(value);
+    }
+
+    /**
+     * Adds a series of nodes into the HashTree using the given path. The first
+     * argument is a SortedSet that represents a path to a specific node in the
+     * tree. If the path doesn't already exist, it is created (the objects are
+     * added along the way). At the path, all the objects in the second argument
+     * are added as nodes.
+     *
+     * @param treePath
+     *            a SortedSet of objects representing a path
+     * @param values
+     *            Collection of values to be added as keys to bottom-most node
+     */
+    public void add(Collection<?> treePath, Collection<?> values) {
+        HashTree tree = addTreePath(treePath);
+        tree.add(values);
+    }
+
+    protected HashTree addTreePath(Collection<?> treePath) {
+        HashTree tree = this;
+        for (Object temp : treePath) {
+            tree = tree.add(temp);
+        }
+        return tree;
+    }
+
+    /**
+     * Gets the HashTree mapped to the given key.
+     *
+     * @param key
+     *            Key used to find appropriate HashTree()
+     * @return the HashTree for <code>key</code>
+     */
+    public HashTree getTree(Object key) {
+        return data.get(key);
+    }
+
+    /**
+     * Returns the HashTree object associated with the given key. Same as
+     * calling {@link #getTree(Object)}.
+     *
+     * @see Map#get(Object)
+     */
+    @Override
+    public HashTree get(Object key) {
+        return getTree(key);
+    }
+
+    /**
+     * Gets the HashTree object mapped to the last key in the array by recursing
+     * through the HashTree structure one key at a time.
+     *
+     * @param treePath
+     *            array of keys.
+     * @return HashTree at the end of the recursion.
+     */
+    public HashTree getTree(Object[] treePath) {
+        if (treePath != null) {
+            return getTree(Arrays.asList(treePath));
+        }
+        return this;
+    }
+
+    /**
+     * Create a clone of this HashTree. This is not a deep clone (i.e., the
+     * contents of the tree are not cloned).
+     *
+     */
+    @Override
+    public Object clone() {
+        HashTree newTree = new HashTree();
+        cloneTree(newTree);
+        return newTree;
+    }
+
+    protected void cloneTree(HashTree newTree) {
+        for (Object key : list()) {
+            newTree.set(key, (HashTree) getTree(key).clone());
+        }
+    }
+
+    /**
+     * Creates a new tree. This method exists to allow inheriting classes to
+     * generate the appropriate types of nodes. For instance, when a node is
+     * added, it's value is a HashTree. Rather than directly calling the
+     * HashTree() constructor, the createNewTree() method is called. Inheriting
+     * classes should override these methods and create the appropriate subclass
+     * of HashTree.
+     *
+     * @return HashTree
+     */
+    protected HashTree createNewTree() {
+        return new HashTree();
+    }
+
+    /**
+     * Creates a new tree. This method exists to allow inheriting classes to
+     * generate the appropriate types of nodes. For instance, when a node is
+     * added, it's value is a HashTree. Rather than directly calling the
+     * HashTree() constructor, the createNewTree() method is called. Inheriting
+     * classes should override these methods and create the appropriate subclass
+     * of HashTree.
+     *
+     * @param key
+     *            object to use as the key for the top level
+     *
+     * @return newly created {@link HashTree}
+     */
+    protected HashTree createNewTree(Object key) {
+        return new HashTree(key);
+    }
+
+    /**
+     * Creates a new tree. This method exists to allow inheriting classes to
+     * generate the appropriate types of nodes. For instance, when a node is
+     * added, it's value is a HashTree. Rather than directly calling the
+     * HashTree() constructor, the createNewTree() method is called. Inheriting
+     * classes should override these methods and create the appropriate subclass
+     * of HashTree.
+     *
+     * @param values objects to be added to the new {@link HashTree}
+     *
+     * @return newly created {@link HashTree}
+     */
+    protected HashTree createNewTree(Collection<?> values) {
+        return new HashTree(values);
+    }
+
+    /**
+     * Gets the HashTree object mapped to the last key in the SortedSet by
+     * recursing through the HashTree structure one key at a time.
+     *
+     * @param treePath
+     *            Collection of keys
+     * @return HashTree at the end of the recursion
+     */
+    public HashTree getTree(Collection<?> treePath) {
+        return getTreePath(treePath);
+    }
+
+    /**
+     * Gets a Collection of all keys in the current HashTree node. If the
+     * HashTree represented a file system, this would be like getting a
+     * collection of all the files in the current folder.
+     *
+     * @return Set of all keys in this HashTree
+     */
+    public Collection<Object> list() {
+        return data.keySet();
+    }
+
+    /**
+     * Gets a Set of all keys in the HashTree mapped to the given key of the
+     * current HashTree object (in other words, one level down. If the HashTree
+     * represented a file system, this would like getting a list of all files in
+     * a sub-directory (of the current directory) specified by the key argument.
+     *
+     * @param key
+     *            key used to find HashTree to get list of
+     * @return Set of all keys in found HashTree.
+     */
+    public Collection<?> list(Object key) {
+        HashTree temp = data.get(key);
+        if (temp != null) {
+            return temp.list();
+        }
+        return new HashSet<>();
+    }
+
+    /**
+     * Removes the entire branch specified by the given key.
+     *
+     * @see Map#remove(Object)
+     */
+    @Override
+    public HashTree remove(Object key) {
+        return data.remove(key);
+    }
+
+    /**
+     * Recurses down into the HashTree structure using each subsequent key in the
+     * array of keys, and returns the Set of keys of the HashTree object at the
+     * end of the recursion. If the HashTree represented a file system, this
+     * would be like getting a list of all the files in a directory specified by
+     * the treePath, relative from the current directory.
+     *
+     * @param treePath
+     *            Array of keys used to recurse into HashTree structure
+     * @return Set of all keys found in end HashTree
+     */
+    public Collection<?> list(Object[] treePath) {
+        if (treePath != null) {
+            return list(Arrays.asList(treePath));
+        }
+        return list();
+    }
+
+    /**
+     * Recurses down into the HashTree structure using each subsequent key in the
+     * List of keys, and returns the Set of keys of the HashTree object at the
+     * end of the recursion. If the HashTree represented a file system, this
+     * would be like getting a list of all the files in a directory specified by
+     * the treePath, relative from the current directory.
+     *
+     * @param treePath
+     *            List of keys used to recurse into HashTree structure
+     * @return Set of all keys found in end HashTree
+     */
+    public Collection<?> list(Collection<?> treePath) {
+        HashTree tree = getTreePath(treePath);
+        if (tree != null) {
+            return tree.list();
+        }
+        return new HashSet<>();
+    }
+
+    /**
+     * Finds the given current key, and replaces it with the given new key. Any
+     * tree structure found under the original key is moved to the new key.
+     *
+     * @param currentKey name of the key to be replaced
+     * @param newKey name of the new key
+     */
+    public void replaceKey(Object currentKey, Object newKey) {
+        HashTree tree = getTree(currentKey);
+        data.remove(currentKey);
+        data.put(newKey, tree);
+    }
+
+    /**
+     * Gets an array of all keys in the current HashTree node. If the HashTree
+     * represented a file system, this would be like getting an array of all the
+     * files in the current folder.
+     *
+     * @return array of all keys in this HashTree.
+     */
+    public Object[] getArray() {
+        return data.keySet().toArray();
+    }
+
+    /**
+     * Gets an array of all keys in the HashTree mapped to the given key of the
+     * current HashTree object (in other words, one level down). If the HashTree
+     * represented a file system, this would like getting a list of all files in
+     * a sub-directory (of the current directory) specified by the key argument.
+     *
+     * @param key
+     *            key used to find HashTree to get list of
+     * @return array of all keys in found HashTree
+     */
+    public Object[] getArray(Object key) {
+        HashTree t = getTree(key);
+        if (t != null) {
+            return t.getArray();
+        }
+        return null;
+    }
+
+    /**
+     * Recurses down into the HashTree structure using each subsequent key in the
+     * array of keys, and returns an array of keys of the HashTree object at the
+     * end of the recursion. If the HashTree represented a file system, this
+     * would be like getting a list of all the files in a directory specified by
+     * the treePath, relative from the current directory.
+     *
+     * @param treePath
+     *            array of keys used to recurse into HashTree structure
+     * @return array of all keys found in end HashTree
+     */
+    public Object[] getArray(Object[] treePath) {
+        if (treePath != null) {
+            return getArray(Arrays.asList(treePath));
+        }
+        return getArray();
+    }
+
+    /**
+     * Recurses down into the HashTree structure using each subsequent key in the
+     * treePath argument, and returns an array of keys of the HashTree object at
+     * the end of the recursion. If the HashTree represented a file system, this
+     * would be like getting a list of all the files in a directory specified by
+     * the treePath, relative from the current directory.
+     *
+     * @param treePath
+     *            list of keys used to recurse into HashTree structure
+     * @return array of all keys found in end HashTree
+     */
+    public Object[] getArray(Collection<?> treePath) {
+        HashTree tree = getTreePath(treePath);
+        return (tree != null) ? tree.getArray() : null;
+    }
+
+    protected HashTree getTreePath(Collection<?> treePath) {
+        HashTree tree = this;
+        for (Object aTreePath : treePath) {
+            tree = tree.getTree(aTreePath);
+            if (tree == null) {
+                return null;
+            }
+        }
+        return tree;
+    }
+
+    /**
+     * Returns a hashcode for this HashTree.
+     *
+     * @see Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return data.hashCode() * 7;
+    }
+
+    /**
+     * Compares all objects in the tree and verifies that the two trees contain
+     * the same objects at the same tree levels. Returns true if they do, false
+     * otherwise.
+     *
+     * @param o
+     *            Object to be compared against
+     * @see Object#equals(Object)
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof HashTree)) {
+            return false;
+        }
+        HashTree oo = (HashTree) o;
+        if (oo.size() != this.size()) {
+            return false;
+        }
+        return data.equals(oo.data);
+    }
+
+    /**
+     * Returns a Set of all the keys in the top-level of this HashTree.
+     *
+     * @see Map#keySet()
+     */
+    @Override
+    public Set<Object> keySet() {
+        return data.keySet();
+    }
+
+    /**
+     * Searches the HashTree structure for the given key. If it finds the key,
+     * it returns the HashTree mapped to the key. If it finds nothing, it
+     * returns null.
+     *
+     * @param key
+     *            Key to search for
+     * @return HashTree mapped to key, if found, otherwise <code>null</code>
+     */
+    public HashTree search(Object key) {
+        HashTree result = getTree(key);
+        if (result != null) {
+            return result;
+        }
+        TreeSearcher searcher = new TreeSearcher(key);
+        try {
+            traverse(searcher);
+        } catch (RuntimeException e) {
+            if (!e.getMessage().equals(FOUND)){
+                throw e;
+            }
+            // do nothing - means object is found
+        }
+        return searcher.getResult();
+    }
+
+    /**
+     * Method readObject.
+     *
+     * @param ois
+     *            the stream to read the objects from
+     * @throws ClassNotFoundException
+     *             when the class for the deserialization can not be found
+     * @throws IOException
+     *             when I/O error occurs
+     */
+    private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException {
+        ois.defaultReadObject();
+    }
+
+    private void writeObject(ObjectOutputStream oos) throws IOException {
+        oos.defaultWriteObject();
+    }
+
+    /**
+     * Returns the number of top-level entries in the HashTree.
+     *
+     * @see Map#size()
+     */
+    @Override
+    public int size() {
+        return data.size();
+    }
+
+    /**
+     * Allows any implementation of the HashTreeTraverser interface to easily
+     * traverse (depth-first) all the nodes of the HashTree. The Traverser
+     * implementation will be given notification of each node visited.
+     *
+     * @see HashTreeTraverser
+     * @param visitor
+     *            the visitor that wants to traverse the tree
+     */
+    public void traverse(HashTreeTraverser visitor) {
+        for (Object item : list()) {
+            visitor.addNode(item, getTree(item));
+            getTree(item).traverseInto(visitor);
+        }
+    }
+
+    /**
+     * The recursive method that accomplishes the tree-traversal and performs
+     * the callbacks to the HashTreeTraverser.
+     *
+     * @param visitor
+     *            the {@link HashTreeTraverser} to be notified
+     */
+    private void traverseInto(HashTreeTraverser visitor) {
+        if (list().isEmpty()) {
+            visitor.processPath();
+        } else {
+            for (Object item : list()) {
+                final HashTree treeItem = getTree(item);
+                visitor.addNode(item, treeItem);
+                treeItem.traverseInto(visitor);
+            }
+        }
+        visitor.subtractNode();
+    }
+
+    /**
+     * Generate a printable representation of the tree.
+     *
+     * @return a representation of the tree
+     */
+    @Override
+    public String toString() {
+        ConvertToString converter = new ConvertToString();
+        try {
+            traverse(converter);
+        } catch (Exception e) { // Just in case
+            converter.reportError(e);
+        }
+        return converter.toString();
+    }
+
+    private static class TreeSearcher implements HashTreeTraverser {
+
+        private final Object target;
+
+        private HashTree result;
+
+        public TreeSearcher(Object t) {
+            target = t;
+        }
+
+        public HashTree getResult() {
+            return result;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void addNode(Object node, HashTree subTree) {
+            result = subTree.getTree(target);
+            if (result != null) {
+                // short circuit traversal when found
+                throw new RuntimeException(FOUND);
+            }
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void processPath() {
+            // Not used
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void subtractNode() {
+            // Not used
+        }
+    }
+
+    private static class ConvertToString implements HashTreeTraverser {
+        private final StringBuilder string = new StringBuilder(getClass().getName() + "{");
+
+        private final StringBuilder spaces = new StringBuilder();
+
+        private int depth = 0;
+
+        @Override
+        public void addNode(Object key, HashTree subTree) {
+            depth++;
+            string.append("\n").append(getSpaces()).append(key);
+            string.append(" {");
+        }
+
+        @Override
+        public void subtractNode() {
+            string.append("\n" + getSpaces() + "}");
+            depth--;
+        }
+
+        @Override
+        public void processPath() {
+            // NOOP
+        }
+
+        @Override
+        public String toString() {
+            string.append("\n}");
+            return string.toString();
+        }
+
+        void reportError(Throwable t){
+            string.append("Error: ").append(t.toString());
+        }
+
+        private String getSpaces() {
+            if (spaces.length() < depth * 2) {
+                while (spaces.length() < depth * 2) {
+                    spaces.append("  ");
+                }
+            } else if (spaces.length() > depth * 2) {
+                spaces.setLength(depth * 2);
+            }
+            return spaces.toString();
+        }
+    }
+}

From 39cffd9615941d253f5fc34ab2132f4b4fe22a80 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 9 Feb 2021 16:22:59 +0800
Subject: [PATCH 13/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5jmx=20=E5=A2=9E=E5=8A=A0HashTre?=
 =?UTF-8?q?e=20=E6=9C=89=E5=BA=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/automation/parse/MsJmeterParser.java  | 55 ++++++++++++++-----
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index e1030e02e1..c91df0e0fd 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -31,13 +31,13 @@ import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
 import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
 import io.metersphere.api.dto.scenario.Body;
 import io.metersphere.api.dto.scenario.KeyValue;
+import io.metersphere.api.dto.scenario.request.BodyFile;
 import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.base.domain.ApiScenarioModule;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.commons.constants.LoopConstants;
 import io.metersphere.commons.utils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.control.ForeachController;
@@ -121,21 +121,37 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 samplerProxy.getBody().setType(Body.FORM_DATA);
                 List<KeyValue> keyValues = new LinkedList<>();
                 for (HTTPFileArg arg : source.getHTTPFiles()) {
-                    KeyValue keyValue = new KeyValue(arg.getProperty("Argument.name").toString(), arg.getProperty("Argument.value").toString());
+                    List<BodyFile> files = new LinkedList<>();
+                    BodyFile file = new BodyFile();
+                    file.setId(arg.getParamName());
+                    file.setName(arg.getPath());
+                    files.add(file);
+
+                    KeyValue keyValue = new KeyValue(arg.getParamName(), arg.getParamName());
                     keyValue.setContentType(arg.getProperty("HTTPArgument.content_type").toString());
+                    keyValue.setType("file");
+                    keyValue.setFiles(files);
                     keyValues.add(keyValue);
                 }
                 samplerProxy.getBody().setKvs(keyValues);
             }
             samplerProxy.setProtocol(RequestType.HTTP);
+            samplerProxy.setPort(source.getPort() + "");
             if (source.getArguments() != null) {
-                List<KeyValue> keyValues = new LinkedList<>();
-                source.getArguments().getArgumentsAsMap().forEach((k, v) -> {
-                    KeyValue keyValue = new KeyValue(k, v);
-                    keyValues.add(keyValue);
-                });
-                if (CollectionUtils.isNotEmpty(keyValues)) {
-                    samplerProxy.setArguments(keyValues);
+                if (source.getPostBodyRaw()) {
+                    samplerProxy.getBody().setType(Body.RAW);
+                    source.getArguments().getArgumentsAsMap().forEach((k, v) -> {
+                        samplerProxy.getBody().setRaw(v);
+                    });
+                } else {
+                    List<KeyValue> keyValues = new LinkedList<>();
+                    source.getArguments().getArgumentsAsMap().forEach((k, v) -> {
+                        KeyValue keyValue = new KeyValue(k, v);
+                        keyValues.add(keyValue);
+                    });
+                    if (CollectionUtils.isNotEmpty(keyValues)) {
+                        samplerProxy.setArguments(keyValues);
+                    }
                 }
             }
             samplerProxy.setPath(source.getPath());
@@ -151,7 +167,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
     }
 
     private void convertTCPSampler(MsTCPSampler msTCPSampler, TCPSampler tcpSampler) {
-        tcpSampler.setName(tcpSampler.getName());
+        msTCPSampler.setName(tcpSampler.getName());
         msTCPSampler.setType("TCPSampler");
         msTCPSampler.setServer(tcpSampler.getServer());
         msTCPSampler.setPort(tcpSampler.getPort() + "");
@@ -226,10 +242,11 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         msJDBCSampler.setType("JDBCSampler");
         msJDBCSampler.setName(jdbcSampler.getName());
         msJDBCSampler.setProtocol("SQL");
-        msJDBCSampler.setQuery(jdbcSampler.getQuery());
-        msJDBCSampler.setQueryTimeout(StringUtils.isNotEmpty(jdbcSampler.getQueryTimeout()) ? Long.parseLong(jdbcSampler.getQueryTimeout()) : 0L);
-        msJDBCSampler.setResultVariable(jdbcSampler.getResultVariable());
-        msJDBCSampler.setVariableNames(jdbcSampler.getVariableNames());
+        msJDBCSampler.setQuery(jdbcSampler.getPropertyAsString("query"));
+        msJDBCSampler.setQueryTimeout(jdbcSampler.getPropertyAsInt("queryTimeout"));
+        msJDBCSampler.setResultVariable(jdbcSampler.getPropertyAsString("resultVariable"));
+        msJDBCSampler.setVariableNames(jdbcSampler.getPropertyAsString("variableNames"));
+        msJDBCSampler.setVariables(new LinkedList<>());
     }
 
     private void convertMsExtract(MsExtract extract, Object key) {
@@ -370,22 +387,30 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 elementNode = new MsJDBCSampler();
                 JDBCSampler jdbcSampler = (JDBCSampler) key;
                 convertJDBCSampler((MsJDBCSampler) elementNode, jdbcSampler);
-            } else if (key instanceof JSR223Sampler) {
+            }
+            // JSR自定义脚本
+            else if (key instanceof JSR223Sampler) {
                 JSR223Sampler jsr223Sampler = (JSR223Sampler) key;
                 elementNode = new MsJSR223Processor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
+                ((MsJSR223Processor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
+                ((MsJSR223Processor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
             }
             // 后置脚本
             else if (key instanceof JSR223PostProcessor) {
                 JSR223PostProcessor jsr223Sampler = (JSR223PostProcessor) key;
                 elementNode = new MsJSR223PostProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
+                ((MsJSR223Processor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
+                ((MsJSR223Processor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
             }
             // 前置脚本
             else if (key instanceof JSR223PreProcessor) {
                 JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
                 elementNode = new MsJSR223PreProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
+                ((MsJSR223Processor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
+                ((MsJSR223Processor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
             }
             // 提取参数
             else if (key instanceof ResponseAssertion || key instanceof JSONPathAssertion || key instanceof XPath2Assertion || key instanceof JSR223Assertion || key instanceof DurationAssertion) {

From 72351396ae3d99ddc91376848368d38a0a8d27ec Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 18 Feb 2021 14:23:31 +0800
Subject: [PATCH 14/23] =?UTF-8?q?fix(xpack):=20=E4=BF=AE=E5=A4=8Dlicense?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E4=B8=BA0=20=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/parse/MsJmeterParser.java   |  8 ++++----
 .../request/controller/MsLoopController.java       | 14 +++++++-------
 backend/src/main/java/io/metersphere/xpack         |  2 +-
 frontend/src/business/components/xpack             |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index c91df0e0fd..5f6b685104 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -401,16 +401,16 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 JSR223PostProcessor jsr223Sampler = (JSR223PostProcessor) key;
                 elementNode = new MsJSR223PostProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-                ((MsJSR223Processor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
-                ((MsJSR223Processor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
+                ((MsJSR223PostProcessor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
+                ((MsJSR223PostProcessor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
             }
             // 前置脚本
             else if (key instanceof JSR223PreProcessor) {
                 JSR223PreProcessor jsr223Sampler = (JSR223PreProcessor) key;
                 elementNode = new MsJSR223PreProcessor();
                 BeanUtils.copyBean(elementNode, jsr223Sampler);
-                ((MsJSR223Processor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
-                ((MsJSR223Processor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
+                ((MsJSR223PreProcessor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
+                ((MsJSR223PreProcessor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
             }
             // 提取参数
             else if (key instanceof ResponseAssertion || key instanceof JSONPathAssertion || key instanceof XPath2Assertion || key instanceof JSR223Assertion || key instanceof DurationAssertion) {
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
index b22949ed2a..350db02e11 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
@@ -102,7 +102,7 @@ public class MsLoopController extends MsTestElement {
         return counterConfig;
     }
 
-    private LoopController loopController() {
+    private LoopController initLoopController() {
         LoopController loopController = new LoopController();
         loopController.setEnabled(true);
         loopController.setName("LoopController");
@@ -113,7 +113,7 @@ public class MsLoopController extends MsTestElement {
         return loopController;
     }
 
-    public String getCondition() {
+    private String getCondition() {
         String variable = "\"" + this.whileController.getVariable() + "\"";
         String operator = this.whileController.getOperator();
         String value = "\"" + this.whileController.getValue() + "\"";
@@ -136,7 +136,7 @@ public class MsLoopController extends MsTestElement {
         return "${__jexl3(" + variable + operator + value + ")}";
     }
 
-    private WhileController whileController() {
+    private WhileController initWhileController() {
         String condition = getCondition();
         if (StringUtils.isEmpty(condition)) {
             return null;
@@ -150,7 +150,7 @@ public class MsLoopController extends MsTestElement {
         return controller;
     }
 
-    private ForeachController foreachController() {
+    private ForeachController initForeachController() {
         ForeachController controller = new ForeachController();
         controller.setEnabled(true);
         controller.setName("ForeachController");
@@ -175,13 +175,13 @@ public class MsLoopController extends MsTestElement {
             runTime.setRuntime(timeout);
             // 添加超时处理，防止死循环
             HashTree hashTree = tree.add(runTime);
-            return hashTree.add(whileController());
+            return hashTree.add(initWhileController());
         }
         if (StringUtils.equals(this.loopType, LoopConstants.FOREACH.name()) && this.forEachController != null) {
-            return tree.add(foreachController());
+            return tree.add(initForeachController());
         }
         if (StringUtils.equals(this.loopType, LoopConstants.LOOP_COUNT.name()) && this.countController != null) {
-            return tree.add(loopController());
+            return tree.add(initLoopController());
         }
         return null;
     }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index b35af517d8..5e0b365f10 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit b35af517d888268abd3a8f2b58d6ea94335138a5
+Subproject commit 5e0b365f1080197e84055e80071165787e2e79c5
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index a3d469fd18..4cc8926bad 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit a3d469fd18f663d11e5c1c49f71ced6e3e4b292f
+Subproject commit 4cc8926bad84083f675a262d6766a92bb09a890a

From 8f9286252c22570c12072b9421e668d09f041dfc Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 19 Feb 2021 15:07:19 +0800
Subject: [PATCH 15/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5JMX=20JDBC=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/ImportPoolsDTO.java    |  20 +++
 .../dto/automation/parse/MsJmeterParser.java  | 140 ++++++++++++++++--
 .../dto/definition/request/MsTestElement.java |   6 +-
 .../request/sampler/MsHTTPSamplerProxy.java   |   1 +
 .../request/unknown/MsJmeterElement.java      |  50 ++++++-
 .../api/service/ApiAutomationService.java     |   1 +
 .../service/ApiTestEnvironmentService.java    |   5 +
 .../api/automation/scenario/Setting.js        |   1 +
 8 files changed, 207 insertions(+), 17 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java
new file mode 100644
index 0000000000..d5067a539b
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java
@@ -0,0 +1,20 @@
+package io.metersphere.api.dto.automation;
+
+import io.metersphere.api.dto.scenario.DatabaseConfig;
+import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Map;
+
+@Getter
+@Setter
+public class ImportPoolsDTO {
+    private String envId;
+
+    private Boolean isCreate;
+
+    private ApiTestEnvironmentWithBLOBs testEnvironmentWithBLOBs;
+
+    private Map<String, DatabaseConfig> dataSources;
+}
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 5f6b685104..0e49a1e192 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -1,10 +1,12 @@
 package io.metersphere.api.dto.automation.parse;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import io.github.ningyu.jmeter.plugin.dubbo.sample.DubboSample;
 import io.github.ningyu.jmeter.plugin.dubbo.sample.MethodArgument;
 import io.github.ningyu.jmeter.plugin.util.Constants;
 import io.metersphere.api.dto.ApiTestImportRequest;
+import io.metersphere.api.dto.automation.ImportPoolsDTO;
 import io.metersphere.api.dto.definition.request.MsScenario;
 import io.metersphere.api.dto.definition.request.MsTestElement;
 import io.metersphere.api.dto.definition.request.assertions.*;
@@ -30,13 +32,20 @@ import io.metersphere.api.dto.definition.request.sampler.dubbo.MsRegistryCenter;
 import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
 import io.metersphere.api.dto.definition.request.unknown.MsJmeterElement;
 import io.metersphere.api.dto.scenario.Body;
+import io.metersphere.api.dto.scenario.DatabaseConfig;
 import io.metersphere.api.dto.scenario.KeyValue;
+import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.dto.scenario.request.BodyFile;
 import io.metersphere.api.dto.scenario.request.RequestType;
+import io.metersphere.api.service.ApiTestEnvironmentService;
 import io.metersphere.base.domain.ApiScenarioModule;
 import io.metersphere.base.domain.ApiScenarioWithBLOBs;
+import io.metersphere.base.domain.ApiTestEnvironmentExample;
+import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.commons.constants.LoopConstants;
 import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.commons.utils.CommonBeanFactory;
+import io.metersphere.commons.utils.LogUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.jmeter.assertions.*;
 import org.apache.jmeter.config.ConfigTestElement;
@@ -52,6 +61,7 @@ import org.apache.jmeter.modifiers.JSR223PreProcessor;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerProxy;
 import org.apache.jmeter.protocol.http.util.HTTPFileArg;
 import org.apache.jmeter.protocol.java.sampler.JSR223Sampler;
+import org.apache.jmeter.protocol.jdbc.config.DataSourceElement;
 import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
 import org.apache.jmeter.protocol.tcp.sampler.TCPSampler;
 import org.apache.jmeter.save.SaveService;
@@ -60,24 +70,26 @@ import org.apache.jmeter.testelement.TestPlan;
 import org.apache.jmeter.timers.ConstantTimer;
 import org.apache.jorphan.collections.HashTree;
 
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 public class MsJmeterParser extends ScenarioImportAbstractParser {
+    private final String ENV_NAME = "导入数据环境";
+
     @Override
     public ScenarioImport parse(InputStream inputSource, ApiTestImportRequest request) {
         try {
             Object scriptWrapper = SaveService.loadElement(inputSource);
             HashTree testPlan = this.getHashTree(scriptWrapper);
+            // 优先初始化数据源
+            preInitPool(request.getProjectId(), testPlan);
+
             MsScenario scenario = new MsScenario();
             scenario.setReferenced("REF");
             jmterHashTree(testPlan, scenario);
             this.projectId = request.getProjectId();
-
             ScenarioImport scenarioImport = new ScenarioImport();
             scenarioImport.setData(paseObj(scenario, request));
             scenarioImport.setProjectid(request.getProjectId());
@@ -157,7 +169,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             samplerProxy.setPath(source.getPath());
             samplerProxy.setMethod(source.getMethod());
             if (source.getUrl() != null) {
-                samplerProxy.setUrl(source.getUrl().toString());
+                // samplerProxy.setUrl(source.getUrl().toString());
             }
             samplerProxy.setId(UUID.randomUUID().toString());
             samplerProxy.setType("HTTPSamplerProxy");
@@ -238,6 +250,87 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         }
     }
 
+    /**
+     * 优先初始化数据池
+     */
+    private void preInitPool(String projectId, HashTree hashTree) {
+        // 初始化已有数据池
+        initDataSource(projectId, ENV_NAME);
+        // 添加当前jmx 中新的数据池
+        preCreatePool(hashTree);
+        // 更新数据源
+        ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+        if (dataPools.getIsCreate()) {
+            dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getDataSources().values()));
+            environmentService.add(dataPools.getTestEnvironmentWithBLOBs());
+        } else {
+            dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getDataSources().values()));
+            environmentService.update(dataPools.getTestEnvironmentWithBLOBs());
+        }
+    }
+
+    private void preCreatePool(HashTree tree) {
+        for (Object key : tree.keySet()) {
+            // JDBC 数据池
+            if (key instanceof DataSourceElement) {
+                DataSourceElement dataSourceElement = (DataSourceElement) key;
+                if (dataPools != null && dataPools.getDataSources().containsKey(dataSourceElement.getDataSource())) {
+                    DatabaseConfig config = dataPools.getDataSources().get(dataSourceElement.getDataSource());
+                    DatabaseConfig newConfig = new DatabaseConfig();
+                    BeanUtils.copyBean(newConfig, dataSourceElement);
+                    newConfig.setId(config.getId());
+                    dataPools.getDataSources().put(dataSourceElement.getDataSource(), newConfig);
+                } else {
+                    DatabaseConfig newConfig = new DatabaseConfig();
+                    BeanUtils.copyBean(newConfig, dataSourceElement);
+                    newConfig.setId(UUID.randomUUID().toString());
+                    dataPools.getDataSources().put(dataSourceElement.getDataSource(), newConfig);
+                }
+            }
+
+            // 递归子项
+            HashTree node = tree.get(key);
+            if (node != null) {
+                preCreatePool(node);
+            }
+        }
+    }
+
+    private ImportPoolsDTO dataPools;
+
+    private void initDataSource(String projectId, String name) {
+        ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+        ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
+        example.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(name);
+
+        List<ApiTestEnvironmentWithBLOBs> environments = environmentService.selectByExampleWithBLOBs(example);
+        dataPools = new ImportPoolsDTO();
+        if (CollectionUtils.isNotEmpty(environments)) {
+            dataPools.setIsCreate(false);
+            dataPools.setTestEnvironmentWithBLOBs(environments.get(0));
+            Map<String, DatabaseConfig> dataSources = new HashMap<>();
+            environments.forEach(environment -> {
+                if (environment != null && environment.getConfig() != null) {
+                    EnvironmentConfig envConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+                    if (envConfig != null && CollectionUtils.isNotEmpty(envConfig.getDatabaseConfigs())) {
+                        envConfig.getDatabaseConfigs().forEach(item -> {
+                            dataSources.put(item.getName(), item);
+                        });
+                    }
+                }
+                dataPools.setEnvId(environment.getId());
+                dataPools.setDataSources(dataSources);
+            });
+        } else {
+            dataPools.setIsCreate(true);
+            ApiTestEnvironmentWithBLOBs apiTestEnvironmentWithBLOBs = new ApiTestEnvironmentWithBLOBs();
+            apiTestEnvironmentWithBLOBs.setId(UUID.randomUUID().toString());
+            apiTestEnvironmentWithBLOBs.setName(ENV_NAME);
+            apiTestEnvironmentWithBLOBs.setProjectId(projectId);
+            dataPools.setTestEnvironmentWithBLOBs(apiTestEnvironmentWithBLOBs);
+        }
+    }
+
     private void convertJDBCSampler(MsJDBCSampler msJDBCSampler, JDBCSampler jdbcSampler) {
         msJDBCSampler.setType("JDBCSampler");
         msJDBCSampler.setName(jdbcSampler.getName());
@@ -303,7 +396,9 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             ResponseAssertion assertion = (ResponseAssertion) key;
             assertionRegex.setDescription(assertion.getName());
             assertionRegex.setAssumeSuccess(assertion.getAssumeSuccess());
-            assertionRegex.setExpression(assertion.getTestStrings().getStringValue());
+            if (assertion.getTestStrings() != null && !assertion.getTestStrings().isEmpty()) {
+                assertionRegex.setExpression(assertion.getTestStrings().get(0).getStringValue());
+            }
             if (assertion.isTestFieldRequestData()) {
                 assertionRegex.setSubject("Response Data");
             }
@@ -333,8 +428,9 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             MsAssertionJSR223 msAssertionJSR223 = new MsAssertionJSR223();
             JSR223Assertion jsr223Assertion = (JSR223Assertion) key;
             msAssertionJSR223.setName(jsr223Assertion.getName());
-            msAssertionJSR223.setScript(jsr223Assertion.getScript());
-            msAssertionJSR223.setScriptLanguage(jsr223Assertion.getScriptLanguage());
+            msAssertionJSR223.setDesc(jsr223Assertion.getName());
+            msAssertionJSR223.setScript(jsr223Assertion.getPropertyAsString("script"));
+            msAssertionJSR223.setScriptLanguage(jsr223Assertion.getPropertyAsString("scriptLanguage"));
             assertions.setName(jsr223Assertion.getName());
 
             assertions.getJsr223().add(msAssertionJSR223);
@@ -347,6 +443,23 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         }
     }
 
+    /**
+     * 把节点对象转成XML，不然执行时无法正常转换
+     *
+     * @param obj
+     * @return
+     */
+    public static String objToXml(Object obj) {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            SaveService.saveElement(obj, baos);
+            return baos.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+            LogUtil.warn("HashTree error, can't log jmx scenarioDefinition");
+        }
+        return null;
+    }
+
     private void jmterHashTree(HashTree tree, MsTestElement scenario) {
         for (Object key : tree.keySet()) {
             MsTestElement elementNode;
@@ -358,7 +471,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 scenario.setName(((TestPlan) key).getName());
                 elementNode = new MsJmeterElement();
                 elementNode.setName(((TestPlan) key).getName());
-                ((MsJmeterElement) elementNode).setJmeterElement(key);
+                ((MsJmeterElement) elementNode).setJmeterElement(objToXml(key));
             }
             // 线程组
             else if (key instanceof ThreadGroup) {
@@ -412,12 +525,12 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 ((MsJSR223PreProcessor) elementNode).setScript(jsr223Sampler.getPropertyAsString("script"));
                 ((MsJSR223PreProcessor) elementNode).setScriptLanguage(jsr223Sampler.getPropertyAsString("scriptLanguage"));
             }
-            // 提取参数
+            // 断言规则
             else if (key instanceof ResponseAssertion || key instanceof JSONPathAssertion || key instanceof XPath2Assertion || key instanceof JSR223Assertion || key instanceof DurationAssertion) {
                 elementNode = new MsAssertions();
                 convertMsAssertions((MsAssertions) elementNode, key);
             }
-            // 断言规则
+            // 提取参数
             else if (key instanceof RegexExtractor || key instanceof XPath2Extractor || key instanceof JSONPostProcessor) {
                 elementNode = new MsExtract();
                 convertMsExtract((MsExtract) elementNode, key);
@@ -475,8 +588,9 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
                 elementNode.setType("JmeterElement");
                 TestElement testElement = (TestElement) key;
                 elementNode.setName(testElement.getName());
-                ((MsJmeterElement) elementNode).setJmeterElement(key);
+                ((MsJmeterElement) elementNode).setJmeterElement(objToXml(key));
             }
+            elementNode.setEnable(((TestElement) key).isEnabled());
             elementNode.setResourceId(UUID.randomUUID().toString());
             elementNode.setId(UUID.randomUUID().toString());
             elementNode.setIndex(scenario.getHashTree().size() + 1 + "");
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
index 7052e1df60..fc98f55213 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
@@ -111,8 +111,10 @@ public abstract class MsTestElement {
      * todo 公共环境逐层传递，如果自身有环境 以自身引用环境为准否则以公共环境作为请求环境
      */
     public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
-        for (MsTestElement el : hashTree) {
-            el.toHashTree(tree, el.hashTree, config);
+        if (CollectionUtils.isNotEmpty(hashTree)) {
+            for (MsTestElement el : hashTree) {
+                el.toHashTree(tree, el.hashTree, config);
+            }
         }
     }
 
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
index 4e35756c1a..573a65505d 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
@@ -148,6 +148,7 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                 String envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getPath();
                 if (StringUtils.isNotBlank(this.getPath()) && !isUrl) {
                     envPath += this.getPath();
+                    sampler.setPath(envPath);
                 }
                 if (CollectionUtils.isNotEmpty(this.getRest()) && this.isRest()) {
                     envPath = getRestParameters(URLDecoder.decode(envPath, "UTF-8"));
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java
index 1e97f0758d..5f5b2d44b5 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/unknown/MsJmeterElement.java
@@ -2,8 +2,19 @@ package io.metersphere.api.dto.definition.request.unknown;
 
 import com.alibaba.fastjson.annotation.JSONType;
 import io.metersphere.api.dto.definition.request.MsTestElement;
+import io.metersphere.api.dto.definition.request.ParameterConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.save.SaveService;
+import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.threads.ThreadGroup;
+import org.apache.jorphan.collections.HashTree;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
 
 /**
  * 暂时存放所有未知的Jmeter Element对象
@@ -14,6 +25,41 @@ import lombok.EqualsAndHashCode;
 public class MsJmeterElement extends MsTestElement {
     private String type = "JmeterElement";
 
-    private Object jmeterElement;
-    
+    private String jmeterElement;
+
+    @Override
+    public void toHashTree(HashTree tree, List<MsTestElement> hashTree, ParameterConfig config) {
+        if (!this.isEnable()) {
+            return;
+        }
+        try {
+            InputStream inputSource = getStrToStream(jmeterElement);
+            if (inputSource != null) {
+                Object scriptWrapper = SaveService.loadElement(inputSource);
+                HashTree elementTree = tree;
+                if (!(scriptWrapper instanceof TestPlan) && !(scriptWrapper instanceof ThreadGroup)) {
+                    elementTree = tree.add(scriptWrapper);
+                }
+                if (CollectionUtils.isNotEmpty(hashTree)) {
+                    for (MsTestElement el : hashTree) {
+                        el.toHashTree(elementTree, el.getHashTree(), config);
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public static InputStream getStrToStream(String sInputString) {
+        if (StringUtils.isNotEmpty(sInputString)) {
+            try {
+                ByteArrayInputStream tInputStringStream = new ByteArrayInputStream(sInputString.getBytes());
+                return tInputStringStream;
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+        return null;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index ea37f0a9ff..e8ca928efe 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -529,6 +529,7 @@ public class ApiAutomationService {
         ParameterConfig config = new ParameterConfig();
         config.setConfig(envConfig);
         HashTree hashTree = request.getTestElement().generateHashTree(config);
+        System.out.println(request.getTestElement().getJmx(hashTree));
         // 调用执行方法
         createScenarioReport(request.getId(), request.getScenarioId(), request.getScenarioName(), ReportTriggerMode.MANUAL.name(), request.getExecuteType(), request.getProjectId(),
                 SessionUtils.getUserId());
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
index 60b63afbc2..bb3ea479a0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
@@ -26,6 +26,11 @@ public class ApiTestEnvironmentService {
         return apiTestEnvironmentMapper.selectByExampleWithBLOBs(example);
     }
 
+    public List<ApiTestEnvironmentWithBLOBs> selectByExampleWithBLOBs(ApiTestEnvironmentExample example) {
+        return apiTestEnvironmentMapper.selectByExampleWithBLOBs(example);
+    }
+
+
     public ApiTestEnvironmentWithBLOBs get(String id) {
         return apiTestEnvironmentMapper.selectByPrimaryKey(id);
     }
diff --git a/frontend/src/business/components/api/automation/scenario/Setting.js b/frontend/src/business/components/api/automation/scenario/Setting.js
index a25c6d9f72..b147a83658 100644
--- a/frontend/src/business/components/api/automation/scenario/Setting.js
+++ b/frontend/src/business/components/api/automation/scenario/Setting.js
@@ -14,6 +14,7 @@ export const ELEMENTS = new Map([
   ['JSR223PostProcessor', []],
   ['Assertions', []],
   ['Extract', []],
+  ['JmeterElement', []],
   ['CustomizeReq', ["ConstantTimer", "JSR223PreProcessor", "JSR223PostProcessor", "Assertions", "Extract"]],
 ])
 

From 1c04e19880d00f60547d611becb5091cc5a0a415 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 19 Feb 2021 16:26:30 +0800
Subject: [PATCH 16/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AF=BC=E5=85=A5JMX=20=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/dto/automation/ImportPoolsDTO.java    |  3 ++
 .../dto/automation/parse/MsJmeterParser.java  | 44 ++++++++++++++-----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java b/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java
index d5067a539b..992b433af3 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/ImportPoolsDTO.java
@@ -1,6 +1,7 @@
 package io.metersphere.api.dto.automation;
 
 import io.metersphere.api.dto.scenario.DatabaseConfig;
+import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,6 +15,8 @@ public class ImportPoolsDTO {
 
     private Boolean isCreate;
 
+    private EnvironmentConfig envConfig;
+
     private ApiTestEnvironmentWithBLOBs testEnvironmentWithBLOBs;
 
     private Map<String, DatabaseConfig> dataSources;
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index 0e49a1e192..d8d4a7e573 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -260,11 +260,13 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         preCreatePool(hashTree);
         // 更新数据源
         ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
+        dataPools.getEnvConfig().setDatabaseConfigs(new ArrayList<>(dataPools.getDataSources().values()));
         if (dataPools.getIsCreate()) {
-            dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getDataSources().values()));
-            environmentService.add(dataPools.getTestEnvironmentWithBLOBs());
+            dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getEnvConfig()));
+            String id = environmentService.add(dataPools.getTestEnvironmentWithBLOBs());
+            dataPools.setEnvId(id);
         } else {
-            dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getDataSources().values()));
+            dataPools.getTestEnvironmentWithBLOBs().setConfig(JSON.toJSONString(dataPools.getEnvConfig()));
             environmentService.update(dataPools.getTestEnvironmentWithBLOBs());
         }
     }
@@ -274,17 +276,32 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             // JDBC 数据池
             if (key instanceof DataSourceElement) {
                 DataSourceElement dataSourceElement = (DataSourceElement) key;
-                if (dataPools != null && dataPools.getDataSources().containsKey(dataSourceElement.getDataSource())) {
-                    DatabaseConfig config = dataPools.getDataSources().get(dataSourceElement.getDataSource());
+                if (dataPools != null && dataPools.getDataSources() != null && dataPools.getDataSources().containsKey(dataSourceElement.getPropertyAsString("dataSource"))) {
+                    DatabaseConfig config = dataPools.getDataSources().get(dataSourceElement.getPropertyAsString("dataSource"));
                     DatabaseConfig newConfig = new DatabaseConfig();
-                    BeanUtils.copyBean(newConfig, dataSourceElement);
+                    newConfig.setUsername(dataSourceElement.getPropertyAsString("username"));
+                    newConfig.setPassword(dataSourceElement.getPropertyAsString("password"));
+                    newConfig.setDriver(dataSourceElement.getPropertyAsString("driver"));
+                    newConfig.setDbUrl(dataSourceElement.getPropertyAsString("dbUrl"));
+                    newConfig.setName(dataSourceElement.getPropertyAsString("dataSource"));
+                    newConfig.setPoolMax(dataSourceElement.getPropertyAsInt("poolMax"));
+                    newConfig.setTimeout(dataSourceElement.getPropertyAsInt("timeout"));
                     newConfig.setId(config.getId());
-                    dataPools.getDataSources().put(dataSourceElement.getDataSource(), newConfig);
+                    dataPools.getDataSources().put(dataSourceElement.getPropertyAsString("dataSource"), newConfig);
                 } else {
                     DatabaseConfig newConfig = new DatabaseConfig();
-                    BeanUtils.copyBean(newConfig, dataSourceElement);
                     newConfig.setId(UUID.randomUUID().toString());
-                    dataPools.getDataSources().put(dataSourceElement.getDataSource(), newConfig);
+                    newConfig.setUsername(dataSourceElement.getPropertyAsString("username"));
+                    newConfig.setPassword(dataSourceElement.getPropertyAsString("password"));
+                    newConfig.setDriver(dataSourceElement.getPropertyAsString("driver"));
+                    newConfig.setDbUrl(dataSourceElement.getPropertyAsString("dbUrl"));
+                    newConfig.setName(dataSourceElement.getPropertyAsString("dataSource"));
+                    newConfig.setPoolMax(dataSourceElement.getPropertyAsInt("poolMax"));
+                    newConfig.setTimeout(dataSourceElement.getPropertyAsInt("timeout"));
+                    if (dataPools.getDataSources() == null) {
+                        dataPools.setDataSources(new HashMap<>());
+                    }
+                    dataPools.getDataSources().put(dataSourceElement.getPropertyAsString("dataSource"), newConfig);
                 }
             }
 
@@ -302,7 +319,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);
         ApiTestEnvironmentExample example = new ApiTestEnvironmentExample();
         example.createCriteria().andProjectIdEqualTo(projectId).andNameEqualTo(name);
-
+        // 这里的数据只有一条，如果多条则有问题
         List<ApiTestEnvironmentWithBLOBs> environments = environmentService.selectByExampleWithBLOBs(example);
         dataPools = new ImportPoolsDTO();
         if (CollectionUtils.isNotEmpty(environments)) {
@@ -312,6 +329,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             environments.forEach(environment -> {
                 if (environment != null && environment.getConfig() != null) {
                     EnvironmentConfig envConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
+                    dataPools.setEnvConfig(envConfig);
                     if (envConfig != null && CollectionUtils.isNotEmpty(envConfig.getDatabaseConfigs())) {
                         envConfig.getDatabaseConfigs().forEach(item -> {
                             dataSources.put(item.getName(), item);
@@ -325,6 +343,8 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             dataPools.setIsCreate(true);
             ApiTestEnvironmentWithBLOBs apiTestEnvironmentWithBLOBs = new ApiTestEnvironmentWithBLOBs();
             apiTestEnvironmentWithBLOBs.setId(UUID.randomUUID().toString());
+            dataPools.setEnvId(apiTestEnvironmentWithBLOBs.getId());
+            dataPools.setEnvConfig(new EnvironmentConfig());
             apiTestEnvironmentWithBLOBs.setName(ENV_NAME);
             apiTestEnvironmentWithBLOBs.setProjectId(projectId);
             dataPools.setTestEnvironmentWithBLOBs(apiTestEnvironmentWithBLOBs);
@@ -339,6 +359,10 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
         msJDBCSampler.setQueryTimeout(jdbcSampler.getPropertyAsInt("queryTimeout"));
         msJDBCSampler.setResultVariable(jdbcSampler.getPropertyAsString("resultVariable"));
         msJDBCSampler.setVariableNames(jdbcSampler.getPropertyAsString("variableNames"));
+        msJDBCSampler.setEnvironmentId(dataPools.getEnvId());
+        if (dataPools.getDataSources() != null && dataPools.getDataSources().get(jdbcSampler.getPropertyAsString("dataSource")) != null) {
+            msJDBCSampler.setDataSourceId(dataPools.getDataSources().get(jdbcSampler.getPropertyAsString("dataSource")).getId());
+        }
         msJDBCSampler.setVariables(new LinkedList<>());
     }
 

From 4e376541d1da0a70ccb9a66b175b8e828c50e950 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Fri, 19 Feb 2021 18:27:24 +0800
Subject: [PATCH 17/23] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list/ApiCaseSimpleList.vue     | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

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 df76ae457b..07858871f7 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -163,13 +163,14 @@ import MsTableHeaderSelectPopover from "@/business/components/common/components/
 import MsTableAdvSearchBar from "@/business/components/common/components/search/MsTableAdvSearchBar";
 import {API_CASE_CONFIGS} from "@/business/components/common/components/search/search-components";
 import {_filter, _handleSelect, _handleSelectAll, _sort,} from "@/common/js/tableUtils";
-import {API_CASE_LIST, TEST_CASE_LIST} from "@/common/js/constants";
-import {Api_Case_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
+import {API_CASE_LIST, API_LIST, API_SCENARIO_LIST, TEST_CASE_LIST} from "@/common/js/constants";
+import {Api_Case_List, Api_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 
 export default {
   name: "ApiCaseSimpleList",
   components: {
+    ApiListContainerWithDoc,
     HeaderCustom,
     MsTableHeaderSelectPopover,
     MsSetEnvironment,
@@ -181,28 +182,19 @@ export default {
     MsTablePagination,
     MsTag,
     MsApiCaseList,
-    name: "ApiCaseSimpleList",
-    components: {
-      MsTableHeaderSelectPopover,
-      MsSetEnvironment,
-      ApiCaseList,
-      PriorityTableItem,
-      ApiListContainerWithDoc,
-      MsTableOperatorButton,
-      MsTableOperator,
-      MsTablePagination,
-      MsTag,
-      MsApiCaseList,
-      MsContainer,
-      MsBottomContainer,
-      ShowMoreBtn,
-      MsBatchEdit,
-      MsApiCaseTableExtendBtns,
+    MsContainer,
+    MsBottomContainer,
+    ShowMoreBtn,
+    MsBatchEdit,
+    MsApiCaseTableExtendBtns,
       MsReferenceView,
       MsTableAdvSearchBar
     },
     data() {
       return {
+        type: API_CASE_LIST,
+        headerItems: Api_Case_List,
+        tableLabel: Api_Case_List,
         condition: {
           components: API_CASE_CONFIGS
         },
@@ -636,7 +628,6 @@ export default {
         });
       },
     },
-  },
 }
 </script>
 

From d1789dd154e9c2ab0dd4be081bb312b08cf89d7a Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Fri, 19 Feb 2021 18:29:47 +0800
Subject: [PATCH 18/23] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89->=E6=96=87=E6=A1=A3=20=E5=A2=9E=E5=8A=A0JSON-Schema?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C=E6=9F=A5=E6=89=BE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

接口定义->文档 增加JSON-Schema的显示和查找功能
---
 .../api/dto/ApiDocumentInfoDTO.java           |   2 +
 .../api/dto/ApiDocumentRequest.java           |   3 +
 .../api/service/ApiDocumentService.java       |  62 ++-
 .../base/mapper/ext/ExtApiDocumentMapper.xml  |  17 +-
 .../components/document/ApiDocumentItem.vue   | 513 +++++++++++-------
 frontend/src/i18n/en-US.js                    |  30 +
 frontend/src/i18n/zh-CN.js                    |  32 +-
 frontend/src/i18n/zh-TW.js                    |  30 +
 8 files changed, 488 insertions(+), 201 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiDocumentInfoDTO.java b/backend/src/main/java/io/metersphere/api/dto/ApiDocumentInfoDTO.java
index 507bce94a1..ab0e50c00c 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ApiDocumentInfoDTO.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiDocumentInfoDTO.java
@@ -22,6 +22,8 @@ public class ApiDocumentInfoDTO {
     private String requestBodyParamType;
     private String requestBodyFormData;
     private String requestBodyStrutureData;
+    private Object requestPreviewData;
+    private Object jsonSchemaBody;
 
     private String responseHead;
     private String responseBody;
diff --git a/backend/src/main/java/io/metersphere/api/dto/ApiDocumentRequest.java b/backend/src/main/java/io/metersphere/api/dto/ApiDocumentRequest.java
index 87f3e3d53e..e517a1f130 100644
--- a/backend/src/main/java/io/metersphere/api/dto/ApiDocumentRequest.java
+++ b/backend/src/main/java/io/metersphere/api/dto/ApiDocumentRequest.java
@@ -16,4 +16,7 @@ public class ApiDocumentRequest {
     private String projectId;
     private List<String> moduleIds;
     private String shareId;
+    private String name;
+    private String type;
+    private String orderCondition;
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDocumentService.java b/backend/src/main/java/io/metersphere/api/service/ApiDocumentService.java
index d15312e0c9..08a67d60c0 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDocumentService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDocumentService.java
@@ -35,6 +35,7 @@ public class ApiDocumentService {
 
     public ApiDocumentInfoDTO conversionModelToDTO(ApiDefinitionWithBLOBs apiModel) {
         ApiDocumentInfoDTO apiInfoDTO = new ApiDocumentInfoDTO();
+        JSONObject previewObj = new JSONObject();
         if (apiModel != null) {
             apiInfoDTO.setId(apiModel.getId());
             apiInfoDTO.setName(apiModel.getName());
@@ -43,7 +44,6 @@ public class ApiDocumentService {
             apiInfoDTO.setStatus(apiModel.getStatus());
 
             JSONObject requestJsonObj = JSONObject.parseObject(apiModel.getRequest());
-
             //head赋值
             if (requestJsonObj.containsKey("headers")) {
                 JSONArray requestHeadDataArr = new JSONArray();
@@ -55,9 +55,8 @@ public class ApiDocumentService {
                         requestHeadDataArr.add(headObj);
                     }
                 }
-            apiInfoDTO.setRequestHead(requestHeadDataArr.toJSONString());
+                apiInfoDTO.setRequestHead(requestHeadDataArr.toJSONString());
             }
-
             //url参数赋值
             JSONArray urlParamArr = new JSONArray();
             if (requestJsonObj.containsKey("arguments")) {
@@ -81,17 +80,43 @@ public class ApiDocumentService {
                 }
             }
             apiInfoDTO.setUrlParams(urlParamArr.toJSONString());
-
             //请求体参数类型
             if (requestJsonObj.containsKey("body")) {
                 JSONObject bodyObj = requestJsonObj.getJSONObject("body");
                 if (bodyObj.containsKey("type")) {
                     String type = bodyObj.getString("type");
-                    apiInfoDTO.setRequestBodyParamType(type);
-                    if (StringUtils.equalsAny(type, "JSON", "XML", "Raw")) {
+                    if(StringUtils.equals(type,"WWW_FORM")){
+                        apiInfoDTO.setRequestBodyParamType("x-www-from-urlencoded");
+                    }else if(StringUtils.equals(type,"Form Data")) {
+                        apiInfoDTO.setRequestBodyParamType("form-data");
+                    }else {
+                        apiInfoDTO.setRequestBodyParamType(type);
+                    }
+
+                    if (StringUtils.equals(type, "JSON")) {
+                        //判断是否是JsonSchema
+                        boolean isJsonSchema = false;
+                        if(bodyObj.containsKey("format")){
+                            String foramtValue = String.valueOf(bodyObj.get("format"));
+                            if(StringUtils.equals("JSON-SCHEMA",foramtValue)){
+                                isJsonSchema = true;
+                            }
+                        }
+                        if(isJsonSchema){
+                            apiInfoDTO.setRequestBodyParamType("JSON-SCHEMA");
+                            apiInfoDTO.setJsonSchemaBody(bodyObj);
+                        }else {
+                            if (bodyObj.containsKey("raw")) {
+                                String raw = bodyObj.getString("raw");
+                                apiInfoDTO.setRequestBodyStrutureData(raw);
+                                previewObj = JSONObject.parseObject(raw);
+                            }
+                        }
+                    } else if (StringUtils.equalsAny(type, "XML", "Raw")) {
                         if (bodyObj.containsKey("raw")) {
                             String raw = bodyObj.getString("raw");
                             apiInfoDTO.setRequestBodyStrutureData(raw);
+                            previewObj = JSONObject.parseObject(raw);
                         }
                     } else if (StringUtils.equalsAny(type, "Form Data", "WWW_FORM")) {
                         if (bodyObj.containsKey("kvs")) {
@@ -99,8 +124,9 @@ public class ApiDocumentService {
                             JSONArray kvsArr = bodyObj.getJSONArray("kvs");
                             for (int i = 0; i < kvsArr.size(); i++) {
                                 JSONObject kv = kvsArr.getJSONObject(i);
-                                if (kv.containsKey("name")) {
+                                if (kv.containsKey("name")&&kv.containsKey("value")) {
                                     bodyParamArr.add(kv);
+                                    previewObj.put(String.valueOf(kv.get("name")),String.valueOf(kv.get("value")));
                                 }
                             }
                             apiInfoDTO.setRequestBodyFormData(bodyParamArr.toJSONString());
@@ -108,12 +134,11 @@ public class ApiDocumentService {
                     } else if (StringUtils.equals(type, "BINARY")) {
                         if (bodyObj.containsKey("binary")) {
                             List<Map<String, String>> bodyParamList = new ArrayList<>();
-                            JSONArray kvsArr = bodyObj.getJSONArray("kvs");
+                            JSONArray kvsArr = bodyObj.getJSONArray("binary");
                             for (int i = 0; i < kvsArr.size(); i++) {
                                 JSONObject kv = kvsArr.getJSONObject(i);
                                 if (kv.containsKey("description") && kv.containsKey("files")) {
                                     Map<String, String> bodyMap = new HashMap<>();
-
                                     String name = kv.getString("description");
                                     JSONArray fileArr = kv.getJSONArray("files");
                                     String value = "";
@@ -123,11 +148,12 @@ public class ApiDocumentService {
                                             value += fileObj.getString("name") + " ;";
                                         }
                                     }
-
                                     bodyMap.put("name", name);
                                     bodyMap.put("value", value);
-
+                                    bodyMap.put("contentType", "File");
                                     bodyParamList.add(bodyMap);
+
+                                    previewObj.put(String.valueOf(name),String.valueOf(value));
                                 }
                             }
                             apiInfoDTO.setRequestBodyFormData(JSONArray.toJSONString(bodyParamList));
@@ -135,7 +161,6 @@ public class ApiDocumentService {
                     }
                 }
             }
-
             JSONObject responseJsonObj = JSONObject.parseObject(apiModel.getResponse());
             //赋值响应头
             if (responseJsonObj.containsKey("headers")) {
@@ -149,13 +174,18 @@ public class ApiDocumentService {
                 }
                 apiInfoDTO.setResponseHead(responseHeadDataArr.toJSONString());
             }
-
             // 赋值响应体
             if (responseJsonObj.containsKey("body")) {
                 JSONObject bodyObj = responseJsonObj.getJSONObject("body");
                 if (bodyObj.containsKey("type")) {
                     String type = bodyObj.getString("type");
-                    apiInfoDTO.setResponseBodyParamType(type);
+                    if(StringUtils.equals(type,"WWW_FORM")){
+                        apiInfoDTO.setResponseBodyParamType("x-www-from-urlencoded");
+                    }else if(StringUtils.equals(type,"Form Data")) {
+                        apiInfoDTO.setResponseBodyParamType("form-data");
+                    }else {
+                        apiInfoDTO.setResponseBodyParamType(type);
+                    }
                     if (StringUtils.equalsAny(type, "JSON", "XML", "Raw")) {
                         if (bodyObj.containsKey("raw")) {
                             String raw = bodyObj.getString("raw");
@@ -191,10 +221,8 @@ public class ApiDocumentService {
                                             value += fileObj.getString("name") + " ;";
                                         }
                                     }
-
                                     bodyMap.put("name", name);
                                     bodyMap.put("value", value);
-
                                     bodyParamList.add(bodyMap);
                                 }
                             }
@@ -203,7 +231,6 @@ public class ApiDocumentService {
                     }
                 }
             }
-
             // 赋值响应码
             if (responseJsonObj.containsKey("statusCode")) {
                 JSONArray responseStatusDataArr = new JSONArray();
@@ -217,6 +244,7 @@ public class ApiDocumentService {
                 apiInfoDTO.setResponseCode(responseStatusDataArr.toJSONString());
             }
         }
+        apiInfoDTO.setRequestPreviewData(previewObj);
         return apiInfoDTO;
     }
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml
index ddf50ac9e4..d0e9515f31 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDocumentMapper.xml
@@ -7,6 +7,13 @@
             <if test="request.projectId != null">
                 api.project_Id = #{request.projectId}
             </if>
+            <if test="request.name != null">
+                api.project_Id like CONCAT('%', #{request.name},'%')
+            </if>
+            <if test="request.type != null">
+                api.method = #{request.type}
+            </if>
+
             <if test="request.moduleIds != null and request.moduleIds.size() > 0">
                 AND api.module_id in
                 <foreach collection="request.moduleIds" item="nodeId" separator="," open="(" close=")">
@@ -14,6 +21,14 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY api.create_time DESC
+        <if test="request.orderCondition == 'createTimeDesc'">
+            ORDER BY api.create_time DESC
+        </if>
+        <if test="request.orderCondition == 'editTimeAsc'">
+            ORDER BY api.update_time
+        </if>
+        <if test="request.orderCondition == 'editTimeDesc'">
+            ORDER BY api.update_time DESC
+        </if>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue b/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue
index 43e64658c5..6b2c0e1925 100644
--- a/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue
+++ b/frontend/src/business/components/api/definition/components/document/ApiDocumentItem.vue
@@ -1,17 +1,44 @@
 <template>
-  <el-container>
-    <el-main>
+  <div>
+    <el-container>
+      <el-main style="padding-top: 0px">
+        <el-row>
+          <el-select size="small" :placeholder="$t('api_test.definition.document.order')" v-model="apiSearch.orderCondition" style="float: right;width: 180px;margin-right: 5px"
+                     class="ms-api-header-select" @change="initApiDocSimpleList" clearable>
+            <el-option key="createTimeDesc" :label="$t('api_test.definition.document.create_time_sort')" value="createTimeDesc" />
+            <el-option key="editTimeAsc" :label="$t('api_test.definition.document.edit_time_positive_sequence')" value="editTimeAsc"/>
+            <el-option key="editTimeDesc" :label="$t('api_test.definition.document.edit_time_Reverse_order')" value="editTimeDesc"/>
+          </el-select>
+
+          <el-select size="small" :placeholder="$t('api_test.definition.document.request_method')" v-model="apiSearch.type" style="float: right;width: 180px;margin-right: 5px"
+                     class="ms-api-header-select" @change="initApiDocSimpleList" clearable>
+            <el-option key="ALL" :label="$t('api_test.definition.document.data_set.all')" value="ALL"/>
+            <el-option key="GET" :label="'GET '+$t('api_test.definition.document.request_interface')" value="GET"/>
+            <el-option key="POST" :label="'POST '+$t('api_test.definition.document.request_interface')" value="POST"/>
+            <el-option key="PUT" :label="'PUT '+$t('api_test.definition.document.request_interface')" value="PUT"/>
+            <el-option key="DELETE" :label="'DELETE '+$t('api_test.definition.document.request_interface')" value="DELETE"/>
+            <el-option key="PATCH" :label="'PATCH '+$t('api_test.definition.document.request_interface')" value="PATCH"/>
+            <el-option key="OPTIONS" :label="'OPTIONS '+$t('api_test.definition.document.request_interface')" value="OPTIONS"/>
+            <el-option key="HEAD" :label="'HEAD '+$t('api_test.definition.document.request_interface')" value="HEAD"/>
+            <el-option key="CONNECT" :label="'CONNECT '+$t('api_test.definition.document.request_interface')" value="CONNECT"/>
+          </el-select>
+          <el-input :placeholder="$t('api_test.definition.document.search_by_api_name')" @blur="initApiDocSimpleList()" style="float: right;width: 180px;margin-right: 5px" size="small"
+                    @keyup.enter.native="initApiDocSimpleList()" v-model="apiSearch.name"/>
+        </el-row>
+        <el-divider></el-divider>
         <div ref="apiDocInfoDiv">
           <div style="margin-bottom: 50px">
             <div style="font-size: 17px">
-              {{apiInfo.name}}
+              <i class="el-icon-share"></i>{{ apiInfo.name }}
               <span class="apiStatusTag">
               <api-status :value="apiInfo.status"/>
             </span>
             </div>
             <!--api请求信息-->
             <el-row class="apiInfoRow">
-              <div class="tip">请求信息</div>
+              <div class="tip">
+                {{ $t('api_test.definition.document.request_info') }}
+              </div>
             </el-row>
             <el-row class="apiInfoRow">
               <div class="simpleFontClass">
@@ -19,25 +46,25 @@
                         :style="{'background-color': getColor(apiInfo.method), border: getColor(apiInfo.method),borderRadius:'0px', marginRight:'20px'}">
                   {{ apiInfo.method }}
                 </el-tag>
-                {{apiInfo.uri}}
+                {{ apiInfo.uri }}
               </div>
             </el-row>
             <!--api请求头-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                请求头：
+                {{ $t('api_test.definition.document.request_head') }}：
                 <div v-if="getJsonArr(apiInfo.requestHead).length==0">
-                  无
+                  {{ $t('api_test.definition.document.data_set.none') }}
                 </div>
                 <div v-else>
                   <el-table border :show-header="false"
-                            :data="getJsonArr(apiInfo.requestHead)" row-key="name" class="test-content adjust-table">
-                    <el-table-column  prop="name"
-                                      label="名称"
-                                      show-overflow-tooltip/>
-                    <el-table-column  prop="value"
-                                      label="值"
-                                      show-overflow-tooltip/>
+                            :data="getJsonArr(apiInfo.requestHead)" row-key="name" class="test-content document-table">
+                    <el-table-column prop="name"
+                                     :label="$t('api_test.definition.document.table_coloum.name')"
+                                     show-overflow-tooltip/>
+                    <el-table-column prop="value"
+                                     :label="$t('api_test.definition.document.table_coloum.value')"
+                                     show-overflow-tooltip/>
                   </el-table>
                 </div>
               </div>
@@ -45,29 +72,29 @@
             <!--URL参数-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                URL参数：
+                URL{{ $t('api_test.definition.document.request_param') }}：
                 <div v-if="getJsonArr(apiInfo.urlParams).length==0">
-                  无
+                  {{ $t('api_test.definition.document.data_set.none') }}
                 </div>
                 <div v-else>
                   <el-table border
-                            :data="getJsonArr(apiInfo.urlParams)" row-key="name" class="test-content adjust-table">
-                    <el-table-column  prop="name"
-                                      label="名称"
-                                      min-width="120px"
-                                      show-overflow-tooltip/>
-                    <el-table-column  prop="isEnable"
-                                      label="是否必填"
-                                      min-width="80px"
-                                      show-overflow-tooltip/>
-                    <el-table-column  prop="value"
-                                      label="值"
-                                      min-width="120px"
-                                      show-overflow-tooltip/>
-                    <el-table-column  prop="description"
-                                      label="描述"
-                                      min-width="450px"
-                                      show-overflow-tooltip/>
+                            :data="getJsonArr(apiInfo.urlParams)" row-key="name" class="test-content document-table">
+                    <el-table-column prop="name"
+                                     :label="$t('api_test.definition.document.table_coloum.name')"
+                                     min-width="120px"
+                                     show-overflow-tooltip/>
+                    <el-table-column prop="isEnable"
+                                     :label="$t('api_test.definition.document.table_coloum.is_required')"
+                                     min-width="80px"
+                                     show-overflow-tooltip/>
+                    <el-table-column prop="value"
+                                     :label="$t('api_test.definition.document.table_coloum.value')"
+                                     min-width="120px"
+                                     show-overflow-tooltip/>
+                    <el-table-column prop="description"
+                                     :label="$t('api_test.definition.document.table_coloum.desc')"
+                                     min-width="280px"
+                                     show-overflow-tooltip/>
                   </el-table>
                 </div>
               </div>
@@ -75,57 +102,67 @@
             <!--api请求体 以及表格-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                请求体
+                {{ $t('api_test.definition.document.request_body') }}
               </div>
               <div class="smallFontClass">
-                类型:{{apiInfo.requestBodyParamType}}
+                {{ $t('api_test.definition.document.table_coloum.type') }}:{{ apiInfo.requestBodyParamType }}
               </div>
               <div>
-                <el-table border v-if="apiInfo.requestBodyParamType=='kv'"
-                          :data="getJsonArr(apiInfo.requestBodyFormData)" row-key="id" class="test-content adjust-table">
-                  <el-table-column  prop="name"
-                                    label="名称"
-                                    min-width="120px"
-                                    show-overflow-tooltip/>
-                  <el-table-column  prop="contentType"
-                                    label="类型"
-                                    min-width="80px"
-                                    show-overflow-tooltip/>
-                  <el-table-column  prop="description"
-                                    label="描述"
-                                    min-width="450px"
-                                    show-overflow-tooltip/>
-                  <el-table-column  label="必需"
-                                    min-width="80px"
-                                    show-overflow-tooltip>
-                    <template v-slot:default="scope">
-                      <div v-if="scope.enable">是</div>
-                      <div v-else-if="!scope.enable">否</div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column  prop="value"
-                                    label="默认值"
-                                    min-width="120px"
-                                    show-overflow-tooltip/>
+                <el-table border v-if="formParamTypes.includes(apiInfo.requestBodyParamType)"
+                          :data="getJsonArr(apiInfo.requestBodyFormData)" row-key="name"
+                          class="test-content document-table">
+                  <el-table-column prop="name"
+                                   :label="$t('api_test.definition.document.table_coloum.name')"
+                                   min-width="120px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="contentType"
+                                   :label="$t('api_test.definition.document.table_coloum.type')"
+                                   min-width="120px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="description"
+                                   :label="$t('api_test.definition.document.table_coloum.desc')"
+                                   min-width="280px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="required"
+                                   :label="$t('api_test.definition.document.table_coloum.is_required')"
+                                   :formatter="formatBoolean"
+                                   min-width="80px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="value"
+                                   :label="$t('api_test.definition.document.table_coloum.default_value')"
+                                   min-width="120px"
+                                   show-overflow-tooltip/>
                 </el-table>
+                <div v-else-if="apiInfo.requestBodyParamType == 'JSON-SCHEMA'">
+                  <ms-json-code-edit :body="apiInfo.jsonSchemaBody" ref="jsonCodeEdit"/>
+                </div>
+                <div v-else class="showDataDiv">
+                  <br/>
+                  <p style="margin: 0px 20px;"
+                     v-html="formatRowData(apiInfo.requestBodyParamType,apiInfo.requestBodyStrutureData)">
+                  </p>
+                  <br/>
+                </div>
               </div>
             </el-row>
             <!--范例展示-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                范例展示
+                {{ $t('api_test.definition.document.example_presentation') }}
               </div>
               <div class="showDataDiv">
                 <br/>
-                <p style="margin: 0px 20px;">
-                  {{ apiInfo.requestBodyStrutureData }}
+                <p style="margin: 0px 20px;"
+                   v-html="genPreviewData(apiInfo.requestPreviewData)">
                 </p>
                 <br/>
               </div>
             </el-row>
             <!--响应信息-->
             <el-row class="apiInfoRow">
-              <div class="tip">响应信息</div>
+              <div class="tip">
+                {{ $t('api_test.definition.document.response_info') }}
+              </div>
             </el-row>
             <el-row class="apiInfoRow">
 
@@ -133,133 +170,153 @@
             <!--响应头-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                响应头:
+                {{ $t('api_test.definition.document.response_head') }}:
                 <el-table border :show-header="false"
-                          :data="getJsonArr(apiInfo.responseHead)" row-key="name" class="test-content adjust-table">
-                  <el-table-column  prop="name"
-                                    label="名称"
-                                    show-overflow-tooltip/>
-                  <el-table-column  prop="value"
-                                    label="值"
-                                    show-overflow-tooltip/>
+                          :data="getJsonArr(apiInfo.responseHead)" row-key="name" class="test-content document-table">
+                  <el-table-column prop="name"
+                                   :label="$t('api_test.definition.document.table_coloum.name')"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="value"
+                                   :label="$t('api_test.definition.document.table_coloum.value')"
+                                   show-overflow-tooltip/>
                 </el-table>
               </div>
             </el-row>
             <!--响应体-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                响应体
+                {{ $t('api_test.definition.document.response_body') }}
               </div>
               <div class="smallFontClass">
-                类型:{{apiInfo.responseBodyParamType}}
+                {{ $t('api_test.definition.document.table_coloum.type') }}:{{ apiInfo.responseBodyParamType }}
               </div>
               <div>
-                <el-table border v-if="apiInfo.responseBodyParamType=='kv'"
-                          :data="getJsonArr(apiInfo.responseBodyFormData)" row-key="id" class="test-content adjust-table">
-                  <el-table-column  prop="name"
-                                    label="名称"
-                                    min-width="120px"
-                                    show-overflow-tooltip/>
-                  <el-table-column  prop="contentType"
-                                    label="类型"
-                                    min-width="80px"
-                                    show-overflow-tooltip/>
-                  <el-table-column  prop="description"
-                                    label="描述"
-                                    min-width="450px"
-                                    show-overflow-tooltip/>
-                  <el-table-column  label="必需"
-                                    min-width="80px"
-                                    show-overflow-tooltip>
-                    <template v-slot:default="scope">
-                      <div v-if="scope.enable">是</div>
-                      <div v-else-if="!scope.enable">否</div>
-                    </template>
-                  </el-table-column>
-                  <el-table-column  prop="value"
-                                    label="默认值"
-                                    min-width="120px"
-                                    show-overflow-tooltip/>
+                <el-table border v-if="formParamTypes.includes(apiInfo.responseBodyParamType)"
+                          :data="getJsonArr(apiInfo.responseBodyFormData)" row-key="id"
+                          class="test-content document-table">
+                  <el-table-column prop="name"
+                                   :label="$t('api_test.definition.document.table_coloum.name')"
+                                   min-width="120px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="contentType"
+                                   :label="$t('api_test.definition.document.table_coloum.type')"
+                                   min-width="120px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="description"
+                                   :label="$t('api_test.definition.document.table_coloum.desc')"
+                                   min-width="280px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="required"
+                                   :label="$t('api_test.definition.document.table_coloum.is_required')"
+                                   :formatter="formatBoolean"
+                                   min-width="80px"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="value"
+                                   :label="$t('api_test.definition.document.table_coloum.default_value')"
+                                   min-width="120px"
+                                   show-overflow-tooltip/>
                 </el-table>
+                <div v-else class="showDataDiv">
+                  <br/>
+                  <p style="margin: 0px 20px;"
+                     v-html="formatRowData(apiInfo.responseBodyParamType,apiInfo.responseBodyStrutureData)">
+                  </p>
+                  <br/>
+                </div>
               </div>
             </el-row>
             <!--响应状态码-->
             <el-row class="apiInfoRow">
               <div class="blackFontClass">
-                响应状态码:
+                {{ $t('api_test.definition.document.response_code') }}:
                 <el-table border :show-header="false"
-                          :data="getJsonArr(apiInfo.responseCode)" row-key="name" class="test-content adjust-table">
-                  <el-table-column  prop="name"
-                                    label="名称"
-                                    show-overflow-tooltip/>
-                  <el-table-column  prop="value"
-                                    label="值"
-                                    show-overflow-tooltip/>
+                          :data="getJsonArr(apiInfo.responseCode)" row-key="name" class="test-content document-table">
+                  <el-table-column prop="name"
+                                   :label="$t('api_test.definition.document.table_coloum.name')"
+                                   show-overflow-tooltip/>
+                  <el-table-column prop="value"
+                                   :label="$t('api_test.definition.document.table_coloum.value')"
+                                   show-overflow-tooltip/>
                 </el-table>
               </div>
             </el-row>
           </div>
         </div>
-    </el-main>
-    <!-- 右侧列表 -->
-    <el-aside width="200px">
-      <div ref="apiDocList">
-        <el-steps style="height: 40%" direction="vertical" :active="apiStepIndex">
+      </el-main>
+      <!-- 右侧列表 -->
+      <el-aside width="200px" style="margin-top: 70px;">
+        <div ref="apiDocList" >
+          <el-steps style="height: 40%" direction="vertical" :active="apiStepIndex">
             <el-step v-for="(apiInfo) in apiSimpleInfoArray" :key="apiInfo.id" @click.native="clickStep(apiInfo.id)">
-              <el-link slot="title">{{apiInfo.name}}</el-link>
+              <el-link slot="title">{{ apiInfo.name }}</el-link>
             </el-step>
-        </el-steps>
-      </div>
-    </el-aside>
-  </el-container>
+          </el-steps>
+        </div>
+      </el-aside>
+    </el-container>
+  </div>
 </template>
 
 <script>
 import MsAnchor from "./Anchor";
 import {API_METHOD_COLOUR} from "@/business/components/api/definition/model/JsonData";
-import {jsonToMap} from "@/common/js/utils";
+import MsCodeEdit from "@/business/components/common/components/MsCodeEdit";
+import {formatJson,} from "@/common/js/format-utils";
 import ApiStatus from "@/business/components/api/definition/components/list/ApiStatus";
-import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
+import {calculate} from "@/business/components/api/definition/model/ApiTestModel";
+import MsJsonCodeEdit from "@/business/components/common/json-schema/JsonSchemaEditor";
+
+
 export default {
   name: "ApiDocumentItem",
   components: {
-    MsAnchor,ApiStatus,
+    MsJsonCodeEdit,
+    MsAnchor, ApiStatus, MsCodeEdit,
   },
   data() {
     return {
-      apiStepIndex:0,
-      apiSimpleInfoArray:[],
-      apiInfo:{
-          method:"无",
-          uri:"无",
-          name:"无",
-          id:"",
-          requestHead:"无",
-          urlParams:"无",
-          requestBodyParamType:"无",
-          requestBodyFormData:'[]',
-          requestBodyStrutureData:"",
-          responseHead:"无",
-          responseBody:"",
-          responseBodyParamType:"无",
-          responseBodyFormData:"无",
-          responseBodyStrutureData:"无",
-          responseCode:"无",
+      apiStepIndex: 0,
+      apiSimpleInfoArray: [],
+      modes: ['text', 'json', 'xml', 'html'],
+      formParamTypes: ['form-data', 'x-www-from-urlencoded', 'BINARY'],
+      mockVariableFuncs: [],
+      apiSearch:{
+        name:"",
+        type:"ALL",
+        orderCondition:"createTimeDesc",
+      },
+      apiInfo: {
+        method: "无",
+        uri: "无",
+        name: "无",
+        id: "",
+        requestHead: "无",
+        urlParams: "无",
+        requestBodyParamType: "无",
+        requestBodyFormData: '[]',
+        requestBodyStrutureData: "",
+        jsonSchemaBody: {},
+        responseHead: "无",
+        responseBody: "",
+        responseBodyParamType: "无",
+        responseBodyFormData: "无",
+        responseBodyStrutureData: "无",
+        responseCode: "无",
       },
       methodColorMap: new Map(API_METHOD_COLOUR),
-      clientHeight:'',//坚挺浏览器高度
+      clientHeight: '',//坚挺浏览器高度
     }
   },
   props: {
-    projectId:String,
-    moduleIds:Array,
+    projectId: String,
+    moduleIds: Array,
   },
   activated() {
     this.initApiDocSimpleList();
     this.clientHeight = `${document.documentElement.clientHeight}`;//获取浏览器可视区域高度
     let that = this;
-    window.onresize = function(){
-      this.clientHeight =  `${document.documentElement.clientHeight}`;
+    window.onresize = function () {
+      this.clientHeight = `${document.documentElement.clientHeight}`;
       this.changeFixed(this.clientHeight);
     }
   },
@@ -267,16 +324,16 @@ export default {
     this.initApiDocSimpleList();
     this.clientHeight = `${document.documentElement.clientHeight}`;//获取浏览器可视区域高度
     let that = this;
-    window.onresize = function(){
-      this.clientHeight =  `${document.documentElement.clientHeight}`;
+    window.onresize = function () {
+      this.clientHeight = `${document.documentElement.clientHeight}`;
       this.changeFixed(this.clientHeight);
     }
   },
   mounted() {
     let that = this;
-    window.onresize = function(){
-      this.clientHeight =  `${document.documentElement.clientHeight}`;
-      if(that.$refs.apiDocInfoDiv){
+    window.onresize = function () {
+      this.clientHeight = `${document.documentElement.clientHeight}`;
+      if (that.$refs.apiDocInfoDiv) {
         that.$refs.apiDocInfoDiv.style.minHeight = this.clientHeight - 300 + 'px';
         that.$refs.apiDocList.style.minHeight = this.clientHeight - 300 + 'px';
 
@@ -291,109 +348,172 @@ export default {
   watch: {
     '$route.params.documentId'() {
     },
-    moduleIds(){
+    moduleIds() {
       this.initApiDocSimpleList();
     },
-    clientHeight(){     //如果clientHeight 发生改变，这个函数就会运行
+    clientHeight() {     //如果clientHeight 发生改变，这个函数就会运行
       this.changeFixed(this.clientHeight);
     }
   },
   methods: {
-    changeFixed(clientHeight){
-      if(this.$refs.apiDocInfoDiv){
-        this.$refs.apiDocInfoDiv.style.height = clientHeight -300 + 'px';
+    formatRowData(dataType, data) {
+      var returnData = data;
+      if (data) {
+        returnData = data.replace(/\n/g, '<br>');
+      }
+      return returnData;
+    },
+    changeFixed(clientHeight) {
+      if (this.$refs.apiDocInfoDiv) {
+        this.$refs.apiDocInfoDiv.style.height = clientHeight - 350 + 'px';
         this.$refs.apiDocInfoDiv.style.overflow = 'auto';
-        this.$refs.apiDocList.style.height = clientHeight -300 + 'px';
+        this.$refs.apiDocList.style.height = clientHeight - 350 + 'px';
 
       }
     },
-    initApiDocSimpleList(){
-      let simpleRequest = {};
-      if(this.projectId!=null && this.projectId!= ""){
-        simpleRequest.projectId=this.projectId;
+    initApiDocSimpleList() {
+      let simpleRequest = this.apiSearch;
+      if (this.projectId != null && this.projectId != "") {
+        simpleRequest.projectId = this.projectId;
       }
-      if(this.documentId!=null && this.documentId!= ""){
-        simpleRequest.documentId=this.documentId;
+      if (this.documentId != null && this.documentId != "") {
+        simpleRequest.documentId = this.documentId;
       }
-      if(this.moduleIds.length>0){
-        simpleRequest.moduleIds=this.moduleIds;
+      if (this.moduleIds.length > 0) {
+        simpleRequest.moduleIds = this.moduleIds;
       }
 
       let simpleInfoUrl = "/api/document/selectApiSimpleInfo";
       this.$post(simpleInfoUrl, simpleRequest, response => {
         this.apiSimpleInfoArray = response.data;
         this.apiStepIndex = 0;
-        if(this.apiSimpleInfoArray.length>0){
+        if (this.apiSimpleInfoArray.length > 0) {
           this.selectApiInfo(this.apiSimpleInfoArray[0].id);
         }
       });
     },
-    selectApiInfo(apiId){
-      let simpleInfoUrl = "/api/document/selectApiInfoById/"+apiId;
+    selectApiInfo(apiId) {
+      let simpleInfoUrl = "/api/document/selectApiInfoById/" + apiId;
       this.$get(simpleInfoUrl, response => {
         this.apiInfo = response.data;
       });
     },
-    clickStep(apiId){
+    clickStep(apiId) {
       for (let index = 0; index < this.apiSimpleInfoArray.length; index++) {
-        if(apiId == this.apiSimpleInfoArray[index].id){
+        if (apiId == this.apiSimpleInfoArray[index].id) {
           this.apiStepIndex = index;
           break;
         }
       }
       this.selectApiInfo(apiId);
     },
-    stepClick(stepIndex){
+    stepClick(stepIndex) {
       this.apiStepIndex = stepIndex;
     },
     getColor(enable, method) {
       return this.methodColorMap.get(method);
     },
-    getJsonArr(jsonString){
+    formatBoolean(row, column, cellValue) {
+      var ret = ''  //你想在页面展示的值
+      if (cellValue) {
+        ret = "是"  //根据自己的需求设定
+      } else {
+        ret = "否"
+      }
+      return ret;
+
+    },
+    getJsonArr(jsonString) {
       let returnJsonArr = [];
-      if(jsonString == '无'){
+      if (jsonString == '无') {
         return returnJsonArr;
       }
 
       let jsonArr = JSON.parse(jsonString);
       //遍历，把必填项空的数据去掉
-      for(var index = 0;index < jsonArr.length;index++){
+      for (var index = 0; index < jsonArr.length; index++) {
         var item = jsonArr[index];
-        if(item.name!="" && item.name!=null){
+        if (item.name != "" && item.name != null) {
           returnJsonArr.push(item);
         }
       }
       return returnJsonArr;
-    }
+    },
+    //构建预览数据
+    genPreviewData(previewData) {
+      if (previewData != null && previewData != '') {
+        let showDataObj = {};
+        for (var key in previewData) {
+          // showDataObj.set(key,previewData[key]);
+          let value = previewData[key];
+          if (value.indexOf("@") >= 0) {
+            value = this.showPreview(value);
+          }
+          showDataObj[key] = value;
+        }
+        showDataObj = JSON.stringify(showDataObj);
+        previewData = formatJson(showDataObj);
+      }
+      return previewData;
+    },
+    showPreview(itemValue) {
+      // 找到变量本身
+      if (!itemValue) {
+        return;
+      }
+      let index = itemValue.indexOf("|");
+      if (index > -1) {
+        itemValue = itemValue.substring(0, index).trim();
+      }
+
+      this.mockVariableFuncs.forEach(f => {
+        if (!f.name) {
+          return;
+        }
+        itemValue += "|" + f.name;
+        if (f.params) {
+          itemValue += ":" + f.params.map(p => p.value).join(",");
+        }
+      });
+
+      itemValue = calculate(itemValue);
+      return itemValue;
+    },
   },
 }
 </script>
 
 <style scoped>
-.simpleFontClass{
+.simpleFontClass {
   font-size: 14px;
 }
-.blackFontClass{
+
+.blackFontClass {
   font-weight: bold;
   font-size: 14px;
 }
-.smallFontClass{
+
+.smallFontClass {
   font-size: 13px;
   margin: 20px 0px;
 }
+
 .tip {
   padding: 3px 5px;
   font-size: 14px;
   border-radius: 4px;
   border-left: 4px solid #783887;
 }
-.apiInfoRow{
+
+.apiInfoRow {
   margin: 20px 10px;
 }
-.apiStatusTag{
+
+.apiStatusTag {
   margin: 20px 5px;
 }
-.showDataDiv{
+
+.showDataDiv {
   background-color: #F5F7F9;
   margin: 20px 0px;
 }
@@ -405,9 +525,11 @@ export default {
   color: #C0C4CC;
   border-color: #C0C4CC;
 }
-/deep/ .el-step__title.is-finish /deep/ .el-link.el-link--default{
+
+/deep/ .el-step__title.is-finish /deep/ .el-link.el-link--default {
   color: #C0C4CC;
 }
+
 /*
 步骤条中，当前节点样式和当前a标签的样式
 */
@@ -415,8 +537,35 @@ export default {
   color: #783887;
   border-color: #783887;
 }
+
 /deep/ .el-step__title.is-process /deep/ .el-link.el-link--default {
   color: #783887;
 }
 
+.document-table {
+  margin: 20px 10px;
+  width: auto;
+}
+
+.document-table /deep/ .el-table__row {
+  font-size: 12px;
+  font-weight: initial;
+}
+
+.document-table /deep/ .has-gutter {
+  font-size: 12px;
+  color: #404040;
+}
+
+.document-table /deep/ td {
+  border-right: 0px solid #EBEEF5
+}
+
+.document-table /deep/ th {
+  background-color: #FAFAFA;
+  border-right: 0px solid #EBEEF5
+}
+.el-divider--horizontal {
+  margin: 12px 0;
+}
 </style>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 423905fd6f..0203ccccd9 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -596,6 +596,36 @@ export default {
         other_config: "Other Config",
         message_template: "Message Template",
         tcp_parameter_tip: "The request parameters can be referenced in the request template ${XXX}",
+      },
+      document: {
+        order: "Order",
+        create_time_sort: "From back to front by create time",
+        edit_time_positive_sequence: "From front to back by update time",
+        edit_time_Reverse_order: "From back to front by update time",
+        request_method: "Request method",
+        request_interface: "Request interface",
+        search_by_api_name : "Search by api name",
+        request_info: "Request info",
+        request_head: "Request head",
+        request_param: "Param",
+        request_body: "Request body",
+        example_presentation: "Example presentation",
+        response_info: "Response info",
+        response_head: "Response head",
+        response_body: "Response body",
+        response_code: "Response code",
+        table_coloum:{
+          name: "name",
+          value: "value",
+          is_required: "Is it required",
+          desc: "Description",
+          type: "Type",
+          default_value: "Default value",
+        },
+        data_set: {
+          all: "All",
+          none: "None"
+        },
       }
     },
     automation: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index fac1d09d8a..2a10360dbe 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -597,6 +597,36 @@ export default {
         other_config: "其他设置",
         message_template: "报文模版",
         tcp_parameter_tip: "请求参数可以在请求模版通过${xxx}引用",
+      },
+      document: {
+        order: "排序方式",
+        create_time_sort: "按创建时间从后到前",
+        edit_time_positive_sequence: "按更新时间从前到后",
+        edit_time_Reverse_order: "按更新时间从后到前",
+        request_method: "请求方式",
+        request_interface: "请求接口",
+        search_by_api_name : "名称搜索",
+        request_info: "请求信息",
+        request_head: "请求头",
+        request_param: "参数",
+        request_body: "请求体",
+        example_presentation: "范例展示",
+        response_info: "响应信息",
+        response_head: "响应头",
+        response_body: "响应体",
+        response_code: "响应码",
+        table_coloum:{
+          name: "名称",
+          value: "值",
+          is_required: "是否必填",
+          desc: "描述",
+          type: "类型",
+          default_value: "默认值",
+        },
+        data_set: {
+          all: "全部",
+          none: "无"
+        },
       }
     },
     automation: {
@@ -714,7 +744,7 @@ export default {
       jmeter_func: "Jmeter 方法",
       parameters_filter_example: "示例",
       parameters_filter_tips: "只支持 MockJs 函数结果预览",
-      parameters_advance: "高级参数设置",
+      parameters_advance: "return",
       parameters_preview: "预览",
       parameters_mock_filter_tips: "请输入关键字进行过滤",
       parameters_pre_request: "前置请求提取",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 14cb737e8d..a27366c00c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -596,6 +596,36 @@ export default {
         other_config: "其他設置",
         message_template: "報文模版",
         tcp_parameter_tip: "請求參數可以在請求模版通過${xxx}引用",
+      },
+      document: {
+        order: "排序方式",
+        create_time_sort: "按創建時間從後到前",
+        edit_time_positive_sequence: "按更新時間從前到後",
+        edit_time_Reverse_order: "按更新時間從後到前",
+        request_method: "請求方式",
+        request_interface: "請求接口e",
+        search_by_api_name : "API名稱搜索",
+        request_info: "請求信息",
+        request_head: "請求頭",
+        request_param: "參數",
+        request_body: "請求體",
+        example_presentation: "範例展示",
+        response_info: "響應信息",
+        response_head: "響應頭",
+        response_body: "響應體",
+        response_code: "響應碼",
+        table_coloum:{
+          name: "名稱",
+          value: "值",
+          is_required: "是否必填",
+          desc: "描述",
+          type: "類型",
+          default_value: "默認值",
+        },
+        data_set: {
+          all: "全部",
+          none: "無"
+        },
       }
     },
     automation: {

From 217800b24d8077f606b597de39806a72746fdcc2 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Fri, 19 Feb 2021 18:45:36 +0800
Subject: [PATCH 19/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E8=A1=A8key=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改定时任务表key字段长度
---
 .../resources/db/migration/V77__modify_schedule_test_id.sql     | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 backend/src/main/resources/db/migration/V77__modify_schedule_test_id.sql

diff --git a/backend/src/main/resources/db/migration/V77__modify_schedule_test_id.sql b/backend/src/main/resources/db/migration/V77__modify_schedule_test_id.sql
new file mode 100644
index 0000000000..15a8e1591e
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V77__modify_schedule_test_id.sql
@@ -0,0 +1,2 @@
+ALTER TABLE schedule
+    MODIFY COLUMN `key` VARCHAR(255);

From 63b8801aa98240407b79b7939c3d4b633623d3ab Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 11:20:58 +0800
Subject: [PATCH 20/23] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=AE=8C=E5=96=84jmx=E5=AF=BC=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0jmeter=E7=9B=B8=E5=85=B3Sam?=
 =?UTF-8?q?pler=E4=BE=9D=E8=B5=96jar=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               | 43 ++++++++++++++++++-
 .../dto/automation/parse/MsJmeterParser.java  |  3 ++
 .../request/sampler/MsDubboSampler.java       | 18 ++++----
 .../api/automation/ApiAutomation.vue          |  5 +++
 .../automation/scenario/ApiScenarioModule.vue |  2 +-
 .../scenario/common/ScenarioImport.vue        | 12 +++++-
 6 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index aee9f307b3..ddb8681c7b 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -380,7 +380,48 @@
             <artifactId>json-schema-validator</artifactId>
             <version>2.2.6</version>
         </dependency>
-
+        <!-- 添加jmeter包支持导入的jmx能正常执行 -->
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_bolt</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_jms</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_ftp</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_junit</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_ldap</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_mail</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_components</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.jmeter</groupId>
+            <artifactId>ApacheJMeter_native</artifactId>
+            <version>${jmeter.version}</version>
+        </dependency>
+        <!-- 添加jmeter包支持导入的jmx能正常执行 -->
     </dependencies>
 
     <build>
diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
index d8d4a7e573..067a2478d2 100644
--- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
+++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/MsJmeterParser.java
@@ -43,6 +43,7 @@ import io.metersphere.base.domain.ApiScenarioWithBLOBs;
 import io.metersphere.base.domain.ApiTestEnvironmentExample;
 import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs;
 import io.metersphere.commons.constants.LoopConstants;
+import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.BeanUtils;
 import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.LogUtil;
@@ -96,6 +97,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
             return scenarioImport;
         } catch (Exception e) {
             e.printStackTrace();
+            MSException.throwException("当前JMX版本不兼容");
         }
         return null;
     }
@@ -195,6 +197,7 @@ public class MsJmeterParser extends ScenarioImportAbstractParser {
     }
 
     private void convertDubboSample(MsDubboSampler elementNode, DubboSample sampler) {
+        elementNode.setName(sampler.getName());
         elementNode.setType("DubboSampler");
         elementNode.setProtocol("dubbo://");
         elementNode.set_interface(sampler.getPropertyAsString("FIELD_DUBBO_INTERFACE"));
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
index 7fdb15d3b9..88be6b3369 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsDubboSampler.java
@@ -93,14 +93,16 @@ public class MsDubboSampler extends MsTestElement {
         Constants.setInterfaceName(this.get_interface(), sampler);
         Constants.setMethod(this.getMethod(), sampler);
 
-        List<MethodArgument> methodArgs = this.getArgs().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable)
-                .map(keyValue -> new MethodArgument(keyValue.getName(), keyValue.getValue())).collect(Collectors.toList());
-        Constants.setMethodArgs(methodArgs, sampler);
-
-        List<MethodArgument> attachmentArgs = this.getAttachmentArgs().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable)
-                .map(keyValue -> new MethodArgument(keyValue.getName(), keyValue.getValue())).collect(Collectors.toList());
-        Constants.setAttachmentArgs(attachmentArgs, sampler);
-
+        if (CollectionUtils.isNotEmpty(this.getArgs())) {
+            List<MethodArgument> methodArgs = this.getArgs().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable)
+                    .map(keyValue -> new MethodArgument(keyValue.getName(), keyValue.getValue())).collect(Collectors.toList());
+            Constants.setMethodArgs(methodArgs, sampler);
+        }
+        if (CollectionUtils.isNotEmpty(this.getAttachmentArgs())) {
+            List<MethodArgument> attachmentArgs = this.getAttachmentArgs().stream().filter(KeyValue::isValid).filter(KeyValue::isEnable)
+                    .map(keyValue -> new MethodArgument(keyValue.getName(), keyValue.getValue())).collect(Collectors.toList());
+            Constants.setAttachmentArgs(attachmentArgs, sampler);
+        }
         return sampler;
     }
 
diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 120e2f038c..58b6240c65 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -9,6 +9,7 @@
         @setNodeTree="setNodeTree"
         @enableTrash="enableTrash"
         @exportAPI="exportAPI"
+        @refreshAll="refreshAll"
         :type="'edit'"
         ref="nodeTree"/>
     </ms-aside-container>
@@ -264,6 +265,10 @@
         this.setTabTitle(data);
         this.$refs.apiScenarioList.search(data);
       },
+      refreshAll() {
+        this.$refs.nodeTree.list();
+        this.$refs.apiScenarioList.search();
+      },
       setTabTitle(data) {
         for (let index in this.tabs) {
           let tab = this.tabs[index];
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index e26a05ebaf..c603c83b3e 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -40,7 +40,7 @@
       @refresh="refresh"
       ref="basisScenario"/>
 
-    <api-import ref="apiImport" :moduleOptions="moduleOptions" @refresh="$emit('refresh')"/>
+    <api-import ref="apiImport" :moduleOptions="moduleOptions" @refreshAll="$emit('refreshAll')"/>
   </div>
 
 </template>
diff --git a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
index b739caabda..b0f9ec854d 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ScenarioImport.vue
@@ -192,6 +192,15 @@
         return true;
       },
       save() {
+        if (!this.formData.file) {
+          this.$warning("请添加一个文件");
+          return;
+        }
+        let suffix = this.formData.file.name.substring(this.formData.file.name.lastIndexOf('.') + 1);
+        if (this.selectedPlatform.suffixes && !this.selectedPlatform.suffixes.has(suffix)) {
+          this.$warning(this.$t('api_test.api_import.suffixFormatErr'));
+          return false;
+        }
         this.$refs.form.validate(valid => {
           if (valid) {
             let param = this.buildParam();
@@ -199,7 +208,7 @@
               let res = response.data;
               this.$success(this.$t('test_track.case.import.success'));
               this.visible = false;
-              this.$emit('refresh', res);
+              this.$emit('refreshAll', res);
             });
           } else {
             return false;
@@ -211,7 +220,6 @@
         Object.assign(param, this.formData);
         param.platform = this.selectedPlatformValue;
         param.saved = this.saved;
-        console.log(this.formData.moduleId)
         if (this.currentModule) {
           param.moduleId = this.formData.moduleId
           this.moduleOptions.filter(item => {

From 567ae41aa3f4af60f5af97af04cae8d010fdcf6b Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Sat, 20 Feb 2021 11:27:04 +0800
Subject: [PATCH 21/23] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E3=80=81=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E8=BD=AC=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=B8=A6=E5=87=BD=E6=95=B0=E4=BC=9A=E5=B8=A6=E6=9D=A5jmeter?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复接口测试、接口自动化转性能测试时自带函数会带来jmeter报错的问题
---
 .../api/controller/APITestController.java     | 89 ++++++++-----------
 .../api/service/APITestService.java           | 62 +++++++++++++
 .../api/service/ApiAutomationService.java     | 19 ++--
 3 files changed, 110 insertions(+), 60 deletions(-)

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 82e2ec81e8..61eb6e2fef 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -31,6 +31,7 @@ import io.metersphere.service.CheckPermissionService;
 import io.metersphere.service.FileService;
 import io.metersphere.service.ScheduleService;
 import io.metersphere.track.request.testplan.SaveTestPlanRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.shiro.authz.annotation.Logical;
@@ -212,19 +213,19 @@ public class APITestController {
         //查询完成率、进行中、已完成
         List<ApiDataCountResult> countResultByStatelList = apiDefinitionService.countStateByProjectID(projectId);
         apiCountResult.countStatus(countResultByStatelList);
-        long allCount = apiCountResult.getFinishedCount()+apiCountResult.getRunningCount()+apiCountResult.getNotStartedCount();
+        long allCount = apiCountResult.getFinishedCount() + apiCountResult.getRunningCount() + apiCountResult.getNotStartedCount();
 
-        if(allCount!=0){
-            float complateRageNumber =(float)apiCountResult.getFinishedCount()*100/allCount;
+        if (allCount != 0) {
+            float complateRageNumber = (float) apiCountResult.getFinishedCount() * 100 / allCount;
             DecimalFormat df = new DecimalFormat("0.0");
-            apiCountResult.setCompletionRage(df.format(complateRageNumber)+"%");
+            apiCountResult.setCompletionRage(df.format(complateRageNumber) + "%");
         }
 
-        apiCountResult.setHttpCountStr("HTTP&nbsp;&nbsp;<br/><br/>"+apiCountResult.getHttpApiDataCountNumber());
-        apiCountResult.setRpcCountStr("RPC&nbsp;&nbsp;<br/><br/>"+apiCountResult.getRpcApiDataCountNumber());
-        apiCountResult.setTcpCountStr("TCP&nbsp;&nbsp;<br/><br/>"+apiCountResult.getTcpApiDataCountNumber());
-        apiCountResult.setSqlCountStr("SQL&nbsp;&nbsp;<br/><br/>"+apiCountResult.getSqlApiDataCountNumber());
-        return  apiCountResult;
+        apiCountResult.setHttpCountStr("HTTP&nbsp;&nbsp;<br/><br/>" + apiCountResult.getHttpApiDataCountNumber());
+        apiCountResult.setRpcCountStr("RPC&nbsp;&nbsp;<br/><br/>" + apiCountResult.getRpcApiDataCountNumber());
+        apiCountResult.setTcpCountStr("TCP&nbsp;&nbsp;<br/><br/>" + apiCountResult.getTcpApiDataCountNumber());
+        apiCountResult.setSqlCountStr("SQL&nbsp;&nbsp;<br/><br/>" + apiCountResult.getSqlApiDataCountNumber());
+        return apiCountResult;
     }
 
     @GetMapping("/testCaseInfoCount/{projectId}")
@@ -245,21 +246,21 @@ public class APITestController {
         //未覆盖 已覆盖： 统计当前接口下是否含有案例
         List<ApiDataCountResult> countResultByApiCoverageList = apiDefinitionService.countApiCoverageByProjectID(projectId);
         apiCountResult.countApiCoverage(countResultByApiCoverageList);
-        long allCount = apiCountResult.getCoverageCount()+apiCountResult.getUncoverageCount();
+        long allCount = apiCountResult.getCoverageCount() + apiCountResult.getUncoverageCount();
 
-        if(allCount!=0){
-            float coverageRageNumber =(float)apiCountResult.getCoverageCount()*100/allCount;
+        if (allCount != 0) {
+            float coverageRageNumber = (float) apiCountResult.getCoverageCount() * 100 / allCount;
             DecimalFormat df = new DecimalFormat("0.0");
-            apiCountResult.setCoverageRage(df.format(coverageRageNumber)+"%");
+            apiCountResult.setCoverageRage(df.format(coverageRageNumber) + "%");
         }
 
 
-        apiCountResult.setHttpCountStr("HTTP&nbsp;&nbsp;<br/><br/>"+apiCountResult.getHttpApiDataCountNumber());
-        apiCountResult.setRpcCountStr("RPC&nbsp;&nbsp;<br/><br/>"+apiCountResult.getRpcApiDataCountNumber());
-        apiCountResult.setTcpCountStr("TCP&nbsp;&nbsp;<br/><br/>"+apiCountResult.getTcpApiDataCountNumber());
-        apiCountResult.setSqlCountStr("SQL&nbsp;&nbsp;<br/><br/>"+apiCountResult.getSqlApiDataCountNumber());
+        apiCountResult.setHttpCountStr("HTTP&nbsp;&nbsp;<br/><br/>" + apiCountResult.getHttpApiDataCountNumber());
+        apiCountResult.setRpcCountStr("RPC&nbsp;&nbsp;<br/><br/>" + apiCountResult.getRpcApiDataCountNumber());
+        apiCountResult.setTcpCountStr("TCP&nbsp;&nbsp;<br/><br/>" + apiCountResult.getTcpApiDataCountNumber());
+        apiCountResult.setSqlCountStr("SQL&nbsp;&nbsp;<br/><br/>" + apiCountResult.getSqlApiDataCountNumber());
 
-        return  apiCountResult;
+        return apiCountResult;
     }
 
     @GetMapping("/testSceneInfoCount/{projectId}")
@@ -318,28 +319,28 @@ public class APITestController {
         apiCountResult.countScheduleExecute(allExecuteResult);
 
         long allCount = apiCountResult.getExecutedCount();
-        if(allCount!=0){
-            float coverageRageNumber =(float)apiCountResult.getSuccessCount()*100/allCount;
+        if (allCount != 0) {
+            float coverageRageNumber = (float) apiCountResult.getSuccessCount() * 100 / allCount;
             DecimalFormat df = new DecimalFormat("0.0");
-            apiCountResult.setSuccessRage(df.format(coverageRageNumber)+"%");
+            apiCountResult.setSuccessRage(df.format(coverageRageNumber) + "%");
         }
 
-        return  apiCountResult;
+        return apiCountResult;
     }
 
     @GetMapping("/faliureCaseAboutTestPlan/{projectId}/{limitNumber}")
     public List<ExecutedCaseInfoDTO> faliureCaseAboutTestPlan(@PathVariable String projectId, @PathVariable int limitNumber) {
 
-        List<ExecutedCaseInfoResult> selectDataList = apiDefinitionExecResultService.findFaliureCaseInfoByProjectIDAndLimitNumberInSevenDays(projectId,limitNumber);
+        List<ExecutedCaseInfoResult> selectDataList = apiDefinitionExecResultService.findFaliureCaseInfoByProjectIDAndLimitNumberInSevenDays(projectId, limitNumber);
 
         List<ExecutedCaseInfoDTO> returnList = new ArrayList<>(limitNumber);
 
-        for(int dataIndex = 0;dataIndex < limitNumber;dataIndex ++){
+        for (int dataIndex = 0; dataIndex < limitNumber; dataIndex++) {
 
             ExecutedCaseInfoDTO dataDTO = new ExecutedCaseInfoDTO();
-            dataDTO.setSortIndex(dataIndex+1);
+            dataDTO.setSortIndex(dataIndex + 1);
 
-            if(dataIndex<selectDataList.size()){
+            if (dataIndex < selectDataList.size()) {
                 ExecutedCaseInfoResult selectData = selectDataList.get(dataIndex);
                 dataDTO.setCaseID(selectData.getTestCaseID());
                 dataDTO.setCaseName(selectData.getCaseName());
@@ -347,13 +348,13 @@ public class APITestController {
                 dataDTO.setFailureTimes(selectData.getFailureTimes());
                 dataDTO.setCaseType(selectData.getCaseType());
                 dataDTO.setTestPlanDTOList(selectData.getTestPlanDTOList());
-            }else {
+            } else {
                 dataDTO.setCaseName("");
                 dataDTO.setTestPlan("");
             }
             returnList.add(dataDTO);
         }
-        return  returnList;
+        return returnList;
     }
 
     @GetMapping("/runningTask/{projectID}")
@@ -365,11 +366,11 @@ public class APITestController {
                 resultList) {
             taskInfo.setIndex(dataIndex++);
             Date nextExecutionTime = CronUtils.getNextTriggerTime(taskInfo.getRule());
-            if(nextExecutionTime!=null){
+            if (nextExecutionTime != null) {
                 taskInfo.setNextExecutionTime(nextExecutionTime.getTime());
             }
         }
-        return  resultList;
+        return resultList;
     }
 
     @PostMapping(value = "/schedule/updateEnableByPrimyKey")
@@ -378,6 +379,7 @@ public class APITestController {
         schedule.setEnable(request.isEnable());
         apiAutomationService.updateSchedule(schedule);
     }
+
     @PostMapping(value = "/historicalDataUpgrade")
     public String historicalDataUpgrade(@RequestBody SaveHistoricalDataUpgrade request) {
         return historicalDataUpgradeService.upgrade(request);
@@ -390,32 +392,13 @@ public class APITestController {
 
         String testName = runRequest.getName();
 
-        try{
-            //将ThreadGroup的testname改为接口名称
-            Document doc = DocumentHelper.parseText(jmxString);// 获取可续保保单列表报文模板
-            Element root = doc.getRootElement();
-            Element rootHashTreeElement = root.element("hashTree");
-            Element innerHashTreeElement = rootHashTreeElement.elements("hashTree").get(0);
-            Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
-            theadGroupElement.attribute("testname").setText(testName);
-
-            List<Element> thirdHashTreeElementList =innerHashTreeElement.elements("hashTree");
-            for (Element element:thirdHashTreeElementList) {
-                List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
-                for (Element itemElement: sampleProxyElementList) {
-                    itemElement.attribute("testname").setText(testName);
-                }
-            }
-
-            jmxString = root.asXML();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
+        //将jmx处理封装为通用方法
+        jmxString = apiTestService.updateJmxString(jmxString,testName,true);
 
         JmxInfoDTO dto = new JmxInfoDTO();
-        dto.setName(runRequest.getName()+".jmx");
+        dto.setName(runRequest.getName() + ".jmx");
         dto.setXml(jmxString);
-        return  dto;
+        return dto;
     }
 
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 23ae3400e9..10cf3ab666 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -32,6 +32,9 @@ import io.metersphere.track.service.TestCaseService;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.aspectj.util.FileUtil;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -457,4 +460,63 @@ public class APITestService {
             copyBodyFiles(test.getId(), sourceId);
         });
     }
+
+    public String updateJmxString(String jmxString,String testName,boolean updateHTTPSamplerProxyName) {
+        try {
+            //将ThreadGroup的testname改为接口名称
+            Document doc = DocumentHelper.parseText(jmxString);// 获取可续保保单列表报文模板
+            Element root = doc.getRootElement();
+            Element rootHashTreeElement = root.element("hashTree");
+            Element innerHashTreeElement = rootHashTreeElement.elements("hashTree").get(0);
+            Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
+            theadGroupElement.attribute("testname").setText(testName);
+
+            List<Element> thirdHashTreeElementList = innerHashTreeElement.elements("hashTree");
+            for (Element element : thirdHashTreeElementList) {
+                if(updateHTTPSamplerProxyName){
+                    List<Element> sampleProxyElementList = element.elements("HTTPSamplerProxy");
+                    for (Element itemElement : sampleProxyElementList) {
+                        itemElement.attribute("testname").setText(testName);
+                    }
+                }
+                //检查有没有自定义参数
+                List<Element> scriptHashTreeElementList = element.elements("hashTree");
+                for (Element scriptHashTreeElement : scriptHashTreeElementList) {
+                    boolean isRemove = false;
+                    List<Element> removeElement = new ArrayList<>();
+                    List<Element> scriptElementItemList = scriptHashTreeElement.elements();
+                    for (Element hashTreeItemElement : scriptElementItemList) {
+                        String className = hashTreeItemElement.attributeValue("testclass");
+                        String qname = hashTreeItemElement.getQName().getName();
+
+                        if (isRemove) {
+                            if (org.apache.commons.lang3.StringUtils.equals("hashTree", qname)) {
+                                removeElement.add(hashTreeItemElement);
+                            }
+                        }
+                        isRemove = false;
+                        if (org.apache.commons.lang3.StringUtils.equals(className, "JSR223PostProcessor")) {
+                            List<Element> scriptElements = hashTreeItemElement.elements("stringProp");
+                            for (Element scriptElement : scriptElements) {
+                                String scriptName = scriptElement.attributeValue("name");
+                                String contentValue = scriptElement.getStringValue();
+
+                                if ("script".equals(scriptName) && contentValue.startsWith("io.metersphere.api.jmeter.JMeterVars.addVars")) {
+                                    isRemove = true;
+                                    removeElement.add(hashTreeItemElement);
+                                }
+                            }
+                        }
+                    }
+                    for (Element itemElement : removeElement) {
+                        scriptHashTreeElement.remove(itemElement);
+                    }
+                }
+            }
+            jmxString = root.asXML();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return jmxString;
+    }
 }
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 3de0a658c2..6882ef38a5 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -62,6 +62,8 @@ public class ApiAutomationService {
     @Resource
     private ApiScenarioMapper apiScenarioMapper;
     @Resource
+    private APITestService apiTestService;
+    @Resource
     private ExtApiScenarioMapper extApiScenarioMapper;
     @Resource
     private TestPlanApiScenarioMapper testPlanApiScenarioMapper;
@@ -680,14 +682,17 @@ public class ApiAutomationService {
 
         HashTree jmeterHashTree = generateHashTree(apiScenarios, request, null);
         String jmx = testPlan.getJmx(jmeterHashTree);
+
+        jmx = apiTestService.updateJmxString(jmx,testName,false);
+
         //将ThreadGroup的testname改为接口名称
-        Document doc = DocumentHelper.parseText(jmx);// 获取可续保保单列表报文模板
-        Element root = doc.getRootElement();
-        Element rootHashTreeElement = root.element("hashTree");
-        Element innerHashTreeElement = rootHashTreeElement.elements("hashTree").get(0);
-        Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
-        theadGroupElement.attribute("testname").setText(testName);
-        jmx = root.asXML();
+//        Document doc = DocumentHelper.parseText(jmx);// 获取可续保保单列表报文模板
+//        Element root = doc.getRootElement();
+//        Element rootHashTreeElement = root.element("hashTree");
+//        Element innerHashTreeElement = rootHashTreeElement.elements("hashTree").get(0);
+//        Element theadGroupElement = innerHashTreeElement.elements("ThreadGroup").get(0);
+//        theadGroupElement.attribute("testname").setText(testName);
+//        jmx = root.asXML();
 
         String name = request.getName() + ".jmx";
 

From 1270eb8b2954f28945a758a305a32f65843f308b Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 11:53:04 +0800
Subject: [PATCH 22/23] Merge branch 'master' of
 https://github.com/metersphere/metersphere

# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
---
 .../controller/ApiAutomationController.java   | 12 ++---
 .../api/service/ApiAutomationService.java     | 47 +++++++++----------
 .../automation/scenario/ApiScenarioModule.vue |  3 +-
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index 66e30946fb..e2b1e09909 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -111,7 +111,7 @@ public class ApiAutomationController {
 
     @PostMapping("/batch/edit")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public void bathEdit(@RequestBody SaveApiScenarioRequest request) {
+    public void bathEdit(@RequestBody ApiScenarioBatchRequest request) {
         apiAutomationService.bathEdit(request);
     }
 
@@ -162,11 +162,11 @@ public class ApiAutomationController {
     }
 
 
-    @PostMapping(value = "/import", consumes = {"multipart/form-data"})
-    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public ApiDefinitionImport testCaseImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
-        return apiAutomationService.scenarioImport(file, request);
-    }
+//    @PostMapping(value = "/import", consumes = {"multipart/form-data"})
+//    @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
+//    public ApiDefinitionImport testCaseImport(@RequestPart(value = "file", required = false) MultipartFile file, @RequestPart("request") ApiTestImportRequest request) {
+//        return apiAutomationService.scenarioImport(file, request);
+//    }
 
     @PostMapping(value = "/export")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index ff9a1a2b11..8c96738a1e 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -14,13 +14,10 @@ import io.metersphere.api.dto.automation.parse.ScenarioImportParser;
 import io.metersphere.api.dto.automation.parse.ScenarioImportParserFactory;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
-import io.metersphere.api.dto.definition.parse.ApiDefinitionImport;
 import io.metersphere.api.dto.definition.request.*;
 import io.metersphere.api.dto.definition.request.variable.ScenarioVariable;
 import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.jmeter.JMeterService;
-import io.metersphere.api.parse.ApiImportParser;
-import io.metersphere.api.parse.ApiScenarioImportParserFactory;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiScenarioMapper;
 import io.metersphere.base.mapper.ApiScenarioReportMapper;
@@ -816,28 +813,28 @@ public class ApiAutomationService {
         return apiImport;
     }
 
-    public ApiDefinitionImport scenarioImport(MultipartFile file, ApiTestImportRequest request) {
-        ApiImportParser apiImportParser = ApiScenarioImportParserFactory.getApiImportParser(request.getPlatform());
-        ApiDefinitionImport apiImport = null;
-        try {
-            apiImport = apiImportParser.parse(file == null ? null : file.getInputStream(), request);
-        } catch (Exception e) {
-            LogUtil.error(e.getMessage(), e);
-            MSException.throwException(Translator.get("parse_data_error"));
-        }
-        SaveApiScenarioRequest saveReq = new SaveApiScenarioRequest();
-        saveReq.setScenarioDefinition(apiImport.getScenarioDefinition());
-        saveReq.setName(saveReq.getScenarioDefinition().getName());
-        saveReq.setProjectId(request.getProjectId());
-        saveReq.setApiScenarioModuleId(request.getModuleId());
-        if (StringUtils.isNotBlank(request.getUserId())) {
-            saveReq.setPrincipal(request.getUserId());
-        } else {
-            saveReq.setPrincipal(SessionUtils.getUserId());
-        }
-        create(saveReq, new ArrayList<>());
-        return apiImport;
-    }
+//    public ApiDefinitionImport scenarioImport(MultipartFile file, ApiTestImportRequest request) {
+//        ApiImportParser apiImportParser = ApiScenarioImportParserFactory.getApiImportParser(request.getPlatform());
+//        ApiDefinitionImport apiImport = null;
+//        try {
+//            apiImport = apiImportParser.parse(file == null ? null : file.getInputStream(), request);
+//        } catch (Exception e) {
+//            LogUtil.error(e.getMessage(), e);
+//            MSException.throwException(Translator.get("parse_data_error"));
+//        }
+//        SaveApiScenarioRequest saveReq = new SaveApiScenarioRequest();
+//        saveReq.setScenarioDefinition(apiImport.getScenarioDefinition());
+//        saveReq.setName(saveReq.getScenarioDefinition().getName());
+//        saveReq.setProjectId(request.getProjectId());
+//        saveReq.setApiScenarioModuleId(request.getModuleId());
+//        if (StringUtils.isNotBlank(request.getUserId())) {
+//            saveReq.setPrincipal(request.getUserId());
+//        } else {
+//            saveReq.setPrincipal(SessionUtils.getUserId());
+//        }
+//        create(saveReq, new ArrayList<>());
+//        return apiImport;
+//    }
 
     public ApiScenrioExportResult export(ApiScenarioBatchRequest request) {
         ServiceUtils.getSelectAllIds(request, request.getCondition(),
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 33f5a4f272..2edc1672ef 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -62,11 +62,12 @@ import MsNodeTree from "../../../track/common/NodeTree";
 import {buildNodePath} from "../../definition/model/NodeTree";
 import ModuleTrashButton from "../../definition/components/module/ModuleTrashButton";
 import ApiScenarioModuleHeader from "@/business/components/api/automation/scenario/module/ApiScenarioModuleHeader";
+import ApiImport from "./common/ScenarioImport";
 
 export default {
   name: 'MsApiScenarioModule',
   components: {
-    ApiScenarioModuleHeader,
+    ApiImport,
     ModuleTrashButton,
     MsNodeTree,
     MsAddBasisScenario,

From 35d87006e051ab105dd6c51aa1585525fe2942fd Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Sat, 20 Feb 2021 11:56:18 +0800
Subject: [PATCH 23/23] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=B3=A8=E9=87=8A=E4=B8=80=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/ApiScenarioModule.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
index 2edc1672ef..a841f44564 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
@@ -31,15 +31,16 @@
           </template>
         </el-input>
         <module-trash-button v-if="!isReadOnly" :condition="condition" :exe="enableTrash"/>
-        <api-scenario-module-header
-          :condition="condition"
-          :current-module="currentModule"
-          :is-read-only="isReadOnly"
-          :project-id="projectId"
-          @exportAPI="exportAPI"
-          @addScenario="addScenario"
-          @refreshTable="$emit('refreshTable')"
-          @refresh="refresh"/>
+        <!-- 是否保留这个 -->
+        <!--<api-scenario-module-header-->
+          <!--:condition="condition"-->
+          <!--:current-module="currentModule"-->
+          <!--:is-read-only="isReadOnly"-->
+          <!--:project-id="projectId"-->
+          <!--@exportAPI="exportAPI"-->
+          <!--@addScenario="addScenario"-->
+          <!--@refreshTable="$emit('refreshTable')"-->
+          <!--@refresh="refresh"/>-->
       </template>
 
     </ms-node-tree>