From 18c7a30a03c9689dc8278c030ad8e5d0bb6aa1a3 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 7 Aug 2020 10:03:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A6=96=E9=A1=B5=E5=8F=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BF=90=E8=A1=8C=E4=B8=AD=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/service/APITestService.java    |  1 +
 .../metersphere/base/mapper/ext/ExtScheduleMapper.xml |  3 +++
 .../performance/service/PerformanceTestService.java   |  1 +
 .../src/business/components/api/home/ApiTestHome.vue  |  6 +++---
 .../{ApiTestScheduleList.vue => ScheduleList.vue}     |  4 ++--
 .../components/common/components/MsScheduleConfig.vue | 11 ++++++-----
 .../business/components/common/cron/CrontabResult.vue |  4 ++--
 .../performance/home/PerformanceTestHome.vue          |  6 +++---
 frontend/src/i18n/en-US.js                            |  1 +
 frontend/src/i18n/zh-CN.js                            |  1 +
 frontend/src/i18n/zh-TW.js                            |  1 +
 11 files changed, 24 insertions(+), 15 deletions(-)
 rename frontend/src/business/components/api/home/{ApiTestScheduleList.vue => ScheduleList.vue} (96%)

diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index a886c9ed3a..648d4a8c4d 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -314,6 +314,7 @@ public class APITestService {
     }
 
     public List<ScheduleDao> listSchedule(QueryScheduleRequest request) {
+        request.setEnable(true);
         List<ScheduleDao> schedules = scheduleService.list(request);
         List<String> resourceIds = schedules.stream()
                 .map(Schedule::getResourceId)
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
index 8738fdf285..5cb36cffce 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml
@@ -10,6 +10,9 @@
             <if test="request.workspaceId != null">
                 and schedule.workspace_id = #{request.workspaceId}
             </if>
+            <if test="request.enable != null">
+                and schedule.enable = #{request.enable}
+            </if>
             <if test="request.filters != null and request.filters.size() > 0">
                 <foreach collection="request.filters.entrySet()" index="key" item="values">
                     <if test="values != null and values.size() > 0">
diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
index 6625dc899b..a52187115d 100644
--- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
+++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
@@ -420,6 +420,7 @@ public class PerformanceTestService {
     }
 
     public List<ScheduleDao> listSchedule(QueryScheduleRequest request) {
+        request.setEnable(true);
         List<ScheduleDao> schedules = scheduleService.list(request);
         List<String> resourceIds = schedules.stream()
                 .map(Schedule::getResourceId)
diff --git a/frontend/src/business/components/api/home/ApiTestHome.vue b/frontend/src/business/components/api/home/ApiTestHome.vue
index 431568988b..69919d5c8a 100644
--- a/frontend/src/business/components/api/home/ApiTestHome.vue
+++ b/frontend/src/business/components/api/home/ApiTestHome.vue
@@ -14,7 +14,7 @@
           <ms-test-heatmap :values="values"/>
         </el-col>
         <el-col :span="12">
-          <ms-api-test-schedule-list :group="'API_TEST'"/>
+          <ms-schedule-list :group="'API_TEST'"/>
         </el-col>
       </el-row>
     </ms-main-container>
@@ -28,13 +28,13 @@
   import MsApiTestRecentList from "./ApiTestRecentList";
   import MsApiReportRecentList from "./ApiReportRecentList";
   import MsTestHeatmap from "../../common/components/MsTestHeatmap";
-  import MsApiTestScheduleList from "./ApiTestScheduleList";
+  import MsScheduleList from "./ScheduleList";
 
   export default {
     name: "ApiTestHome",
 
     components: {
-      MsApiTestScheduleList,
+      MsScheduleList,
       MsTestHeatmap, MsApiReportRecentList, MsApiTestRecentList, MsMainContainer, MsContainer
     },
 
diff --git a/frontend/src/business/components/api/home/ApiTestScheduleList.vue b/frontend/src/business/components/api/home/ScheduleList.vue
similarity index 96%
rename from frontend/src/business/components/api/home/ApiTestScheduleList.vue
rename to frontend/src/business/components/api/home/ScheduleList.vue
index 1495f1e11a..d0cdfcf42d 100644
--- a/frontend/src/business/components/api/home/ApiTestScheduleList.vue
+++ b/frontend/src/business/components/api/home/ScheduleList.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card class="table-card" v-loading="result.loading">
     <template v-slot:header>
-      <span class="title">{{$t('commons.trigger_mode.schedule')}}</span>
+      <span class="title">{{$t('schedule.running_task')}}</span>
     </template>
     <el-table height="289" border :data="tableData" class="adjust-table table-content" @row-click="link">
       <el-table-column prop="resourceName" :label="$t('schedule.test_name')" width="150" show-overflow-tooltip/>
@@ -32,7 +32,7 @@
   import {SCHEDULE_TYPE} from "../../../../common/js/constants";
 
   export default {
-    name: "MsApiTestScheduleList",
+    name: "MsScheduleList",
     components: {CrontabResult},
     data() {
       return {
diff --git a/frontend/src/business/components/common/components/MsScheduleConfig.vue b/frontend/src/business/components/common/components/MsScheduleConfig.vue
index 029174abb4..720edbe723 100644
--- a/frontend/src/business/components/common/components/MsScheduleConfig.vue
+++ b/frontend/src/business/components/common/components/MsScheduleConfig.vue
@@ -7,10 +7,14 @@
         </span>
         <el-switch :disabled="!schedule.value || isReadOnly" v-model="schedule.enable" @change="scheduleChange"/>
         <ms-schedule-edit :is-read-only="isReadOnly" :schedule="schedule" :save="save" :custom-validate="customValidate" ref="scheduleEdit"/>
-        <crontab-result v-show="false" :ex="schedule.value" ref="crontabResult" @resultListChange="resultListChange"/>
+
       </div>
       <div>
-        <span :class="{'disable-character': !schedule.enable}"> {{$t('schedule.next_execution_time')}}：{{this.recentList.length > 0 &&  schedule.enable ? this.recentList[0] : $t('schedule.not_set')}} </span>
+        <span>
+          {{$t('schedule.next_execution_time')}}：
+          <span :class="{'disable-character': !schedule.enable}" v-if="!schedule.enable">{{$t('schedule.not_set')}}</span>
+          <crontab-result v-if="schedule.enable" :enable-simple-mode="true" :ex="schedule.value" ref="crontabResult"/>
+        </span>
       </div>
     </div>
 </template>
@@ -59,9 +63,6 @@
         scheduleChange() {
           this.$emit('scheduleChange');
         },
-        resultListChange(resultList) {
-          this.recentList = resultList;
-        },
         flashResultList() {
           this.$refs.crontabResult.expressionChange();
         }
diff --git a/frontend/src/business/components/common/cron/CrontabResult.vue b/frontend/src/business/components/common/cron/CrontabResult.vue
index fa7f206531..a1f4c74e6a 100644
--- a/frontend/src/business/components/common/cron/CrontabResult.vue
+++ b/frontend/src/business/components/common/cron/CrontabResult.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <span>
     <span v-if="enableSimpleMode">{{resultList && resultList.length > 0 ? resultList[0] : ''}}</span>
     <div v-if="!enableSimpleMode" class="popup-result">
       <p class="title">{{$t('schedule.cron.recent_run_time')}}</p>
@@ -9,7 +9,7 @@
         </template>
       </ul>
     </div>
-  </div>
+  </span>
 </template>
 
 <script>
diff --git a/frontend/src/business/components/performance/home/PerformanceTestHome.vue b/frontend/src/business/components/performance/home/PerformanceTestHome.vue
index b439c7cd1c..3880725d09 100644
--- a/frontend/src/business/components/performance/home/PerformanceTestHome.vue
+++ b/frontend/src/business/components/performance/home/PerformanceTestHome.vue
@@ -14,7 +14,7 @@
           <ms-test-heatmap :values="values"/>
         </el-col>
         <el-col :span="12">
-          <ms-api-test-schedule-list :group="'PERFORMANCE_TEST'"/>
+          <ms-schedule-list :group="'PERFORMANCE_TEST'"/>
         </el-col>
       </el-row>
     </ms-main-container>
@@ -28,12 +28,12 @@
   import MsPerformanceTestRecentList from "./PerformanceTestRecentList"
   import MsPerformanceReportRecentList from "./PerformanceReportRecentList"
   import MsTestHeatmap from "../../common/components/MsTestHeatmap";
-  import MsApiTestScheduleList from "../../api/home/ApiTestScheduleList";
+  import MsScheduleList from "../../api/home/ScheduleList";
 
   export default {
     name: "PerformanceTestHome",
     components: {
-      MsApiTestScheduleList,
+      MsScheduleList,
       MsTestHeatmap,
       MsMainContainer,
       MsContainer,
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f575398f0f..fd3d783b79 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -713,6 +713,7 @@ export default {
     test_name: 'Test Name',
     running_rule: 'Rule',
     job_status: 'Status',
+    running_task: 'Running Task',
     please_input_cron_expression: "Please Input Cron Expression",
     generate_expression: "Generate Expression",
     cron_expression_format_error: "Cron Expression Format Error",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index a1f2d22042..217286e243 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -710,6 +710,7 @@ export default {
     test_name: '测试名称',
     running_rule: '运行规则',
     job_status: '任务状态',
+    running_task: '运行中的任务',
     next_execution_time: "下次执行时间",
     edit_timer_task: "编辑定时任务",
     please_input_cron_expression: "请输入 Cron 表达式",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 5c42ee604b..3e416b49be 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -711,6 +711,7 @@ export default {
     test_name: '測試名稱',
     running_rule: '運行規則',
     job_status: '任務狀態',
+    running_task: '運行中的任務',
     please_input_cron_expression: "請輸入 Cron 表達式",
     generate_expression: "生成表達式",
     cron_expression_format_error: "Cron 表達式格式錯誤",