fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明

fuzui

2021-11-30 f28a91969acd2c48423acc01973d4cf70e4f8d8c

fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明

 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>

@@ -84,10 +84,10 @@
                    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');
@@ -116,7 +116,7 @@
        // 最近工作日值变化时
        workdayChange() {
            if (this.radioValue == '5') {
                this.$emit('update', 'day', this.workday + 'W');
                this.$emit('update', 'day', this.workdayCheck + 'W');
            }
        },
        // checkbox值变化时
@@ -124,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',
@@ -145,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 () {

 ruoyi-ui/src/components/Crontab/hour.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="22" /> -

                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 1" :max="23" /> 小时

            </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="22" /> 小时开始，每

                <el-input-number v-model='average02' :min="1" :max="23 - average01 || 0" /> 小时执行一次

            </el-radio>

        </el-form-item>



@@ -56,10 +56,10 @@
            this.$emit('update', 'hour', '*')

            break;

                case 2:

                    this.$emit('update', 'hour', this.cycle01 + '-' + this.cycle02);

                    this.$emit('update', 'hour', this.cycleTotal);

                    break;

                case 3:

                    this.$emit('update', 'hour', this.average01 + '/' + this.average02);

                    this.$emit('update', 'hour', this.averageTotal);

                    break;

                case 4:

                    this.$emit('update', 'hour', this.checkboxString);

@@ -86,7 +86,7 @@
        }

    },

    watch: {

        "radioValue": "radioChange",

        'radioValue': 'radioChange',

        'cycleTotal': 'cycleChange',

        'averageTotal': 'averageChange',

        'checkboxString': 'checkboxChange'

@@ -94,15 +94,15 @@
    computed: {

        // 计算两个周期值

        cycleTotal: function () {

            this.cycle01 = this.checkNum(this.cycle01, 0, 23)

            this.cycle02 = this.checkNum(this.cycle02, 0, 23)

            return this.cycle01 + '-' + this.cycle02;

            const cycle01 = this.checkNum(this.cycle01, 0, 22)

            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 23)

            return cycle01 + '-' + cycle02;

        },

        // 计算平均用到的值

        averageTotal: function () {

            this.average01 = this.checkNum(this.average01, 0, 23)

            this.average02 = this.checkNum(this.average02, 1, 23)

            return this.average01 + '/' + this.average02;

            const average01 = this.checkNum(this.average01, 0, 22)

            const average02 = this.checkNum(this.average02, 1, 23 - average01 || 0)

            return average01 + '/' + average02;

        },

        // 计算勾选的checkbox值合集

        checkboxString: function () {


 ruoyi-ui/src/components/Crontab/min.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>



@@ -57,10 +57,10 @@
                    this.$emit('update', 'min', '*', 'min');

                    break;

                case 2:

                    this.$emit('update', 'min', this.cycle01 + '-' + this.cycle02, 'min');

                    this.$emit('update', 'min', this.cycleTotal, 'min');

                    break;

                case 3:

                    this.$emit('update', 'min', this.average01 + '/' + this.average02, 'min');

                    this.$emit('update', 'min', this.averageTotal, 'min');

                    break;

                case 4:

                    this.$emit('update', 'min', this.checkboxString, 'min');

@@ -88,7 +88,7 @@


    },

    watch: {

        "radioValue": "radioChange",

        'radioValue': 'radioChange',

        'cycleTotal': 'cycleChange',

        'averageTotal': 'averageChange',

        'checkboxString': 'checkboxChange',

@@ -96,15 +96,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 () {


 ruoyi-ui/src/components/Crontab/month.vue

@@ -9,16 +9,16 @@
        <el-form-item>
            <el-radio v-model='radioValue' :label="2">
                周期从
                <el-input-number v-model='cycle01' :min="1" :max="12" /> -
                <el-input-number v-model='cycle02' :min="1" :max="12" /> 月
                <el-input-number v-model='cycle01' :min="1" :max="11" /> -
                <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : 2" :max="12" /> 月
            </el-radio>
        </el-form-item>

        <el-form-item>
            <el-radio v-model='radioValue' :label="3">
                从
                <el-input-number v-model='average01' :min="1" :max="12" /> 月开始，每
                <el-input-number v-model='average02' :min="1" :max="12" /> 月月执行一次
                <el-input-number v-model='average01' :min="1" :max="11" /> 月开始，每
                <el-input-number v-model='average02' :min="1" :max="12 - average01 || 0" /> 月月执行一次
            </el-radio>
        </el-form-item>

@@ -56,10 +56,10 @@
                    this.$emit('update', 'month', '*');
                    break;
                case 2:
                    this.$emit('update', 'month', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'month', this.cycleTotal);
                    break;
                case 3:
                    this.$emit('update', 'month', this.average01 + '/' + this.average02);
                    this.$emit('update', 'month', this.averageTotal);
                    break;
                case 4:
                    this.$emit('update', 'month', this.checkboxString);
@@ -86,7 +86,7 @@
        }
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'checkboxString': 'checkboxChange'
@@ -94,15 +94,15 @@
    computed: {
        // 计算两个周期值
        cycleTotal: function () {
            this.cycle01 = this.checkNum(this.cycle01, 1, 12)
            this.cycle02 = this.checkNum(this.cycle02, 1, 12)
            return this.cycle01 + '-' + this.cycle02;
            const cycle01 = this.checkNum(this.cycle01, 1, 11)
            const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
            return cycle01 + '-' + cycle02;
        },
        // 计算平均用到的值
        averageTotal: function () {
            this.average01 = this.checkNum(this.average01, 1, 12)
            this.average02 = this.checkNum(this.average02, 1, 12)
            return this.average01 + '/' + this.average02;
            const average01 = this.checkNum(this.average01, 1, 11)
            const average02 = this.checkNum(this.average02, 1, 12 - average01 || 0)
            return average01 + '/' + average02;
        },
        // 计算勾选的checkbox值合集
        checkboxString: function () {

 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>

@@ -56,10 +56,10 @@
                    this.$emit('update', 'second', '*', '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);
@@ -83,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',
@@ -112,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 () {

 ruoyi-ui/src/components/Crontab/week.vue

@@ -2,7 +2,7 @@
    <el-form size='small'>
        <el-form-item>
            <el-radio v-model='radioValue' :label="1">
                周，允许的通配符[, - * / L #]
                周，允许的通配符[, - * ? / L #]
            </el-radio>
        </el-form-item>

@@ -128,13 +128,13 @@
                    this.$emit('update', 'week', '?');
                    break;
                case 3:
                    this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'week', this.cycleTotal);
                    break;
                case 4:
                    this.$emit('update', 'week', this.average02 + '#' + this.average01);
                    this.$emit('update', 'week', this.averageTotal);
                    break;
                case 5:
                    this.$emit('update', 'week', this.weekday + 'L');
                    this.$emit('update', 'week', this.weekdayCheck + 'L');
                    break;
                case 6:
                    this.$emit('update', 'week', this.checkboxString);
@@ -168,7 +168,7 @@
        },
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'weekdayCheck': 'weekdayChange',

 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>
@@ -67,10 +67,10 @@
                    this.$emit('update', 'year', '*');
                    break;
                case 3:
                    this.$emit('update', 'year', this.cycle01 + '-' + this.cycle02);
                    this.$emit('update', 'year', this.cycleTotal);
                    break;
                case 4:
                    this.$emit('update', 'year', this.average01 + '/' + this.average02);
                    this.$emit('update', 'year', this.averageTotal);
                    break;
                case 5:
                    this.$emit('update', 'year', this.checkboxString);
@@ -97,7 +97,7 @@
        }
    },
    watch: {
        "radioValue": "radioChange",
        'radioValue': 'radioChange',
        'cycleTotal': 'cycleChange',
        'averageTotal': 'averageChange',
        'checkboxString': 'checkboxChange'
@@ -105,15 +105,15 @@
    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 () {
@@ -124,6 +124,8 @@
    mounted: function () {
        // 仅获取当前年份
        this.fullYear = Number(new Date().getFullYear());
        this.cycle01 = this.fullYear
        this.average01 = this.fullYear
    }
}
</script>