From bbfb7987a2c46455cb32770f5e9558cc7fd68c54 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 17 Dec 2020 18:48:04 +0800
Subject: [PATCH 01/13] =?UTF-8?q?refactor:=20=E8=AE=BE=E7=BD=AElimit?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=9A=E4=B8=AAjob?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 2f4f76c93a..2903c46f39 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 2f4f76c93afa7b62b1d73fa90e73eec948a6ef3f
+Subproject commit 2903c46f39c11b1238e6e6b30a77565472069cda

From 4eb155362e7a30dd35c108441769c61bf143fe04 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Thu, 17 Dec 2020 18:54:20 +0800
Subject: [PATCH 02/13] =?UTF-8?q?refactor:=20=E8=AE=BE=E7=BD=AElimit?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=9A=E4=B8=AAjob?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 2903c46f39..efb49c9b4b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 2903c46f39c11b1238e6e6b30a77565472069cda
+Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f

From f0d45a9aa0e381ccf0a7ed1f3b05824f80f6f009 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 17 Dec 2020 19:00:39 +0800
Subject: [PATCH 03/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ApiDefinitionExecResultMapper.java   |  1 -
 .../api/automation/scenario/ApiComponent.vue    | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
index 823aaa146a..d29f447b44 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 public interface ApiDefinitionExecResultMapper {
     long countByExample(ApiDefinitionExecResultExample example);
diff --git a/frontend/src/business/components/api/automation/scenario/ApiComponent.vue b/frontend/src/business/components/api/automation/scenario/ApiComponent.vue
index 7e5a170b91..928eafd66a 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiComponent.vue
@@ -134,12 +134,29 @@
               this.request.requestResult = requestResult;
               this.request.id = response.data.id;
               this.reload();
+              this.sort();
             } else {
               this.request.referenced = "Deleted";
             }
           })
         }
       },
+      recursiveSorting(arr) {
+        for (let i in arr) {
+          arr[i].index = Number(i) + 1;
+          if (arr[i].hashTree != undefined && arr[i].hashTree.length > 0) {
+            this.recursiveSorting(arr[i].hashTree);
+          }
+        }
+      },
+      sort() {
+        for (let i in this.request.hashTree) {
+          this.request.hashTree[i].index = Number(i) + 1;
+          if (this.request.hashTree[i].hashTree != undefined && this.request.hashTree[i].hashTree.length > 0) {
+            this.recursiveSorting(this.request.hashTree[i].hashTree);
+          }
+        }
+      },
       active(item) {
         item.active = !item.active;
         this.reload();

From 97e5549bc1c4e42b248fe4d9f268387c31460295 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 17 Dec 2020 19:27:01 +0800
Subject: [PATCH 04/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/request/processors/MsJSR223Processor.java   | 7 ++++++-
 .../request/processors/post/MsJSR223PostProcessor.java     | 7 ++++++-
 .../request/processors/pre/MsJSR223PreProcessor.java       | 7 ++++++-
 backend/src/main/java/io/metersphere/xpack                 | 2 +-
 .../business/components/api/automation/scenario/AddTag.vue | 6 ++++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
index da6773894a..880b20fb13 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/MsJSR223Processor.java
@@ -7,6 +7,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.protocol.java.sampler.JSR223Sampler;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
@@ -32,7 +33,11 @@ public class MsJSR223Processor extends MsTestElement {
         }
         JSR223Sampler processor = new JSR223Sampler();
         processor.setEnabled(true);
-        processor.setName(this.getName() + "JSR223Processor");
+        if (StringUtils.isNotEmpty(this.getName())) {
+            processor.setName(this.getName());
+        } else {
+            processor.setName("JSR223Processor");
+        }
         processor.setProperty(TestElement.TEST_CLASS, JSR223Sampler.class.getName());
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
index 08ac2e12c1..4a922577da 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
@@ -7,6 +7,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.extractor.JSR223PostProcessor;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
@@ -33,7 +34,11 @@ public class MsJSR223PostProcessor extends MsTestElement {
         }
         JSR223PostProcessor processor = new JSR223PostProcessor();
         processor.setEnabled(true);
-        processor.setName(this.getName() + "JSR223PostProcessor");
+        if (StringUtils.isNotEmpty(this.getName())) {
+            processor.setName(this.getName());
+        } else {
+            processor.setName("JSR223PostProcessor");
+        }
         processor.setProperty(TestElement.TEST_CLASS, JSR223PostProcessor.class.getName());
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
index 7afd64dfc2..acea42c0e1 100644
--- a/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
+++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/processors/pre/MsJSR223PreProcessor.java
@@ -7,6 +7,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.modifiers.JSR223PreProcessor;
 import org.apache.jmeter.save.SaveService;
 import org.apache.jmeter.testelement.TestElement;
@@ -32,7 +33,11 @@ public class MsJSR223PreProcessor extends MsTestElement {
         }
         JSR223PreProcessor processor = new JSR223PreProcessor();
         processor.setEnabled(true);
-        processor.setName(this.getName() + "JSR223PreProcessor");
+        if (StringUtils.isNotEmpty(this.getName())) {
+            processor.setName(this.getName());
+        } else {
+            processor.setName("JSR223PreProcessor");
+        }
         processor.setProperty(TestElement.TEST_CLASS, JSR223PreProcessor.class.getName());
         processor.setProperty(TestElement.GUI_CLASS, SaveService.aliasToClass("TestBeanGUI"));
         processor.setProperty("cacheKey", "true");
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efb49c9b4b..61397c1672 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f
+Subproject commit 61397c16728a63493507679f7e0940d9099f337f
diff --git a/frontend/src/business/components/api/automation/scenario/AddTag.vue b/frontend/src/business/components/api/automation/scenario/AddTag.vue
index a3e20b71bd..f9c073820e 100644
--- a/frontend/src/business/components/api/automation/scenario/AddTag.vue
+++ b/frontend/src/business/components/api/automation/scenario/AddTag.vue
@@ -38,12 +38,13 @@
 
 <script>
   import {WORKSPACE_ID} from '@/common/js/constants';
-  import {getCurrentUser, getUUID,getCurrentProjectID} from "@/common/js/utils";
+  import {getCurrentUser, getUUID, getCurrentProjectID} from "@/common/js/utils";
   import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
   import MsTablePagination from "../../../common/pagination/TablePagination";
+
   export default {
     name: "MsAddTag",
-    components: {MsDialogFooter,MsTablePagination},
+    components: {MsDialogFooter, MsTablePagination},
     props: {},
     data() {
       return {
@@ -84,6 +85,7 @@
             this.result = this.$post(this.path, this.tagForm, () => {
               this.$success(this.$t('commons.save_success'));
               this.initTable();
+              this.tagForm = {};
             });
           } else {
             return false;

From 80c624d6b744a66cfc08828cd7d534735f6438a1 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Thu, 17 Dec 2020 19:30:25 +0800
Subject: [PATCH 05/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E6=89=A7=E8=A1=8C=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/post-processors/jsr223-post-processor/index.js    | 1 +
 .../components/pre-processors/jsr223-pre-processor/index.js      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/business/components/api/definition/components/jmeter/components/post-processors/jsr223-post-processor/index.js b/frontend/src/business/components/api/definition/components/jmeter/components/post-processors/jsr223-post-processor/index.js
index a3525aaff6..4513b66d0a 100644
--- a/frontend/src/business/components/api/definition/components/jmeter/components/post-processors/jsr223-post-processor/index.js
+++ b/frontend/src/business/components/api/definition/components/jmeter/components/post-processors/jsr223-post-processor/index.js
@@ -19,6 +19,7 @@ export default class JSR223PostProcessor extends PostProcessor {
     this.parameters = [];
     this.filename = undefined;
     this.cacheKey = true;
+    this.enable = true;
     this.script = undefined;
   }
 }
diff --git a/frontend/src/business/components/api/definition/components/jmeter/components/pre-processors/jsr223-pre-processor/index.js b/frontend/src/business/components/api/definition/components/jmeter/components/pre-processors/jsr223-pre-processor/index.js
index f73b7ee69b..7ea5082497 100644
--- a/frontend/src/business/components/api/definition/components/jmeter/components/pre-processors/jsr223-pre-processor/index.js
+++ b/frontend/src/business/components/api/definition/components/jmeter/components/pre-processors/jsr223-pre-processor/index.js
@@ -19,6 +19,7 @@ export default class JSR223PreProcessor extends PostProcessor {
     this.parameters = [];
     this.filename = undefined;
     this.cacheKey = undefined;
+    this.enable = true;
     this.script = undefined;
   }
 }

From 62f52fba183cc5c5594cec0100b63d2e289219d4 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:02:35 +0800
Subject: [PATCH 06/13] chore: Sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 61397c1672..efb49c9b4b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 61397c16728a63493507679f7e0940d9099f337f
+Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f

From 3eba438fcea587b69715b937e6cd2fb26a93499e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:12:29 +0800
Subject: [PATCH 07/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E5=91=8A=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/report/components/RequestResult.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/automation/report/components/RequestResult.vue b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
index 28efc6cbea..7c6c064e19 100644
--- a/frontend/src/business/components/api/automation/report/components/RequestResult.vue
+++ b/frontend/src/business/components/api/automation/report/components/RequestResult.vue
@@ -17,7 +17,7 @@
 
         <el-col :span="5">
           <el-tooltip effect="dark" :content="request.responseResult.responseCode" placement="bottom" :open-delay="800">
-            <div style="color: #5daf34" v-if="request.success">{{ request.responseResult.responseCode }}</div>
+            <div style="color: #5daf34" v-if="request.responseResult.responseCode==='200'">{{ request.responseResult.responseCode }}</div>
             <div style="color: #FE6F71" v-else>{{ request.responseResult.responseCode }}</div>
           </el-tooltip>
         </el-col>

From 3db39fb276f54d83bc8364212813ff3b818cb95d Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:28:28 +0800
Subject: [PATCH 08/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9B=9E=E6=94=B6=E7=AB=99?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/ApiAutomationController.java |  4 ++--
 .../api/controller/ApiDefinitionController.java |  4 ++--
 .../api/service/ApiAutomationService.java       |  7 ++++++-
 .../api/service/ApiDefinitionService.java       | 17 ++++++++++++-----
 backend/src/main/java/io/metersphere/xpack      |  2 +-
 .../api/automation/scenario/ApiScenarioList.vue |  5 +++--
 .../api/definition/components/list/ApiList.vue  | 14 ++++++++------
 7 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
index 2593fd31d3..c409627fc8 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
@@ -59,8 +59,8 @@ public class ApiAutomationController {
     }
 
     @PostMapping("/reduction")
-    public void reduction(@RequestBody List<String> ids) {
-        apiAutomationService.reduction(ids);
+    public void reduction(@RequestBody List<SaveApiScenarioRequest> requests) {
+        apiAutomationService.reduction(requests);
     }
 
     @GetMapping("/getApiScenario/{id}")
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 6f2b5eca02..22f85b30f6 100644
--- a/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
@@ -63,8 +63,8 @@ public class ApiDefinitionController {
     }
 
     @PostMapping("/reduction")
-    public void reduction(@RequestBody List<String> ids) {
-        apiDefinitionService.reduction(ids);
+    public void reduction(@RequestBody List<SaveApiDefinitionRequest> requests) {
+        apiDefinitionService.reduction(requests);
     }
 
     @GetMapping("/get/{id}")
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 ac36de0aca..d2d741c4ba 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -179,7 +179,12 @@ public class ApiAutomationService {
         extApiScenarioMapper.removeToGc(apiIds);
     }
 
-    public void reduction(List<String> apiIds) {
+    public void reduction(List<SaveApiScenarioRequest> requests) {
+        List<String> apiIds = new ArrayList<>();
+        requests.forEach(item->{
+            checkNameExist(item);
+            apiIds.add(item.getId());
+        });
         extApiScenarioMapper.reduction(apiIds);
     }
 
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 0bfb01ea35..c708e19d9c 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -158,7 +158,12 @@ public class ApiDefinitionService {
         extApiDefinitionMapper.removeToGc(apiIds);
     }
 
-    public void reduction(List<String> apiIds) {
+    public void reduction(List<SaveApiDefinitionRequest> requests) {
+        List<String> apiIds = new ArrayList<>();
+        requests.forEach(item -> {
+            checkNameExist(item);
+            apiIds.add(item.getId());
+        });
         extApiDefinitionMapper.reduction(apiIds);
     }
 
@@ -386,6 +391,7 @@ public class ApiDefinitionService {
 
     /**
      * 数据统计-接口类型
+     *
      * @param projectId 项目ID
      * @return
      */
@@ -395,6 +401,7 @@ public class ApiDefinitionService {
 
     /**
      * 统计本周创建的数据总量
+     *
      * @param projectId
      * @return
      */
@@ -404,10 +411,10 @@ public class ApiDefinitionService {
         Date firstTime = startAndEndDateInWeek.get("firstTime");
         Date lastTime = startAndEndDateInWeek.get("lastTime");
 
-        if(firstTime==null || lastTime == null){
-            return  0;
-        }else {
-            return extApiDefinitionMapper.countByProjectIDAndCreateInThisWeek(projectId,firstTime.getTime(),lastTime.getTime());
+        if (firstTime == null || lastTime == null) {
+            return 0;
+        } else {
+            return extApiDefinitionMapper.countByProjectIDAndCreateInThisWeek(projectId, firstTime.getTime(), lastTime.getTime());
         }
     }
 }
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index efb49c9b4b..61397c1672 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f
+Subproject commit 61397c16728a63493507679f7e0940d9099f337f
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index 9f89ad79fd..af86b9bf19 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -219,8 +219,9 @@
         this.$emit('edit', row);
       },
       reductionApi(row) {
-        let obj = [row.id];
-        this.$post("/api/automation/reduction", obj, response => {
+        row.scenarioDefinition = null;
+        let rows = [row];
+        this.$post("/api/automation/reduction", rows, response => {
           this.$success(this.$t('commons.save_success'));
           this.search();
         })
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 b0049dfbb4..1bc15ad069 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -6,10 +6,10 @@
       <el-input placeholder="搜索" @blur="search" class="search-input" size="small" v-model="condition.name"/>
 
       <el-table v-loading="result.loading"
-        border
-        :data="tableData" row-key="id" class="test-content adjust-table"
-        @select-all="handleSelectAll"
-        @select="handleSelect" :height="screenHeight">
+                border
+                :data="tableData" row-key="id" class="test-content adjust-table"
+                @select-all="handleSelectAll"
+                @select="handleSelect" :height="screenHeight">
         <el-table-column type="selection"/>
         <el-table-column width="40" :resizable="false" align="center">
           <template v-slot:default="scope">
@@ -268,8 +268,10 @@
         this.$emit('editApi', row);
       },
       reductionApi(row) {
-        let ids = [row.id];
-        this.$post('/api/definition/reduction/', ids, () => {
+        row.request = null;
+        row.response = null;
+        let rows = [row];
+        this.$post('/api/definition/reduction/', rows, () => {
           this.$success(this.$t('commons.save_success'));
           this.search();
         });

From 75eeae71de73dfea137d3fd6656da36f47a46410 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:54:49 +0800
Subject: [PATCH 09/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/complete/EditCompleteHTTPApi.vue   | 15 ++++++---------
 frontend/src/i18n/en-US.js                        |  2 +-
 frontend/src/i18n/zh-CN.js                        |  2 +-
 frontend/src/i18n/zh-TW.js                        |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

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 bbb7d76635..cbfac1cf9f 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -100,13 +100,18 @@
     name: "MsAddCompleteHttpApi",
     components: {MsResponseText, MsApiRequestForm, MsJsr233Processor},
     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'));
+        }
+      };
       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'}
           ],
-          path: [{required: true, message: this.$t('api_test.definition.request.path_info'), 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'}],
           moduleId: [{required: true, message: this.$t('test_track.case.input_module'), trigger: 'change'}],
           status: [{required: true, message: this.$t('commons.please_select'), trigger: 'change'}],
@@ -124,10 +129,6 @@
       runTest() {
         this.$refs['httpForm'].validate((valid) => {
           if (valid) {
-            if(this.httpForm.path.match(/\s/)!=null){
-              this.$error(this.$t("api_test.definition.request.path_valid_info"));
-              return false;
-            }
             this.setParameter();
             this.$emit('runTest', this.httpForm);
           } else {
@@ -150,10 +151,6 @@
       saveApi() {
         this.$refs['httpForm'].validate((valid) => {
           if (valid) {
-            if(this.httpForm.path.match(/\s/)!=null){
-              this.$error(this.$t("api_test.definition.request.path_valid_info"));
-              return false;
-            }
             this.setParameter();
             this.$emit('saveApi', this.httpForm);
           }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 98297db031..675c403610 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -543,7 +543,7 @@ export default {
         create_info: 'Create',
         update_info: 'Update',
         batch_edit: "Batch edit",
-        path_valid_info: "The request address cannot contain spaces",
+        path_valid_info: "The request path is invalid",
       }
     },
     automation: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e9bde643d8..465d4d9c9a 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -542,7 +542,7 @@ export default {
         create_info: '创建',
         update_info: '更新',
         batch_edit: "批量编辑",
-        path_valid_info: "请求地址不能包含空格",
+        path_valid_info: "请求路径无效",
       }
     },
     automation: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 70711b87c7..c7c05280ed 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -542,7 +542,7 @@ export default {
         create_info: '創建',
         update_info: '更新',
         batch_edit: "批量編輯",
-        path_valid_info: "請求地址不能包含空格",
+        path_valid_info: "請求路径无效",
       }
     },
     automation: {

From 4ec766605c8a4533013ceb5f809d02b42940885f Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 18 Dec 2020 10:56:18 +0800
Subject: [PATCH 10/13] refactor: i18n

---
 frontend/src/business/components/common/head/SearchList.vue | 6 +++---
 frontend/src/i18n/en-US.js                                  | 2 ++
 frontend/src/i18n/zh-CN.js                                  | 2 ++
 frontend/src/i18n/zh-TW.js                                  | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/common/head/SearchList.vue b/frontend/src/business/components/common/head/SearchList.vue
index 1cc176fd5e..2d13248506 100644
--- a/frontend/src/business/components/common/head/SearchList.vue
+++ b/frontend/src/business/components/common/head/SearchList.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="result.loading">
-    <el-input placeholder="搜索项目"
+    <el-input :placeholder="$t('project.search_by_name')"
               prefix-icon="el-icon-search"
               v-model="searchString"
               clearable
@@ -8,7 +8,7 @@
               size="small"/>
     <div v-if="items.length === 0" style="text-align: center; margin: 15px 0">
         <span style="font-size: 15px; color: #8a8b8d;">
-          无数据
+          {{ $t('project.no_data') }}
         </span>
     </div>
     <div v-else style="height: 150px;overflow: auto">
@@ -114,7 +114,7 @@ export default {
           this.$emit("update:currentProject", project[0].name);
         }
       } else {
-        this.$emit("update:currentProject", '选择项目');
+        this.$emit("update:currentProject", this.$t('project.select'));
       }
     }
   }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 98297db031..24470af111 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -304,6 +304,8 @@ export default {
     jira_key: 'JIRA Project key',
     zentao_id: 'Zentao Project ID',
     manager: 'Manager',
+    no_data: 'No Data',
+    select: 'Select'
   },
   member: {
     create: 'Create',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e9bde643d8..f50eadcb16 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -301,6 +301,8 @@ export default {
     jira_key: 'JIRA项目key',
     zentao_id: 'Zentao项目ID',
     manager: '项目管理',
+    no_data: '无数据',
+    select: '选择项目'
   },
   member: {
     create: '添加成员',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 70711b87c7..94bbb12cdf 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -301,6 +301,8 @@ export default {
     jira_key: 'JIRA項目key',
     zentao_id: 'Zentao項目ID',
     manager: '項目管理',
+    no_data: '無數據',
+    select: '選擇項目'
   },
   member: {
     create: '添加成員',

From a4189ecacc55b7235f37506c369efdc1293b02dc Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:12:39 +0800
Subject: [PATCH 11/13] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settings/project/MsProject.vue | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/frontend/src/business/components/settings/project/MsProject.vue b/frontend/src/business/components/settings/project/MsProject.vue
index 8e22b5eb9f..99c2821329 100644
--- a/frontend/src/business/components/settings/project/MsProject.vue
+++ b/frontend/src/business/components/settings/project/MsProject.vue
@@ -5,7 +5,7 @@
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
                          :create-tip="btnTips" :title="$t('commons.project')"/>
       </template>
-      <el-table border class="adjust-table" @row-click="link" :data="items" style="width: 100%" @sort-change="sort">
+      <el-table border class="adjust-table" :data="items" style="width: 100%" @sort-change="sort">
         <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip/>
         <el-table-column prop="description" :label="$t('commons.description')" show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -95,7 +95,6 @@ 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 {ApiEvent, LIST_CHANGE, PerformanceEvent, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {PROJECT_ID} from "@/common/js/constants";
 
 export default {
@@ -223,10 +222,6 @@ export default {
           }
           Message.success(this.$t('commons.delete_success'));
           this.list();
-          // 发送广播，刷新 head 上的最新列表
-          ApiEvent.$emit(LIST_CHANGE);
-          TrackEvent.$emit(LIST_CHANGE);
-          PerformanceEvent.$emit(LIST_CHANGE);
         });
       }).catch(() => {
         this.$message({
@@ -253,22 +248,6 @@ export default {
         this.total = data.itemCount;
       })
     },
-    link(row) {
-      // performance_test project link
-      if (this.$route.name === 'perProject') {
-        this.$router.push({
-          path: '/performance/test/' + row.id,
-        })
-      } else if (this.$route.name === 'fucProject') {
-        this.$router.push({
-          path: '/api/test/list/' + row.id
-        })
-      } else if (this.$route.name === 'trackProject') {
-        this.$router.push({
-          path: '/track/case/' + row.id
-        })
-      }
-    },
     sort(column) {
       _sort(column, this.condition);
       this.list();
@@ -292,11 +271,6 @@ export default {
 </script>
 
 <style scoped>
-
-.el-table {
-  cursor: pointer;
-}
-
   pre {
     margin: 0 0;
   }

From db0b1768a9d6f9a72fd75ccae7e3aff2774f975a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:13:51 +0800
Subject: [PATCH 12/13] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../definition/components/debug/DebugHttpPage.vue    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
index d272e61ee9..e1692d8b37 100644
--- a/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
+++ b/frontend/src/business/components/api/definition/components/debug/DebugHttpPage.vue
@@ -63,10 +63,20 @@
       scenario: Boolean,
     },
     data() {
+      let validateURL = (rule, value, callback) => {
+        try {
+          new URL(this.debugForm.url);
+        } catch (e) {
+          callback(this.$t('api_test.request.url_invalid'));
+        }
+      };
       return {
         rules: {
           method: [{required: true, message: this.$t('test_track.case.input_maintainer'), trigger: 'change'}],
-          url: [{required: true, message: this.$t('api_test.definition.request.path_all_info'), trigger: 'blur'}],
+          url: [
+            {max: 500, required: true, message: this.$t('commons.input_limit', [1, 500]), trigger: 'blur'},
+            {validator: validateURL, trigger: 'blur'}
+          ],
         },
         debugForm: {method: REQ_METHOD[0].id, environmentId: ""},
         options: [],

From d03b242701cd2cc29df36127387d6e0b14bf3039 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 18 Dec 2020 11:15:01 +0800
Subject: [PATCH 13/13] chore: Sync

---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 61397c1672..efb49c9b4b 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 61397c16728a63493507679f7e0940d9099f337f
+Subproject commit efb49c9b4be136ce48e9550dc9c8a2975d9f4d7f