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

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

@@ -195,14 +195,23 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
             } else {
                 String[] sceneNameArr = scenaName.split("-");
                 if (sceneNameArr.length >= 4) {
+                    //如果以yyyy-MM-dd 时间类型结尾
                     String endStr = "-" + sceneNameArr[sceneNameArr.length - 3] + "-" + sceneNameArr[sceneNameArr.length - 2] + "-" + sceneNameArr[sceneNameArr.length - 1];
                     scenaName = scenaName.split(endStr)[0];
                 } else {
+                    //如果以时间戳结尾
                     scenaName = scenaName.split("-")[0];
                 }
             }
+            ApiScenarioReport savedReport = apiScenarioReportService.get(testId);
+            String scenarioID = null;
+            if(savedReport!=null){
+                scenarioID = savedReport.getScenarioId();
+            }
+            if(scenarioID==null){
+                scenarioID = apiScenarioReportService.getApiScenarioId(scenaName, scenarioReport.getProjectId());
+            }
 
-            String scenarioID = apiScenarioReportService.getApiScenarioId(scenaName, scenarioReport.getProjectId());
             testResult.setTestId(scenarioID);
         } else {
             apiTestService.changeStatus(testId, APITestStatus.Completed);

frontend/src/business/components/api/automation/scenario/ScenarioExtendBtns.vue

@@ -5,7 +5,7 @@
     </el-link>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="ref">{{ $t('api_test.automation.view_ref') }}</el-dropdown-item>
-      <el-dropdown-item command="schedule">{{ $t('api_test.automation.schedule') }}</el-dropdown-item>
+      <el-dropdown-item command="schedule" v-tester>{{ $t('api_test.automation.schedule') }}</el-dropdown-item>
     </el-dropdown-menu>
     <ms-reference-view ref="viewRef"/>
     <ms-schedule-maintain ref="scheduleMaintain" />

frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue

@@ -10,7 +10,7 @@
                 prop="cronValue">
                 <el-input :disabled="isReadOnly" v-model="form.cronValue" class="inp"
                           :placeholder="$t('schedule.please_input_cron_expression')"/>
-                <el-button :disabled="isReadOnly" type="primary" @click="saveCron">{{
+                <el-button :disabled="isReadOnly" type="primary" @click="saveCron" v-tester>{{
                     $t('commons.save')
                   }}
                 </el-button>

frontend/src/business/components/api/homepage/ApiTestHomePage.vue

@@ -6,10 +6,10 @@
           🤔️天凉了，保温杯买了吗？
         </div>
         <div v-else-if="dateType==='2'">
-          <el-link href="https://github.com/metersphere/metersphere/issues" target="_blank" type="primary">😔觉得MeterSphere不好用就来https://github.com/metersphere/metersphere/issues吐个槽吧！</el-link>
+          😔觉得MeterSphere不好用就来 <el-link href="https://github.com/metersphere/metersphere/issues" target="_blank" style="color: black" type="primary">https://github.com/metersphere/metersphere/issues</el-link> 吐个槽吧！
         </div>
         <div v-else-if="dateType==='3'">
-          <el-link href="https://github.com/metersphere/metersphere"  target="_blank" type="primary">😄觉得MeterSphere好用就来 https://github.com/metersphere/metersphere 点个star吧！</el-link>
+          😄觉得MeterSphere好用就来 <el-link href="https://github.com/metersphere/metersphere"  target="_blank" style="color: black" type="primary">https://github.com/metersphere/metersphere</el-link> 点个star吧！
         </div>
         <div v-else>
           😊 MeterSphere温馨提醒 —— 多喝热水哟！

frontend/src/business/components/track/plan/view/TestPlanView.vue

@@ -10,7 +10,7 @@
           @dataChange="changePlan"/>
       </template>
       <template v-slot:menu>
-        <el-menu active-text-color="#6d317c" :default-active="activeIndex"
+        <el-menu v-if="isMenuShow" active-text-color="#6d317c" :default-active="activeIndex"
                  class="el-menu-demo header-menu" mode="horizontal" @select="handleSelect">
           <el-menu-item index="functional">功能测试用例</el-menu-item>
           <el-menu-item index="api">接口测试用例</el-menu-item>
@@ -21,6 +21,9 @@
     <test-plan-functional v-if="activeIndex === 'functional'" :plan-id="planId"/>
     <test-plan-api v-if="activeIndex === 'api'" :plan-id="planId"/>
     <test-case-statistics-report-view :test-plan="currentPlan" v-if="activeIndex === 'report'"/>
+
+    <test-report-template-list @openReport="openReport" ref="testReportTemplateList"/>
+
   </div>
 
 </template>
@@ -38,10 +41,12 @@
     import TestPlanFunctional from "./comonents/functional/TestPlanFunctional";
     import TestPlanApi from "./comonents/api/TestPlanApi";
     import TestCaseStatisticsReportView from "./comonents/report/statistics/TestCaseStatisticsReportView";
+    import TestReportTemplateList from "./comonents/TestReportTemplateList";
 
     export default {
       name: "TestPlanView",
       components: {
+        TestReportTemplateList,
         TestCaseStatisticsReportView,
         TestPlanApi,
         TestPlanFunctional,
@@ -52,7 +57,8 @@
         return {
           testPlans: [],
           currentPlan: {},
-          activeIndex: "functional"
+          activeIndex: "functional",
+          isMenuShow: true
         }
       },
       computed: {
@@ -62,6 +68,7 @@
       },
       watch: {
         '$route.params.planId'() {
+          this.activeIndex = "functional";
           this.getTestPlans();
         }
       },
@@ -85,8 +92,23 @@
         },
         handleSelect(key) {
           this.activeIndex = key;
+          if (key === 'report' && !this.currentPlan.reportId) {
+            this.$refs.testReportTemplateList.open(this.planId);
+          }
+        },
+        openTemplateReport() {
+          this.$refs.testReportTemplateList.open(this.planId);
+        },
+        openReport(planId, id) {
+          this.currentPlan.reportId = id;
+        },
+        reloadMenu() {
+          this.isMenuShow = false;
+          this.$nextTick(() => {
+            this.isMenuShow = true;
+          });
         }
-      }
+      },
     }
 </script>
 

frontend/src/business/components/track/plan/view/comonents/TestReportTemplateList.vue

@@ -2,6 +2,7 @@
 
   <el-dialog :title="$t('test_track.plan_view.select_template')"
              :visible.sync="templateVisible"
+             class="report-template-list"
              width="50%">
 
     <el-main>
@@ -59,4 +60,7 @@
     display: none;
   }
 
+  .report-template-list {
+    text-align: left;
+  }
 </style>

frontend/src/business/components/track/plan/view/comonents/report/statistics/TestCaseStatisticsReportView.vue

@@ -1,16 +1,15 @@
 <template>
-  <div v-loading="result.loading">
+  <div v-loading="result.loading" :class="{'text-align': !reportId}">
+
+      <el-button v-if="!reportId" class="create-button" :disabled="!isTestManagerOrTestUser" plain size="mini" @click="openTemplateReport">
+        {{$t('test_track.plan_view.create_report')}}
+      </el-button>
+
     <el-row type="flex" class="head-bar">
       <el-col :span="12">
       </el-col>
 
-      <el-col v-if="!reportId" :span="11" class="head-right">
+      <el-col v-if="reportId" :span="11" class="head-right">
-        <el-button :disabled="!isTestManagerOrTestUser" plain size="mini" @click="openTemplateReport">
-          {{$t('test_track.plan_view.create_report')}}
-        </el-button>
-      </el-col>
-
-      <el-col v-else :span="11" class="head-right">
         <el-button :disabled="!isTestManagerOrTestUser" plain size="mini" @click="handleSave">
           {{$t('commons.save')}}
         </el-button>
@@ -255,6 +254,14 @@
     width: 80px;
   }
 
+  .text-align {
+    text-align: center;
+  }
+
+  .create-button {
+    margin: 20px auto;
+  }
+
   .head-bar {
     position: fixed;
     right: 10px;