From 3243e5fb684fd1d688131e0d8617083554f43c58 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Mar 2021 17:04:33 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E4=BF=AE=E5=A4=8D=E5=9C=BA=E6=99=AF=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=BF=87=E9=95=BF=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../automation/scenario/EditApiScenario.vue   | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
index 8978fd056a..09d3cdf8ce 100644
--- a/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
+++ b/frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
@@ -100,7 +100,14 @@
             <div class="ms-debug-div" @click="showAll">
               <el-row style="margin: 5px">
                 <el-col :span="6" class="ms-col-one ms-font">
-                  {{ currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name }}
+                  <el-tooltip placement="top" effect="light">
+                    <template v-slot:content>
+                      <div>{{ currentScenario.name }}</div>
+                    </template>
+                    <span class="scenario-name">
+                        {{ currentScenario.name === undefined || '' ? $t('api_test.scenario.name') : currentScenario.name }}
+                    </span>
+                  </el-tooltip>
                 </el-col>
                 <el-col :span="3" class="ms-col-one ms-font">
                   {{$t('api_test.automation.step_total')}}：{{scenarioDefinition.length}}
@@ -447,7 +454,7 @@
       },
     },
     methods: {
-      setModule(id,data) {
+      setModule(id, data) {
         this.currentScenario.apiScenarioModuleId = id;
         this.currentScenario.modulePath = data.path;
       },
@@ -1250,4 +1257,14 @@
     font-size: 18px;
   }
 
+  .scenario-name {
+    display: inline-block;
+    margin: 0 5px;
+    overflow-x: hidden;
+    padding-bottom: 0;
+    text-overflow: ellipsis;
+    vertical-align: middle;
+    white-space: nowrap;
+    width: 200px;
+  }
 </style>

From 71f883a3770cd6e4677f0ef391e08797d42f4084 Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 30 Mar 2021 17:14:38 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=82=B9=E5=87=BBapi/case/=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=98=E8=89=B2=E7=9A=84=E9=97=AE=E9=A2=98;?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B01.8=E7=9A=84frontend-xpack=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号
---
 .../business/components/common/components/MsTabButton.vue   | 6 +++---
 frontend/src/business/components/xpack                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsTabButton.vue b/frontend/src/business/components/common/components/MsTabButton.vue
index d3c5def1d5..2f3aeaecff 100644
--- a/frontend/src/business/components/common/components/MsTabButton.vue
+++ b/frontend/src/business/components/common/components/MsTabButton.vue
@@ -102,9 +102,9 @@ export default {
 <style scoped>
 
 .active {
-  border: solid 1px #6d317c;
-  background-color: var(--primary_color);
-  color: #FFFFFF;
+  border: solid 1px #6d317c!important;
+  background-color: var(--primary_color)!important;
+  color: #FFFFFF!important;
 }
 
 .case-button {
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 07951ba17a..afb50f2246 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit afb50f22464b832e4f458f3f7947e6d8f982707e

From 43f6bc09dd7f9f6cdaa9add707662ed194167859 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 30 Mar 2021 17:23:02 +0800
Subject: [PATCH 3/8] chore: sync

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 07951ba17a..afb50f2246 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit afb50f22464b832e4f458f3f7947e6d8f982707e

From 233cceec73fae76fa02040d035e88937ee0dc90a Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Mar 2021 17:27:43 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix(=E5=9C=BA=E6=99=AF=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=88=A0=E9=99=A4=E5=8D=95=E4=B8=AA=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/automation/scenario/ApiScenarioList.vue     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index a3b7e1afe8..5fc080fa6e 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -732,6 +732,9 @@ export default {
             // let ids = [row.id];
             let param = {};
             this.buildBatchParam(param);
+            if(param.ids && param.ids.length <=0){
+              param.ids =[row.id];
+            }
             this.$post('/api/automation/removeToGcByBatch/', param, () => {
               // this.$post('/api/automation/removeToGc/', ids, () => {
               this.$success(this.$t('commons.delete_success'));

From cb9bbe26ea0cdac36f588b4e84ad2508d210d40f Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Tue, 30 Mar 2021 17:39:22 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=94=99=E4=BD=8D=E6=96=B9=E6=B3=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

接口定义列表错位方法优化代码回退
---
 .../definition/components/list/ApiList.vue    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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 ebd4f5c579..970b67ac12 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -454,18 +454,18 @@
                 item.tags = JSON.parse(item.tags);
               }
             })
-            // if (this.$refs.apiDefinitionTable) {
-            //   setTimeout(() => {
-            //     this.$refs.apiDefinitionTable.doLayout();
-            //     this.result.loading = false;
-            //   }, 500)
-            // }
-            // nexttick:表格加载完成之后触发。判断是否需要勾选行
-            this.$nextTick(function(){
-              if (this.$refs.apiDefinitionTable) {
+            if (this.$refs.apiDefinitionTable) {
+              setTimeout(() => {
                 this.$refs.apiDefinitionTable.doLayout();
                 this.result.loading = false;
-              }
+              }, 500)
+            }
+            // nexttick:表格加载完成之后触发。判断是否需要勾选行
+            this.$nextTick(function(){
+              // if (this.$refs.apiDefinitionTable) {
+              //   this.$refs.apiDefinitionTable.doLayout();
+              //   this.result.loading = false;
+              // }
               this.checkTableRowIsSelect();
             })
           });

From 5ed35abe590b62f2fc3503f80b8ba7f5c931ba20 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Mar 2021 18:31:33 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=A0=87=E5=87=86=E5=9F=9F=E5=90=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/sampler/MsHTTPSamplerProxy.java   |  6 ++-
 .../components/runtest/RunTestHTTPPage.vue    | 41 ++++++++++---------
 frontend/src/business/components/xpack        |  2 +-
 3 files changed, 27 insertions(+), 22 deletions(-)

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 d70423500e..da58252890 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
@@ -163,7 +163,11 @@ public class MsHTTPSamplerProxy extends MsTestElement {
                     sampler.setProtocol(urlObject.getProtocol());
                     sampler.setPath(urlObject.getPath());
                 } else {
-                    sampler.setDomain(config.getConfig().get(this.getProjectId()).getHttpConfig().getDomain());
+                    String configStr = config.getConfig().get(this.getProjectId()).getHttpConfig().getSocket();
+                    sampler.setDomain(configStr);
+                    if (config.getConfig().get(this.getProjectId()).getHttpConfig().getPort() > 0) {
+                        sampler.setDomain(config.getConfig().get(this.getProjectId()).getHttpConfig().getDomain());
+                    }
                     sampler.setPort(config.getConfig().get(this.getProjectId()).getHttpConfig().getPort());
                     sampler.setProtocol(config.getConfig().get(this.getProjectId()).getHttpConfig().getProtocol());
                     sampler.setPath(this.getPath());
diff --git a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
index 68a0eb1806..09b0e4d48d 100644
--- a/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
+++ b/frontend/src/business/components/api/definition/components/runtest/RunTestHTTPPage.vue
@@ -71,27 +71,27 @@
 </template>
 
 <script>
-import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
-import {getUUID} from "@/common/js/utils";
-import MsApiCaseList from "../case/ApiCaseList";
-import MsContainer from "../../../../common/components/MsContainer";
-import MsRequestResultTail from "../response/RequestResultTail";
-import MsRun from "../Run";
-import {REQ_METHOD} from "../../model/JsonData";
-import EnvironmentSelect from "../environment/EnvironmentSelect";
-import MsJmxStep from "../step/JmxStep";
+  import MsApiRequestForm from "../request/http/ApiHttpRequestForm";
+  import {getUUID} from "@/common/js/utils";
+  import MsApiCaseList from "../case/ApiCaseList";
+  import MsContainer from "../../../../common/components/MsContainer";
+  import MsRequestResultTail from "../response/RequestResultTail";
+  import MsRun from "../Run";
+  import {REQ_METHOD} from "../../model/JsonData";
+  import EnvironmentSelect from "../environment/EnvironmentSelect";
+  import MsJmxStep from "../step/JmxStep";
 
-export default {
-  name: "RunTestHTTPPage",
-  components: {
-    EnvironmentSelect,
-    MsApiRequestForm,
-    MsApiCaseList,
-    MsContainer,
-    MsRequestResultTail,
-    MsRun,
-    MsJmxStep
-  },
+  export default {
+    name: "RunTestHTTPPage",
+    components: {
+      EnvironmentSelect,
+      MsApiRequestForm,
+      MsApiCaseList,
+      MsContainer,
+      MsRequestResultTail,
+      MsRun,
+      MsJmxStep
+    },
     data() {
       return {
         visible: false,
@@ -134,6 +134,7 @@ export default {
           if (valid) {
             this.loading = true;
             this.api.request.name = this.api.id;
+            this.api.request.url = undefined;
             this.api.request.useEnvironment = this.api.environmentId;
             this.api.protocol = this.currentProtocol;
             this.runData = [];
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index afb50f2246..07951ba17a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit afb50f22464b832e4f458f3f7947e6d8f982707e
+Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd

From 5a205b9c1f43818d67b461bbf3de754f8118e71d Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 30 Mar 2021 18:31:56 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix(=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=A4=A7=E5=B9=B6=E5=8F=91?=
 =?UTF-8?q?=E6=95=B0=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E6=9D=A5=E9=99=90=E5=88=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/test/components/PerformancePressureConfig.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 07617d348e..e84de75a1a 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -263,6 +263,8 @@ export default {
         if (response.data.filter(p => p.id === this.resourcePool).length === 0) {
           this.resourcePool = null;
         }
+
+        this.resourcePoolChange();
       })
     },
     getLoadConfig() {
@@ -354,7 +356,7 @@ export default {
         result[0].resources.forEach(resource => {
           threadNumber += JSON.parse(resource.configuration).maxConcurrency;
         })
-        this.maxThreadNumbers = threadNumber;
+        this.$set(this, 'maxThreadNumbers', threadNumber);
         this.threadGroups.forEach(tg => {
           if (tg.threadNumber > threadNumber) {
             this.$set(tg, "threadNumber", threadNumber);

From cc13993abc18e6f5a5546f692adf78ae6641b118 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 30 Mar 2021 18:41:22 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9D=97=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/service/ApiAutomationService.java    | 2 +-
 .../io/metersphere/api/service/ApiDefinitionService.java    | 6 +++---
 .../java/io/metersphere/track/service/TestCaseService.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
index 9f969416cb..33626513da 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -241,7 +241,7 @@ public class ApiAutomationService {
         } else {
             scenario.setUserId(request.getUserId());
         }
-        if (StringUtils.isEmpty(request.getApiScenarioModuleId()) || StringUtils.isEmpty(request.getModulePath()) || "default-module".equals(request.getApiScenarioModuleId())) {
+        if (StringUtils.isEmpty(request.getApiScenarioModuleId()) || "default-module".equals(request.getApiScenarioModuleId())) {
             ApiScenarioModuleExample example = new ApiScenarioModuleExample();
             example.createCriteria().andProjectIdEqualTo(request.getProjectId()).andNameEqualTo("默认模块");
             List<ApiScenarioModule> modules = apiScenarioModuleMapper.selectByExample(example);
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 435846891b..0e70693f40 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -264,7 +264,7 @@ public class ApiDefinitionService {
         test.setEnvironmentId(request.getEnvironmentId());
         test.setUserId(request.getUserId());
         test.setTags(request.getTags());
-        if (StringUtils.isEmpty(request.getModulePath()) || StringUtils.isEmpty(request.getModuleId()) || "default-module".equals(request.getModuleId())) {
+        if (StringUtils.isEmpty(request.getModuleId()) || "default-module".equals(request.getModuleId())) {
             ApiModuleExample example = new ApiModuleExample();
             example.createCriteria().andProjectIdEqualTo(test.getProjectId()).andProtocolEqualTo(test.getProtocol()).andNameEqualTo("默认模块");
             List<ApiModule> modules = apiModuleMapper.selectByExample(example);
@@ -297,7 +297,7 @@ public class ApiDefinitionService {
         test.setStatus(APITestStatus.Underway.name());
         test.setModulePath(request.getModulePath());
         test.setModuleId(request.getModuleId());
-        if (StringUtils.isEmpty(request.getModulePath()) || StringUtils.isEmpty(request.getModuleId()) || "default-module".equals(request.getModuleId())) {
+        if (StringUtils.isEmpty(request.getModuleId()) || "default-module".equals(request.getModuleId())) {
             ApiModuleExample example = new ApiModuleExample();
             example.createCriteria().andProjectIdEqualTo(test.getProjectId()).andProtocolEqualTo(test.getProtocol()).andNameEqualTo("默认模块");
             List<ApiModule> modules = apiModuleMapper.selectByExample(example);
@@ -616,7 +616,7 @@ public class ApiDefinitionService {
         }
         for (int i = 0; i < data.size(); i++) {
             ApiDefinitionWithBLOBs item = data.get(i);
-            if (StringUtils.isEmpty(item.getModuleId()) || StringUtils.isEmpty(item.getModulePath()) || "default-module".equals(item.getModuleId())) {
+            if (StringUtils.isEmpty(item.getModuleId()) || "default-module".equals(item.getModuleId())) {
                 ApiModuleExample example = new ApiModuleExample();
                 example.createCriteria().andProjectIdEqualTo(item.getProjectId()).andProtocolEqualTo(item.getProtocol()).andNameEqualTo("默认模块");
                 List<ApiModule> modules = apiModuleMapper.selectByExample(example);
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index d4f7a9cf12..636c425aaf 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -93,7 +93,7 @@ public class TestCaseService {
     TestCaseTestMapper testCaseTestMapper;
 
     private void setNode(TestCaseWithBLOBs testCase){
-        if (StringUtils.isEmpty(testCase.getNodeId()) || StringUtils.isEmpty(testCase.getNodePath()) || "default-module".equals(testCase.getNodeId())) {
+        if (StringUtils.isEmpty(testCase.getNodeId()) || "default-module".equals(testCase.getNodeId())) {
             TestCaseNodeExample example = new TestCaseNodeExample();
             example.createCriteria().andProjectIdEqualTo(testCase.getProjectId()).andNameEqualTo("默认模块");
             List<TestCaseNode> nodes = testCaseNodeMapper.selectByExample(example);