From bf4ac3ad7a20fadd5aaa92ea0b6abde452c232ee Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 30 十一月 2021 11:03:08 +0800
Subject: [PATCH] !378 fix: crontab组件bug Merge pull request !378 from fuzui/fix_cron_tool
---
ruoyi-ui/src/components/Crontab/second.vue | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/second.vue b/ruoyi-ui/src/components/Crontab/second.vue
index 0fdf338..e7b7761 100644
--- a/ruoyi-ui/src/components/Crontab/second.vue
+++ b/ruoyi-ui/src/components/Crontab/second.vue
@@ -9,16 +9,16 @@
<el-form-item>
<el-radio v-model='radioValue' :label="2">
周期从
- <el-input-number v-model='cycle01' :min="0" :max="60" /> -
- <el-input-number v-model='cycle02' :min="0" :max="60" /> 秒
+ <el-input-number v-model='cycle01' :min="0" :max="58" /> -
+ <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="59" /> 秒
</el-radio>
</el-form-item>
<el-form-item>
<el-radio v-model='radioValue' :label="3">
从
- <el-input-number v-model='average01' :min="0" :max="60" /> 秒开始，每
- <el-input-number v-model='average02' :min="0" :max="60" /> 秒执行一次
+ <el-input-number v-model='average01' :min="0" :max="58" /> 秒开始，每
+ <el-input-number v-model='average02' :min="1" :max="59 - average01 || 0" /> 秒执行一次
</el-radio>
</el-form-item>
@@ -54,13 +54,12 @@
switch (this.radioValue) {
case 1:
this.$emit('update', 'second', '*', 'second');
- this.$emit('update', 'min', '*', 'second');
break;
case 2:
- this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02);
+ this.$emit('update', 'second', this.cycleTotal);
break;
case 3:
- this.$emit('update', 'second', this.average01 + '/' + this.average02);
+ this.$emit('update', 'second', this.averageTotal);
break;
case 4:
this.$emit('update', 'second', this.checkboxString);
@@ -84,25 +83,10 @@
if (this.radioValue == '4') {
this.$emit('update', 'second', this.checkboxString);
}
- },
- othChange() {
- // 反解析
- let ins = this.cron.second
- ('反解析 second', ins);
- if (ins === '*') {
- this.radioValue = 1;
- } else if (ins.indexOf('-') > -1) {
- this.radioValue = 2
- } else if (ins.indexOf('/') > -1) {
- this.radioValue = 3
- } else {
- this.radioValue = 4
- this.checkboxList = ins.split(',')
- }
}
},
watch: {
- "radioValue": "radioChange",
+ 'radioValue': 'radioChange',
'cycleTotal': 'cycleChange',
'averageTotal': 'averageChange',
'checkboxString': 'checkboxChange',
@@ -113,15 +97,15 @@
computed: {
// 计算两个周期值
cycleTotal: function () {
- this.cycle01 = this.checkNum(this.cycle01, 0, 59)
- this.cycle02 = this.checkNum(this.cycle02, 0, 59)
- return this.cycle01 + '-' + this.cycle02;
+ const cycle01 = this.checkNum(this.cycle01, 0, 58)
+ const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
+ return cycle01 + '-' + cycle02;
},
// 计算平均用到的值
averageTotal: function () {
- this.average01 = this.checkNum(this.average01, 0, 59)
- this.average02 = this.checkNum(this.average02, 1, 59)
- return this.average01 + '/' + this.average02;
+ const average01 = this.checkNum(this.average01, 0, 58)
+ const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
+ return average01 + '/' + average02;
},
// 计算勾选的checkbox值合集
checkboxString: function () {
--
Gitblit v1.9.2