From f09cc98b67b23a0a418383ae8534363bbf8201ae Mon Sep 17 00:00:00 2001
From: "song.tianyang" <tianyang.song@fit2cloud.com>
Date: Thu, 24 Dec 2020 14:14:51 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E9=A6=96=E9=A1=B5tips=E8=B6=85?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=A2=9C=E8=89=B2=E6=98=AF=E7=B4=AB=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复首页tips超链接颜色是紫色的问题，并只针对地址做了超链接
---
 .../api/jmeter/APIBackendListenerClient.java          | 11 ++++++++++-
 .../api/automation/scenario/ScenarioExtendBtns.vue    |  2 +-
 .../api/automation/schedule/ScheduleMaintain.vue      |  2 +-
 .../components/api/homepage/ApiTestHomePage.vue       |  4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
index 87bf1cb7e1..66f71dc3f3 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/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);
diff --git a/frontend/src/business/components/api/automation/scenario/ScenarioExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/ScenarioExtendBtns.vue
index c055c7c657..087f701c38 100644
--- a/frontend/src/business/components/api/automation/scenario/ScenarioExtendBtns.vue
+++ b/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" />
diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue b/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
index af72b48a36..d29ce8a103 100644
--- a/frontend/src/business/components/api/automation/schedule/ScheduleMaintain.vue
+++ b/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>
diff --git a/frontend/src/business/components/api/homepage/ApiTestHomePage.vue b/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
index 5bd7b78104..1c54476b84 100644
--- a/frontend/src/business/components/api/homepage/ApiTestHomePage.vue
+++ b/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温馨提醒 —— 多喝热水哟！