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;
 }