Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java

@@ -254,6 +254,9 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
     }
 
     private static void sendTask(ApiTestReport report, String reportUrl, TestResult testResult) {
+        if (report == null) {
+            return;
+        }
         SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
         NoticeSendService noticeSendService = CommonBeanFactory.getBean(NoticeSendService.class);
         assert systemParameterService != null;

backend/src/main/resources/db/migration/V78__v1.8_release.sql

@@ -239,7 +239,7 @@ values ('test_plan_list',
         '[{"id":"name","label":"名称"},{"id":"userName","label":"负责人"},{"id":"status","label":"当前状态"},{"id":"stage","label":"测试阶段"},{"id":"testRate","label":"测试进度"},{"id":"projectName","label":"所属项目"},{"id":"plannedStartTime","label":"计划开始"},{"id":"plannedEndTime","label":"计划结束"},{"id":"actualStartTime","label":"实际开始"},{"id":"actualEndTime","label":"实际结束"},{"id":"tags","label":"标签"},{"id":"executionTimes","label":"执行次数"},{"id":"passRate","label":"通过率"}]');
 insert into system_header (type, props)
 values ('test_case_list',
-        '[{"id":"tags","label":"标签"},{"id":"nodePath","label":"所属模块"},{"id":"updateTime","label":"更新时间"},{"id":"num","label":"ID"},{"id":"name","label":"名称"},{"id":"priority","label":"用例等级"},{"id":"reviewStatus","label":"评审状态"}]');
+        '[{"id":"num","label":"ID"},{"id":"name","label":"名称"},{"id":"priority","label":"用例等级"},{"id":"reviewStatus","label":"评审状态"},{"id":"tags","label":"标签"},{"id":"nodePath","label":"所属模块"},{"id":"updateTime","label":"更新时间"}]');
 insert into system_header (type, props)
 values ('test_plan_scenario_case',
         '[{"id":"num","label":"ID"},{"id":"name","label":"名称"},{"id":"level","label":"用例等级"},{"id":"tagNames","label":"标签"},{"id":"userId","label":"创建人"},{"id":"updateTime","label":"最后更新时间"},{"id":"stepTotal","label":"通过"},{"id":"lastResult","label":"失败"},{"id":"passRate","label":"通过率"}]');

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -468,7 +468,6 @@ export default {
       }
       return new Promise((resolve, reject) => {
         this.$get(url).then(res => {
-          console.log(res.data.data)
           const data = res.data.data.map(item => ({
             value: item.id,
             label: item.name,
@@ -640,8 +639,8 @@ export default {
       if (tmp.steps == null) {
         tmp.steps = []
       }
+      tmp.tags = JSON.parse(tmp.tags);
       Object.assign(this.form, tmp);
-      console.log(this.form.selected)
       this.form.module = testCase.nodeId;
       this.getFileMetaData(testCase);
       /* testCase.selected = JSON.parse(testCase.testId);

frontend/src/business/components/track/case/components/TestCaseList.vue

@@ -395,6 +395,9 @@ export default {
               item.tags = JSON.parse(item.tags);
             }
           })*/
+          this.tableData.forEach((item) => {
+            item.tags = JSON.parse(item.tags);
+          })
           if (this.$refs.table) {
             this.$refs.table.doLayout()
           }

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
+Subproject commit 2115bd28a90854d2b6276a90878934715498c584