From 17b3a0379121d32335540a64b3cbe34810040f31 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 16 Dec 2022 00:54:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DJsonSchema=E4=B8=AD=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1020800 --user=宋天阳 【接口测试】github#20570，接口场景测试 JSON请求体中
json数组中的mock函数无效 https://www.tapd.cn/55049933/s/1316138
---
 .../commons/json-schema/schema/editor/main.vue   | 16 ++++++++++++++--
 .../home/components/table/ScheduleTaskList.vue   |  3 ---
 .../plan/service/TestPlanReportService.java      | 14 ++++++++------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/api-test/frontend/src/business/commons/json-schema/schema/editor/main.vue b/api-test/frontend/src/business/commons/json-schema/schema/editor/main.vue
index 3304fc2bb3..fbc507f88c 100644
--- a/api-test/frontend/src/business/commons/json-schema/schema/editor/main.vue
+++ b/api-test/frontend/src/business/commons/json-schema/schema/editor/main.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="json-schema-editor" style="padding: 0 10px">
-    <el-row class="row" :gutter="10">
+    <el-row class="row" :gutter="10" v-if="reloadSelfOver">
       <el-col :style="{ minWidth: `${200 - 10 * deep}px` }" class="ms-col-name">
         <div :style="{ marginLeft: `${10 * deep}px` }" class="ms-col-name-c" />
         <span
@@ -401,6 +401,7 @@ export default {
       countAdd: 1,
       modalVisible: false,
       reloadItemOver: true,
+      reloadSelfOver: true,
       advancedValue: {},
       addProp: {}, // 自定义属性
       customProps: [],
@@ -484,15 +485,19 @@ export default {
     changeAllItemsType(changeType) {
       if (this.isArray(this.pickValue) && this.pickValue.items && this.pickValue.items.length > 0) {
         this.pickValue.items.forEach((item) => {
-          item.type = changeType;
           delete item['properties'];
           delete item['items'];
           delete item['required'];
           delete item['mock'];
+          this.$set(item, 'type', changeType);
           if (changeType === 'array') {
             this.$set(item, 'items', [{ type: 'string', mock: { mock: '' } }]);
           }
         });
+        this.$nextTick(() => {
+          this.reloadSelf();
+          this.reloadItems();
+        });
       }
     },
     onCheck(e) {
@@ -609,6 +614,13 @@ export default {
         this.reloadItemOver = true;
       });
     },
+
+    reloadSelf() {
+      this.reloadSelfOver = false;
+      this.$nextTick(() => {
+        this.reloadSelfOver = true;
+      });
+    },
     editScenarioAdvance(data) {
       this.$emit('editScenarioAdvance', data);
     },
diff --git a/api-test/frontend/src/business/home/components/table/ScheduleTaskList.vue b/api-test/frontend/src/business/home/components/table/ScheduleTaskList.vue
index d17e5a7a4b..cbd15cf7b6 100644
--- a/api-test/frontend/src/business/home/components/table/ScheduleTaskList.vue
+++ b/api-test/frontend/src/business/home/components/table/ScheduleTaskList.vue
@@ -130,9 +130,6 @@ export default {
       },
     };
   },
-  activated() {
-    this.search();
-  },
   methods: {
     clickRow(row, column) {
       if (column.property !== 'status') {
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
index 88c8eccd62..4817f3ff5f 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
@@ -38,7 +38,6 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -561,6 +560,11 @@ public class TestPlanReportService {
                 resourceId = planExecutionQueues.get(0).getResourceId();
                 testPlanExecutionQueueMapper.deleteByExample(testPlanExecutionQueueExample);
             }
+            
+            testPlanReportMapper.updateByPrimaryKey(testPlanReport);
+            //发送通知
+            testPlanMessageService.checkTestPlanStatusAndSendMessage(testPlanReport, content, isSendMessage);
+
             if (runMode != null && StringUtils.equalsIgnoreCase(runMode, RunModeConstants.SERIAL.name()) && resourceId != null) {
                 TestPlanExecutionQueueExample queueExample = new TestPlanExecutionQueueExample();
                 queueExample.createCriteria().andReportIdIsNotNull().andResourceIdEqualTo(resourceId);
@@ -577,10 +581,8 @@ public class TestPlanReportService {
                 runRequest.setReportId(testPlanExecutionQueue.getReportId());
                 testPlanService.runPlan(runRequest);
             }
-            testPlanReportMapper.updateByPrimaryKey(testPlanReport);
+
         }
-        //发送通知
-        testPlanMessageService.checkTestPlanStatusAndSendMessage(testPlanReport, content, isSendMessage);
         return testPlanReport;
     }
 
@@ -1053,7 +1055,7 @@ public class TestPlanReportService {
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
-        if(extReport != null) {
+        if (extReport != null) {
             BeanUtils.copyBean(testPlanReportDTO, extReport);
         }
         return testPlanReportDTO;
@@ -1375,7 +1377,7 @@ public class TestPlanReportService {
         example.setOrderByClause("create_time desc");
         example.createCriteria().andTestPlanIdEqualTo(planId);
         List<TestPlanReport> testPlanReports = testPlanReportMapper.selectByExample(example);
-        if(CollectionUtils.isNotEmpty(testPlanReports)){
+        if (CollectionUtils.isNotEmpty(testPlanReports)) {
             return testPlanReports.get(0).getId();
         }
         return null;