From 0ed718c2145115e43df73ec271733b2e58e354d5 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sun, 28 Jun 2020 14:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsScheduleConfig.vue    | 16 +++++++--
 .../common/components/MsScheduleEdit.vue      | 35 +++++++++++++++++--
 .../components/common/cron/Crontab.vue        |  4 +--
 .../components/common/cron/CrontabResult.vue  |  6 ++--
 .../test/EditPerformanceTestPlan.vue          | 14 +++++++-
 5 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsScheduleConfig.vue b/frontend/src/business/components/common/components/MsScheduleConfig.vue
index 4dcf0dff06..e5608bf925 100644
--- a/frontend/src/business/components/common/components/MsScheduleConfig.vue
+++ b/frontend/src/business/components/common/components/MsScheduleConfig.vue
@@ -6,8 +6,8 @@
           <span class="character" @click="scheduleEdit">SCHEDULER</span>
         </span>
         <el-switch :disabled="!schedule.value" v-model="schedule.enable" @change="scheduleChange"/>
-        <ms-schedule-edit :schedule="schedule" :save="save" ref="scheduleEdit"/>
-        <crontab-result v-show="false" :ex="schedule.value" ref="crontabResult" @resultListChange="recentListChange"/>
+        <ms-schedule-edit :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}"> 下次执行时间：{{this.recentList.length > 0 ? this.recentList[0] : '未设置'}} </span>
@@ -18,6 +18,9 @@
 <script>
     import MsScheduleEdit from "./MsScheduleEdit";
     import CrontabResult from "../cron/CrontabResult";
+
+    function defaultCustomValidate() {return {pass: true};}
+
     export default {
       name: "MsScheduleConfig",
       components: {CrontabResult, MsScheduleEdit},
@@ -37,6 +40,10 @@
             }
           }
         },
+        customValidate: {
+          type: Function,
+          default: defaultCustomValidate
+        },
       },
       methods: {
         scheduleEdit() {
@@ -48,8 +55,11 @@
         scheduleChange() {
           this.$emit('scheduleChange');
         },
-        recentListChange(resultList) {
+        resultListChange(resultList) {
           this.recentList = resultList;
+        },
+        flashResultList() {
+          this.$refs.crontabResult.expressionChange();
         }
       }
     }
diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 16063c147b..8d96dbf9c3 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -9,10 +9,10 @@
           <el-button type="primary" @click="showCronDialog">生成 Cron</el-button>
           <el-button type="primary" @click="saveCron">保存</el-button>
         </el-form-item>
-        <crontab-result :ex="form.cronValue" ref="crontabResult"/>
+        <crontab-result :ex="form.cronValue" ref="crontabResult" />
       </el-form>
       <el-dialog title="生成 cron" :visible.sync="showCron" :modal="false">
-        <crontab @hide="showCron=false" @fill="crontabFill" :expression="schedule.value"/>
+        <crontab @hide="showCron=false" @fill="crontabFill" :expression="schedule.value" ref="crontab"/>
       </el-dialog>
     </div>
   </el-dialog>
@@ -24,12 +24,18 @@
     import CrontabResult from "../cron/CrontabResult";
     import {cronValidate} from "../../../../common/js/cron";
 
+    function defaultCustomValidate() {return {pass: true};}
+
     export default {
       name: "MsScheduleEdit",
       components: {CrontabResult, Crontab},
       props: {
         save: Function,
         schedule: {},
+        customValidate: {
+          type: Function,
+          default: defaultCustomValidate
+        },
       },
       watch: {
         'schedule.value'() {
@@ -38,8 +44,13 @@
       },
       data() {
           const validateCron = (rule, cronValue, callback) => {
+            let customValidate = this.customValidate(this.getIntervalTime());
             if (!cronValidate(cronValue)) {
               callback(new Error('Cron 表达式格式错误'));
+            } else if(!this.intervalShortValidate()) {
+              callback(new Error('间隔时间请大于 5 分钟'));
+            } else if (!customValidate.pass){
+              callback(new Error(customValidate.info));
             } else {
               callback();
             }
@@ -58,10 +69,12 @@
       methods: {
         open() {
           this.dialogVisible = true;
+          this.form.cronValue = this.schedule.value;
         },
-        crontabFill(value) {
+        crontabFill(value, resultList) {
           //确定后回传的值
           this.form.cronValue = value;
+          this.$refs.crontabResult.resultList = resultList;
           this.$refs['from'].validate();
         },
         showCronDialog() {
@@ -78,11 +91,27 @@
           });
         },
         close() {
+          this.dialogVisible = false;
           this.form.cronValue = '';
           this.$refs['from'].resetFields();
           if (!this.schedule.value) {
             this.$refs.crontabResult.resultList = [];
           }
+        },
+        intervalShortValidate() {
+          if (this.getIntervalTime() < 5*60*1000) {
+            return false;
+          }
+          return true;
+        },
+        resultListChange() {
+          this.$refs['from'].validate();
+        },
+        getIntervalTime() {
+          let resultList = this.$refs.crontabResult.resultList;
+          let time1 = new Date(resultList[0]);
+          let time2 = new Date(resultList[1]);
+          return time2 - time1;
         }
       }
     }
diff --git a/frontend/src/business/components/common/cron/Crontab.vue b/frontend/src/business/components/common/cron/Crontab.vue
index 1ffcc641f8..7fff078e42 100644
--- a/frontend/src/business/components/common/cron/Crontab.vue
+++ b/frontend/src/business/components/common/cron/Crontab.vue
@@ -98,7 +98,7 @@
           </tbody>
         </table>
       </div>
-      <crontab-result :ex="contabValueString"/>
+      <crontab-result :ex="contabValueString" ref="crontabResult"/>
 
       <div class="pop_btn">
         <el-button size="small" type="primary" @click="submitFill">确定</el-button>
@@ -305,7 +305,7 @@
       },
       // 填充表达式
       submitFill() {
-        this.$emit("fill", this.contabValueString);
+        this.$emit("fill", this.contabValueString, this.$refs.crontabResult.resultList);
         this.hidePopup();
       },
       clearCron() {
diff --git a/frontend/src/business/components/common/cron/CrontabResult.vue b/frontend/src/business/components/common/cron/CrontabResult.vue
index 3914771892..bd443d3c5c 100644
--- a/frontend/src/business/components/common/cron/CrontabResult.vue
+++ b/frontend/src/business/components/common/cron/CrontabResult.vue
@@ -10,6 +10,8 @@
 </template>
 
 <script>
+import {cronValidate} from "../../../../common/js/cron";
+
 export default {
   name: 'CrontabResult',
 	data() {
@@ -30,11 +32,11 @@ export default {
     this.expressionChange();
   },
 	methods: {
-		// 表达式值变化时，开始去计算结果
+		// 表达式值变化时，开始去计算  结果
 		expressionChange() {
 			// 计算开始-隐藏结果
 			this.isShow = false;
-      if (!this.ex) {
+      if (!cronValidate(this.ex)) {
         this.resultList = [];
         this.$emit("resultListChange", this.resultList);
         return;
diff --git a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue b/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
index 6a8ca5dcf1..a162694329 100644
--- a/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
+++ b/frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
@@ -24,7 +24,7 @@
             <el-button :disabled="isReadOnly" type="primary" plain @click="saveAndRun">{{$t('load_test.save_and_run')}}</el-button>
             <el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{$t('commons.cancel')}}</el-button>
 
-            <ms-schedule-config :schedule="testPlan.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule" :check-open="checkScheduleEdit"/>
+            <ms-schedule-config :schedule="testPlan.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule" :check-open="checkScheduleEdit" :custom-validate="durationValidate"/>
           </el-col>
         </el-row>
 
@@ -278,6 +278,18 @@
           return false;
         }
         return true;
+      },
+      durationValidate(intervalTime) {
+        let duration = this.$refs.pressureConfig.duration * 60 * 1000;
+        if (intervalTime < duration) {
+          return {
+            pass: false,
+            info: '间隔时间不能小于压测时长'
+          }
+        }
+        return {
+          pass: true
+        }
       }
     }
   }