From d3c88eb2715472164dfd83f541b9d591d720a1e6 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Sun, 25 Apr 2021 15:32:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=89=A7=E8=A1=8C=E5=9C=BA=E6=99=AF=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8CMock=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=93=8D=E4=BD=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复测试计划定时任务无法执行场景案例的问题，Mock配置页面操作优化
---
 .../metersphere/track/service/TestPlanService.java   |  3 +--
 .../api/definition/components/mock/MockConfig.vue    | 12 +++++++-----
 .../components/common/components/table/MsTable.vue   |  1 -
 3 files changed, 8 insertions(+), 8 deletions(-)

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 c40451ca46..7354cd5e89 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java
@@ -935,6 +935,7 @@ public class TestPlanService {
                             planScenarioID + ":" + request.getTestPlanReportId(),
                             item.getName(), request.getTriggerMode() == null ? ReportTriggerMode.MANUAL.name() : request.getTriggerMode(),
                             request.getExecuteType(), item.getProjectId(), request.getReportUserID(),null);
+                    apiScenarioReportMapper.insert(report);
                     group.setHashTree(scenarios);
                     testPlan.getHashTree().add(group);
                     returnId = request.getId();
@@ -1056,7 +1057,6 @@ public class TestPlanService {
 
         //执行场景执行任务
         if (!planScenarioIdMap.isEmpty()) {
-            LogUtil.info("-------------- testplan schedule ---------- api case over -----------------");
             SchedulePlanScenarioExecuteRequest scenarioRequest = new SchedulePlanScenarioExecuteRequest();
             String senarionReportID = UUID.randomUUID().toString();
             scenarioRequest.setId(senarionReportID);
@@ -1076,7 +1076,6 @@ public class TestPlanService {
                 scenarioIsExcuting = true;
                 scenarioCaseIdArray= JSONArray.toJSONString(new ArrayList<>(planScenarioIdMap.keySet()));
             }
-            LogUtil.info("-------------- testplan schedule ---------- scenario case over -----------------");
         }
 
 
diff --git a/frontend/src/business/components/api/definition/components/mock/MockConfig.vue b/frontend/src/business/components/api/definition/components/mock/MockConfig.vue
index e38edaa8c7..0a210cc1f8 100644
--- a/frontend/src/business/components/api/definition/components/mock/MockConfig.vue
+++ b/frontend/src/business/components/api/definition/components/mock/MockConfig.vue
@@ -266,8 +266,7 @@ export default {
       let mockConfigId = this.mockConfigData.mockConfig.id;
       this.mockExpectConfig.mockConfigId = mockConfigId;
       this.mockExpectConfig.id = "";
-      let formCheckResult = this.checkMockExpectForm("mockExpectForm");
-      this.cleanMockExpectConfig();
+      let formCheckResult = this.checkMockExpectForm("mockExpectForm", true);
     },
     cleanMockExpectConfig() {
       this.showHeadTable = false;
@@ -294,13 +293,16 @@ export default {
     updateMockExpectConfig() {
       this.checkMockExpectForm("mockExpectForm");
     },
-    uploadMockExpectConfig() {
+    uploadMockExpectConfig(clearForm) {
       let url = "/mockConfig/updateMockExpectConfig";
       let param = this.mockExpectConfig;
       this.$post(url, param, response => {
         let returnData = response.data;
         this.mockExpectConfig.id = returnData.id;
         this.refreshMockInfo(param.mockConfigId);
+        if (clearForm) {
+          this.cleanMockExpectConfig();
+        }
         this.$message({
           type: 'success',
           message: this.$t('commons.save_success'),
@@ -314,10 +316,10 @@ export default {
         this.mockConfigData = response.data;
       });
     },
-    checkMockExpectForm(formName) {
+    checkMockExpectForm(formName, clearForm) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.uploadMockExpectConfig();
+          this.uploadMockExpectConfig(clearForm);
           return true;
         } else {
           return false;
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index 530726a585..a2be096b99 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -151,7 +151,6 @@ export default {
   watch: {
     selectNodeIds() {
       this.selectDataCounts = 0;
-      this.$refs.selectPopover.reload();
     },
   },
   computed: {