From a0a0bdc2620cac93f7f8f37efe3eada2a733d74e Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 26 Jan 2021 14:21:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?style(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E6=89=B9=E9=87=8F=E7=A7=BB=E5=8A=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E8=87=B4=E5=9C=BA=E6=99=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=A7=E9=9D=A2=E7=A7=AF=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/BatchMove.vue       | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/BatchMove.vue b/frontend/src/business/components/track/case/components/BatchMove.vue
index deeb7ec81d..922455c123 100644
--- a/frontend/src/business/components/track/case/components/BatchMove.vue
+++ b/frontend/src/business/components/track/case/components/BatchMove.vue
@@ -1,40 +1,38 @@
 <template>
-  <div class="batch-move" v-loading="result.loading">
-    <el-dialog :title="this.$t('test_track.case.select_catalog')"
-               :visible.sync="dialogVisible"
-               :before-close="close"
-               :destroy-on-close="true"
-               width="20%"
-    >
-      <div>
-        <el-input :placeholder="$t('test_track.module.search')" v-model="filterText" size="small"/>
-        <el-tree
-          class="filter-tree node-tree"
-          :data="treeNodes"
-          node-key="id"
-          :filter-node-method="filterNode"
-          :expand-on-click-node="false"
-          highlight-current
-          @node-click="nodeClick"
-          ref="tree"
-        >
-          <template v-slot:default="{node}">
+  <el-dialog :title="this.$t('test_track.case.select_catalog')"
+             :visible.sync="dialogVisible"
+             :before-close="close"
+             :destroy-on-close="true"
+             width="40%"
+  >
+    <div>
+      <el-input :placeholder="$t('test_track.module.search')" v-model="filterText" size="small"/>
+      <el-tree
+        class="filter-tree node-tree"
+        :data="treeNodes"
+        node-key="id"
+        :filter-node-method="filterNode"
+        :expand-on-click-node="false"
+        highlight-current
+        @node-click="nodeClick"
+        ref="tree"
+      >
+        <template v-slot:default="{node}">
           <span>
             <span class="node-icon">
               <i class="el-icon-folder"/>
             </span>
             <span class="node-title">{{node.label}}</span>
           </span>
-          </template>
-        </el-tree>
-      </div>
-      <template v-slot:footer>
-        <ms-dialog-footer
-          @cancel="close"
-          @confirm="save"/>
-      </template>
-    </el-dialog>
-  </div>
+        </template>
+      </el-tree>
+    </div>
+    <template v-slot:footer>
+      <ms-dialog-footer
+        @cancel="close"
+        @confirm="save"/>
+    </template>
+  </el-dialog>
 </template>
 
 <script>

From 54944560c3627fab9aecb20af5f4164d2aa51385 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 26 Jan 2021 14:48:50 +0800
Subject: [PATCH 2/4] =?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=A4=9A=E6=AC=A1=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=20=E7=BB=93=E6=9E=9C=E4=B8=8D=E8=83=BD=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E5=93=8D=E5=BA=94=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/component/ApiComponent.vue      | 2 +-
 .../automation/scenario/component/ApiResponseComponent.vue  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 3c79a559fa..fbe24ef940 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiComponent.vue
@@ -14,7 +14,7 @@
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced==='Deleted'" type="danger">{{$t('api_test.automation.reference_deleted')}}</el-tag>
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced==='Copy'">{{ $t('commons.copy') }}</el-tag>
       <el-tag size="mini" style="margin-left: 20px" v-if="request.referenced ==='REF'">{{ $t('api_test.scenario.reference') }}</el-tag>
-      <ms-run :debug="false" :reportId="reportId" :run-data="runData"
+      <ms-run :debug="true" :reportId="reportId" :run-data="runData"
               @runRefresh="runRefresh" ref="runTest"/>
 
     </template>
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue
index 6dc1c8d434..633cf95c21 100644
--- a/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/ApiResponseComponent.vue
@@ -42,6 +42,12 @@
         this.isActive = true;
       }
     },
+    watch: {
+      result() {
+        this.response = this.result;
+        this.isActive = true;
+      }
+    },
     methods: {
       getExecResult() {
         // 执行结果信息

From edf337d996f0f1afaaf5b85847fc6fe7597482a0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 26 Jan 2021 14:48:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94=E7=9A=84=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E9=A2=84=E8=A7=88=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comonents/functional/FunctionalTestCaseEdit.vue  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 6c1b606dbf..27afbba563 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -257,9 +257,10 @@
                         <el-table-column prop="description" :label="$t('test_track.issue.description')">
                           <template v-slot:default="scope">
                             <el-popover
-                              placement="left"
-                              width="400"
+                              placement="right"
+                              width="500"
                               trigger="hover"
+                              popper-class="issues-popover"
                             >
                               <ckeditor :editor="editor" disabled :config="readConfig"
                                         v-model="scope.row.description"/>
@@ -748,3 +749,10 @@ p {
   z-index: 999;
 }
 </style>
+
+<style>
+.issues-popover {
+  height: 550px;
+  overflow: auto;
+}
+</style>

From c4aa6da474ff8324a848102f15c884977620ac36 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 26 Jan 2021 15:01:48 +0800
Subject: [PATCH 4/4] =?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=E8=BF=81=E7=A7=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=9C=BA=E6=99=AF=E7=A6=81=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiDefinitionExecResultService.java       |  3 ++
 .../api/service/ApiDefinitionService.java     | 46 +++++++++++--------
 .../service/HistoricalDataUpgradeService.java |  1 +
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
index 0b20990141..fa7fbebfde 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
@@ -55,6 +55,9 @@ public class ApiDefinitionExecResultService {
                 saveResult.setCreateTime(System.currentTimeMillis());
                 saveResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId());
                 saveResult.setName(item.getName());
+                if (item.getName().indexOf("<->") != -1) {
+                    saveResult.setName(item.getName().substring(0, item.getName().indexOf("<->")));
+                }
                 saveResult.setResourceId(item.getName());
                 saveResult.setContent(JSON.toJSONString(item));
                 saveResult.setStartTime(item.getStartTime());
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 4e836d4afb..e03afa3ef7 100644
--- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
@@ -14,6 +14,7 @@ import io.metersphere.api.dto.scenario.request.RequestType;
 import io.metersphere.api.dto.swaggerurl.SwaggerTaskResult;
 import io.metersphere.api.dto.swaggerurl.SwaggerUrlRequest;
 import io.metersphere.api.jmeter.JMeterService;
+import io.metersphere.api.jmeter.RequestResult;
 import io.metersphere.api.jmeter.TestResult;
 import io.metersphere.api.parse.ApiImportParser;
 import io.metersphere.api.parse.ApiImportParserFactory;
@@ -297,7 +298,7 @@ public class ApiDefinitionService {
         }
     }
 
-    private ApiDefinition importCreate(ApiDefinitionResult request, ApiDefinitionMapper batchMapper,ApiTestImportRequest apiTestImportRequest) {
+    private ApiDefinition importCreate(ApiDefinitionResult request, ApiDefinitionMapper batchMapper, ApiTestImportRequest apiTestImportRequest) {
         SaveApiDefinitionRequest saveReq = new SaveApiDefinitionRequest();
         BeanUtils.copyBean(saveReq, request);
         final ApiDefinitionWithBLOBs apiDefinition = new ApiDefinitionWithBLOBs();
@@ -313,7 +314,7 @@ public class ApiDefinitionService {
         apiDefinition.setDescription(request.getDescription());
 
         List<ApiDefinition> sameRequest = getSameRequest(saveReq);
-        if(StringUtils.equals("fullCoverage",apiTestImportRequest.getModeId())){
+        if (StringUtils.equals("fullCoverage", apiTestImportRequest.getModeId())) {
             if (CollectionUtils.isEmpty(sameRequest)) {
                 batchMapper.insert(apiDefinition);
             } else {
@@ -321,9 +322,9 @@ public class ApiDefinitionService {
                 apiDefinition.setId(sameRequest.get(0).getId());
                 apiDefinitionMapper.updateByPrimaryKeyWithBLOBs(apiDefinition);
             }
-        }else if(StringUtils.equals("incrementalMerge",apiTestImportRequest.getModeId())){
+        } else if (StringUtils.equals("incrementalMerge", apiTestImportRequest.getModeId())) {
             batchMapper.insert(apiDefinition);
-        }else{
+        } else {
             if (CollectionUtils.isEmpty(sameRequest)) {
                 batchMapper.insert(apiDefinition);
             } else {
@@ -372,7 +373,11 @@ public class ApiDefinitionService {
 
     public void addResult(TestResult res) {
         if (!res.getScenarios().isEmpty() && !res.getScenarios().get(0).getRequestResults().isEmpty()) {
-            cache.put(res.getTestId(), res.getScenarios().get(0).getRequestResults().get(0));
+            RequestResult result = res.getScenarios().get(0).getRequestResults().get(0);
+            if (result.getName().indexOf("<->") != -1) {
+                result.setName(result.getName().substring(0, result.getName().indexOf("<->")));
+            }
+            cache.put(res.getTestId(), result);
         } else {
             MSException.throwException(Translator.get("test_not_found"));
         }
@@ -451,7 +456,7 @@ public class ApiDefinitionService {
                 item.setName(item.getName().substring(0, 255));
             }
             item.setNum(num++);
-            importCreate(item, batchMapper,request);
+            importCreate(item, batchMapper, request);
             if (i % 300 == 0) {
                 sqlSession.flushStatements();
             }
@@ -614,7 +619,7 @@ public class ApiDefinitionService {
     /*swagger定时导入*/
     public void createSchedule(Schedule request) {
         /*保存swaggerUrl*/
-        SwaggerUrlProject swaggerUrlProject=new SwaggerUrlProject();
+        SwaggerUrlProject swaggerUrlProject = new SwaggerUrlProject();
         swaggerUrlProject.setId(UUID.randomUUID().toString());
         swaggerUrlProject.setProjectId(request.getProjectId());
         swaggerUrlProject.setSwaggerUrl(request.getResourceId());
@@ -631,33 +636,38 @@ public class ApiDefinitionService {
         this.addOrUpdateSwaggerImportCronJob(request);
 
     }
+
     //关闭
-    public void updateSchedule(Schedule request){
+    public void updateSchedule(Schedule request) {
         scheduleService.editSchedule(request);
         this.addOrUpdateSwaggerImportCronJob(request);
     }
+
     //删除
-    public void deleteSchedule(ScheduleInfoSwaggerUrlRequest request){
+    public void deleteSchedule(ScheduleInfoSwaggerUrlRequest request) {
         swaggerUrlProjectMapper.deleteByPrimaryKey(request.getId());
         scheduleMapper.deleteByPrimaryKey(request.getTaskId());
 
     }
+
     //查询swaggerUrl详情
-    public SwaggerUrlProject getSwaggerInfo(String resourceId){
+    public SwaggerUrlProject getSwaggerInfo(String resourceId) {
         return swaggerUrlProjectMapper.selectByPrimaryKey(resourceId);
     }
-    public String getResourceId(SwaggerUrlRequest swaggerUrlRequest){
-        SwaggerUrlProjectExample swaggerUrlProjectExample=new SwaggerUrlProjectExample();
-        SwaggerUrlProjectExample.Criteria criteria=swaggerUrlProjectExample.createCriteria();
+
+    public String getResourceId(SwaggerUrlRequest swaggerUrlRequest) {
+        SwaggerUrlProjectExample swaggerUrlProjectExample = new SwaggerUrlProjectExample();
+        SwaggerUrlProjectExample.Criteria criteria = swaggerUrlProjectExample.createCriteria();
         criteria.andProjectIdEqualTo(swaggerUrlRequest.getProjectId()).andSwaggerUrlEqualTo(swaggerUrlRequest.getSwaggerUrl()).andModuleIdEqualTo(swaggerUrlRequest.getModuleId());
-        List<SwaggerUrlProject>  list=swaggerUrlProjectMapper.selectByExample(swaggerUrlProjectExample);
-        String resourceId="";
-        if(list.size()==1){
-            resourceId=list.get(0).getId();
+        List<SwaggerUrlProject> list = swaggerUrlProjectMapper.selectByExample(swaggerUrlProjectExample);
+        String resourceId = "";
+        if (list.size() == 1) {
+            resourceId = list.get(0).getId();
         }
         return resourceId;
     }
-    public List<SwaggerTaskResult>  getSwaggerScheduleList(String projectId){
+
+    public List<SwaggerTaskResult> getSwaggerScheduleList(String projectId) {
         return extSwaggerUrlScheduleMapper.getSwaggerTaskList(projectId);
     }
 
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 a20aea382f..e1f1aca8d1 100644
--- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
+++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
@@ -412,6 +412,7 @@ public class HistoricalDataUpgradeService {
                     MsScenario step = new MsScenario();
                     step.setId(scenario1.getId());
                     step.setName(scenario1.getName());
+                    step.setEnable(scenario.isEnable());
                     step.setType("scenario");
                     step.setResourceId(UUID.randomUUID().toString());
                     step.setReferenced("REF");