From 44e8a012e2281978d6ca7c3675b0a80720c17947 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 16 十二月 2021 12:10:42 +0800
Subject: [PATCH] update 去除 jdk17 标签 由于很多组件还未适配 导致一些问题
---
ruoyi-ui/src/components/Crontab/day.vue | 66 ++++++++++++---------------------
1 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/day.vue b/ruoyi-ui/src/components/Crontab/day.vue
index bf9f566..fe3eaf0 100644
--- a/ruoyi-ui/src/components/Crontab/day.vue
+++ b/ruoyi-ui/src/components/Crontab/day.vue
@@ -2,7 +2,7 @@
<el-form size="small">
<el-form-item>
<el-radio v-model='radioValue' :label="1">
- 鏃ワ紝鍏佽鐨勯�氶厤绗, - * / L M]
+ 鏃ワ紝鍏佽鐨勯�氶厤绗, - * ? / L W]
</el-radio>
</el-form-item>
@@ -15,23 +15,23 @@
<el-form-item>
<el-radio v-model='radioValue' :label="3">
鍛ㄦ湡浠�
- <el-input-number v-model='cycle01' :min="0" :max="31" /> -
- <el-input-number v-model='cycle02' :min="0" :max="31" /> 鏃�
+ <el-input-number v-model='cycle01' :min="1" :max="30" /> -
+ <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="31" /> 鏃�
</el-radio>
</el-form-item>
<el-form-item>
<el-radio v-model='radioValue' :label="4">
浠�
- <el-input-number v-model='average01' :min="0" :max="31" /> 鍙峰紑濮嬶紝姣�
- <el-input-number v-model='average02' :min="0" :max="31" /> 鏃ユ墽琛屼竴娆�
+ <el-input-number v-model='average01' :min="1" :max="30" /> 鍙峰紑濮嬶紝姣�
+ <el-input-number v-model='average02' :min="1" :max="31 - average01 || 1" /> 鏃ユ墽琛屼竴娆�
</el-radio>
</el-form-item>
<el-form-item>
<el-radio v-model='radioValue' :label="5">
姣忔湀
- <el-input-number v-model='workday' :min="0" :max="31" /> 鍙锋渶杩戠殑閭ｄ釜宸ヤ綔鏃�
+ <el-input-number v-model='workday' :min="1" :max="31" /> 鍙锋渶杩戠殑閭ｄ釜宸ヤ綔鏃�
</el-radio>
</el-form-item>
@@ -72,31 +72,22 @@
// 鍗曢�夋寜閽�煎彉鍖栨椂
radioChange() {
('day rachange');
- if (this.radioValue === 1) {
- this.$emit('update', 'day', '*', 'day');
- this.$emit('update', 'week', '?', 'day');
- this.$emit('update', 'month', '*', 'day');
- } else {
- if (this.cron.hour === '*') {
- this.$emit('update', 'hour', '0', 'day');
- }
- if (this.cron.min === '*') {
- this.$emit('update', 'min', '0', 'day');
- }
- if (this.cron.second === '*') {
- this.$emit('update', 'second', '0', 'day');
- }
+ if (this.radioValue !== 2 && this.cron.week !== '?') {
+ this.$emit('update', 'week', '?', 'day')
}
switch (this.radioValue) {
+ case 1:
+ this.$emit('update', 'day', '*');
+ break;
case 2:
this.$emit('update', 'day', '?');
break;
case 3:
- this.$emit('update', 'day', this.cycle01 + '-' + this.cycle02);
+ this.$emit('update', 'day', this.cycleTotal);
break;
case 4:
- this.$emit('update', 'day', this.average01 + '/' + this.average02);
+ this.$emit('update', 'day', this.averageTotal);
break;
case 5:
this.$emit('update', 'day', this.workday + 'W');
@@ -125,7 +116,7 @@
// 鏈�杩戝伐浣滄棩鍊煎彉鍖栨椂
workdayChange() {
if (this.radioValue == '5') {
- this.$emit('update', 'day', this.workday + 'W');
+ this.$emit('update', 'day', this.workdayCheck + 'W');
}
},
// checkbox鍊煎彉鍖栨椂
@@ -133,19 +124,10 @@
if (this.radioValue == '7') {
this.$emit('update', 'day', this.checkboxString);
}
- },
- // 鐖剁粍浠朵紶閫掔殑week鍙戠敓鍙樺寲瑙﹀彂
- weekChange() {
- //鍒ゆ柇week鍊间笌day涓嶈兘鍚屾椂涓衡��?鈥�
- if (this.cron.week == '?' && this.radioValue == '2') {
- this.radioValue = '1';
- } else if (this.cron.week !== '?' && this.radioValue != '2') {
- this.radioValue = '2';
- }
- },
+ }
},
watch: {
- "radioValue": "radioChange",
+ 'radioValue': 'radioChange',
'cycleTotal': 'cycleChange',
'averageTotal': 'averageChange',
'workdayCheck': 'workdayChange',
@@ -154,20 +136,20 @@
computed: {
// 璁＄畻涓や釜鍛ㄦ湡鍊�
cycleTotal: function () {
- this.cycle01 = this.checkNum(this.cycle01, 1, 31)
- this.cycle02 = this.checkNum(this.cycle02, 1, 31)
- return this.cycle01 + '-' + this.cycle02;
+ const cycle01 = this.checkNum(this.cycle01, 1, 30)
+ const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 31, 31)
+ return cycle01 + '-' + cycle02;
},
// 璁＄畻骞冲潎鐢ㄥ埌鐨勫��
averageTotal: function () {
- this.average01 = this.checkNum(this.average01, 1, 31)
- this.average02 = this.checkNum(this.average02, 1, 31)
- return this.average01 + '/' + this.average02;
+ const average01 = this.checkNum(this.average01, 1, 30)
+ const average02 = this.checkNum(this.average02, 1, 31 - average01 || 0)
+ return average01 + '/' + average02;
},
// 璁＄畻宸ヤ綔鏃ユ牸寮�
workdayCheck: function () {
- this.workday = this.checkNum(this.workday, 1, 31)
- return this.workday;
+ const workday = this.checkNum(this.workday, 1, 31)
+ return workday;
},
// 璁＄畻鍕鹃�夌殑checkbox鍊煎悎闆�
checkboxString: function () {
--
Gitblit v1.9.3