From 661e8cf7b40d79d2024969e56f04100b31abef1a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 11 Feb 2026 15:38:13 +0800
Subject: [PATCH] 优化字典类型属性提醒说明
---
ruoyi-ui/src/components/Crontab/year.vue | 71 ++++++++++++++---------------------
1 files changed, 29 insertions(+), 42 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/year.vue b/ruoyi-ui/src/components/Crontab/year.vue
index 800dfa5..8c18c78 100644
--- a/ruoyi-ui/src/components/Crontab/year.vue
+++ b/ruoyi-ui/src/components/Crontab/year.vue
@@ -15,16 +15,16 @@
<el-form-item>
<el-radio :label="3" v-model='radioValue'>
周期从
- <el-input-number v-model='cycle01' :min='fullYear' /> -
- <el-input-number v-model='cycle02' :min='fullYear' />
+ <el-input-number v-model='cycle01' :min='fullYear' :max="2098" /> -
+ <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099" />
</el-radio>
</el-form-item>
<el-form-item>
<el-radio :label="4" v-model='radioValue'>
从
- <el-input-number v-model='average01' :min='fullYear' /> 年开始，每
- <el-input-number v-model='average02' :min='fullYear' /> 年执行一次
+ <el-input-number v-model='average01' :min='fullYear' :max="2098"/> 年开始，每
+ <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear" /> 年执行一次
</el-radio>
</el-form-item>
@@ -59,60 +59,45 @@
methods: {
// 单选按钮值变化时
radioChange() {
- if (this.cron.month === '*') {
- this.$emit('update', 'month', '0', 'year');
- }
- if (this.cron.day === '*') {
- this.$emit('update', 'day', '0', 'year');
- }
- if (this.cron.hour === '*') {
- this.$emit('update', 'hour', '0', 'year');
- }
- if (this.cron.min === '*') {
- this.$emit('update', 'min', '0', 'year');
- }
- if (this.cron.second === '*') {
- this.$emit('update', 'second', '0', 'year');
- }
switch (this.radioValue) {
case 1:
- this.$emit('update', 'year', '');
- break;
+ this.$emit('update', 'year', '')
+ break
case 2:
- this.$emit('update', 'year', '*');
- break;
+ this.$emit('update', 'year', '*')
+ break
case 3:
- this.$emit('update', 'year', this.cycle01 + '-' + this.cycle02);
- break;
+ this.$emit('update', 'year', this.cycleTotal)
+ break
case 4:
- this.$emit('update', 'year', this.average01 + '/' + this.average02);
- break;
+ this.$emit('update', 'year', this.averageTotal)
+ break
case 5:
- this.$emit('update', 'year', this.checkboxString);
- break;
+ this.$emit('update', 'year', this.checkboxString)
+ break
}
},
// 周期两个值变化时
cycleChange() {
if (this.radioValue == '3') {
- this.$emit('update', 'year', this.cycleTotal);
+ this.$emit('update', 'year', this.cycleTotal)
}
},
// 平均两个值变化时
averageChange() {
if (this.radioValue == '4') {
- this.$emit('update', 'year', this.averageTotal);
+ this.$emit('update', 'year', this.averageTotal)
}
},
// checkbox值变化时
checkboxChange() {
if (this.radioValue == '5') {
- this.$emit('update', 'year', this.checkboxString);
+ this.$emit('update', 'year', this.checkboxString)
}
}
},
watch: {
- "radioValue": "radioChange",
+ 'radioValue': 'radioChange',
'cycleTotal': 'cycleChange',
'averageTotal': 'averageChange',
'checkboxString': 'checkboxChange'
@@ -120,25 +105,27 @@
computed: {
// 计算两个周期值
cycleTotal: function () {
- this.cycle01 = this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100)
- this.cycle02 = this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101)
- return this.cycle01 + '-' + this.cycle02;
+ const cycle01 = this.checkNum(this.cycle01, this.fullYear, 2098)
+ const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
+ return cycle01 + '-' + cycle02
},
// 计算平均用到的值
averageTotal: function () {
- this.average01 = this.checkNum(this.average01, this.fullYear, this.fullYear + 100)
- this.average02 = this.checkNum(this.average02, 1, 10)
- return this.average01 + '/' + this.average02;
+ const average01 = this.checkNum(this.average01, this.fullYear, 2098)
+ const average02 = this.checkNum(this.average02, 1, 2099 - average01 || this.fullYear)
+ return average01 + '/' + average02
},
// 计算勾选的checkbox值合集
checkboxString: function () {
- let str = this.checkboxList.join();
- return str;
+ let str = this.checkboxList.join()
+ return str
}
},
mounted: function () {
// 仅获取当前年份
- this.fullYear = Number(new Date().getFullYear());
+ this.fullYear = Number(new Date().getFullYear())
+ this.cycle01 = this.fullYear
+ this.average01 = this.fullYear
}
}
</script>
--
Gitblit v1.9.3