Pre Merge pull request !352 from muyi/master

This commit is contained in:
muyi 2021-11-24 00:39:46 +00:00 committed by Gitee
commit ec7376b6ee
10 changed files with 1246 additions and 1211 deletions

View File

@ -1,179 +1,184 @@
<template> <template>
<el-form size="small"> <el-form size="small">
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
允许的通配符[, - * / L M] 允许的通配符[, - * / L M]
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
不指定 不指定
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="3"> <el-radio v-model='radioValue' :label="3">
周期从 周期从
<el-input-number v-model='cycle01' :min="0" :max="31" /> - <el-input-number v-model='cycle01' :min="0" :max="31"/>
<el-input-number v-model='cycle02' :min="0" :max="31" /> -
</el-radio> <el-input-number v-model='cycle02' :min="0" :max="31"/>
</el-form-item>
</el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="4"> <el-radio v-model='radioValue' :label="4">
<el-input-number v-model='average01' :min="0" :max="31" /> 号开始 <el-input-number v-model='average01' :min="0" :max="31"/>
<el-input-number v-model='average02' :min="0" :max="31" /> 日执行一次 号开始
</el-radio> <el-input-number v-model='average02' :min="0" :max="31"/>
</el-form-item> 日执行一次
</el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="5"> <el-radio v-model='radioValue' :label="5">
每月 每月
<el-input-number v-model='workday' :min="0" :max="31" /> 号最近的那个工作日 <el-input-number v-model='workday' :min="0" :max="31"/>
</el-radio> 号最近的那个工作日
</el-form-item> </el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="6"> <el-radio v-model='radioValue' :label="6">
本月最后一天 本月最后一天
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="7"> <el-radio v-model='radioValue' :label="7">
指定 指定
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"> <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"
<el-option v-for="item in 31" :key="item" :value="item">{{item}}</el-option> @change="selectChange">
</el-select> <el-option v-for="item in 31" :key="item" :value="item">{{ item }}</el-option>
</el-radio> </el-select>
</el-form-item> </el-radio>
</el-form> </el-form-item>
</el-form>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
radioValue: 1, radioValue: 1,
workday: 1, workday: 1,
cycle01: 1, cycle01: 1,
cycle02: 2, cycle02: 2,
average01: 1, average01: 1,
average02: 1, average02: 1,
checkboxList: [], checkboxList: [],
checkNum: this.$options.propsData.check checkNum: this.$options.propsData.check
} }
}, },
name: 'crontab-day', name: 'crontab-day',
props: ['check', 'cron'], props: ['check', 'cron'],
methods: { methods: {
// selectChange() {
radioChange() { this.radioValue = 7
('day rachange'); },
if (this.radioValue === 1) { init() {
this.$emit('update', 'day', '*', 'day'); this.workday = 1
this.$emit('update', 'week', '?', 'day'); this.cycle01 = 1
this.$emit('update', 'month', '*', 'day'); this.cycle02 = 2
} else { this.average01 = 1
if (this.cron.hour === '*') { this.average02 = 1
this.$emit('update', 'hour', '0', 'day'); this.checkboxList = []
} },
if (this.cron.min === '*') { //
this.$emit('update', 'min', '0', 'day'); radioChange() {
} ('day rachange');
if (this.cron.second === '*') { if (this.radioValue === 1) {
this.$emit('update', 'second', '0', 'day'); this.$emit('update', 'day', '*', 'day');
} }
}
switch (this.radioValue) { switch (this.radioValue) {
case 2: case 2:
this.$emit('update', 'day', '?'); this.$emit('update', 'day', '?');
break; break;
case 3: case 3:
this.$emit('update', 'day', this.cycle01 + '-' + this.cycle02); this.$emit('update', 'day', this.cycle01 + '-' + this.cycle02);
break; break;
case 4: case 4:
this.$emit('update', 'day', this.average01 + '/' + this.average02); this.$emit('update', 'day', this.average01 + '/' + this.average02);
break; break;
case 5: case 5:
this.$emit('update', 'day', this.workday + 'W'); this.$emit('update', 'day', this.workday + 'W');
break; break;
case 6: case 6:
this.$emit('update', 'day', 'L'); this.$emit('update', 'day', 'L');
break; break;
case 7: case 7:
this.$emit('update', 'day', this.checkboxString); this.$emit('update', 'day', this.checkboxString);
break; break;
} }
('day rachange end'); ('day rachange end');
}, },
// //
cycleChange() { cycleChange() {
if (this.radioValue == '3') { if (this.radioValue == '3') {
this.$emit('update', 'day', this.cycleTotal); this.$emit('update', 'day', this.cycleTotal);
} }
}, },
// //
averageChange() { averageChange() {
if (this.radioValue == '4') { if (this.radioValue == '4') {
this.$emit('update', 'day', this.averageTotal); this.$emit('update', 'day', this.averageTotal);
} }
}, },
// //
workdayChange() { workdayChange() {
if (this.radioValue == '5') { if (this.radioValue == '5') {
this.$emit('update', 'day', this.workday + 'W'); this.$emit('update', 'day', this.workday + 'W');
} }
}, },
// checkbox // checkbox
checkboxChange() { checkboxChange() {
if (this.radioValue == '7') { if (this.radioValue == '7') {
this.$emit('update', 'day', this.checkboxString); this.$emit('update', 'day', this.checkboxString);
} }
}, },
// week // week
weekChange() { weekChange() {
//weekday? //weekday?
if (this.cron.week == '?' && this.radioValue == '2') { if (this.cron.week == '?' && this.radioValue == '2') {
this.radioValue = '1'; this.radioValue = '1';
} else if (this.cron.week !== '?' && this.radioValue != '2') { } else if (this.cron.week !== '?' && this.radioValue != '2') {
this.radioValue = '2'; this.radioValue = '2';
} }
}, },
}, },
watch: { watch: {
"radioValue": "radioChange", "radioValue": "radioChange",
'cycleTotal': 'cycleChange', 'cycleTotal': 'cycleChange',
'averageTotal': 'averageChange', 'averageTotal': 'averageChange',
'workdayCheck': 'workdayChange', 'workdayCheck': 'workdayChange',
'checkboxString': 'checkboxChange', 'checkboxString': 'checkboxChange',
}, },
computed: { computed: {
// //
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 1, 31) this.cycle01 = this.checkNum(this.cycle01, 1, 31)
this.cycle02 = this.checkNum(this.cycle02, 1, 31) this.cycle02 = this.checkNum(this.cycle02, 1, 31)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// //
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 1, 31) this.average01 = this.checkNum(this.average01, 1, 31)
this.average02 = this.checkNum(this.average02, 1, 31) this.average02 = this.checkNum(this.average02, 1, 31)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// //
workdayCheck: function () { workdayCheck: function () {
this.workday = this.checkNum(this.workday, 1, 31) this.workday = this.checkNum(this.workday, 1, 31)
return this.workday; return this.workday;
}, },
// checkbox // checkbox
checkboxString: function () { checkboxString: function () {
let str = this.checkboxList.join(); let str = this.checkboxList.join();
return str == '' ? '*' : str; return str == '' ? '*' : str;
} }
} }
} }
</script> </script>

View File

@ -1,122 +1,129 @@
<template> <template>
<el-form size="small"> <el-form size="small">
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
小时允许的通配符[, - * /] 小时允许的通配符[, - * /]
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
周期从 周期从
<el-input-number v-model='cycle01' :min="0" :max="60" /> - <el-input-number v-model='cycle01' :min="0" :max="60"/>
<el-input-number v-model='cycle02' :min="0" :max="60" /> 小时 -
</el-radio> <el-input-number v-model='cycle02' :min="0" :max="60"/>
</el-form-item> 小时
</el-radio>
<el-form-item> </el-form-item>
<el-radio v-model='radioValue' :label="3">
<el-form-item>
<el-input-number v-model='average01' :min="0" :max="60" /> 小时开始 <el-radio v-model='radioValue' :label="3">
<el-input-number v-model='average02' :min="0" :max="60" /> 小时执行一次
</el-radio> <el-input-number v-model='average01' :min="0" :max="60"/>
</el-form-item> 小时开始
<el-input-number v-model='average02' :min="0" :max="60"/>
<el-form-item> 小时执行一次
<el-radio v-model='radioValue' :label="4"> </el-radio>
指定 </el-form-item>
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option> <el-form-item>
</el-select> <el-radio v-model='radioValue' :label="4">
</el-radio> 指定
</el-form-item> <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"
</el-form> @change="selectChange">
</template> <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
</el-select>
<script> </el-radio>
export default { </el-form-item>
data() { </el-form>
return { </template>
radioValue: 1,
cycle01: 0, <script>
cycle02: 1, export default {
average01: 0, data() {
average02: 1, return {
checkboxList: [], radioValue: 1,
checkNum: this.$options.propsData.check cycle01: 0,
} cycle02: 1,
}, average01: 0,
name: 'crontab-hour', average02: 1,
props: ['check', 'cron'], checkboxList: [],
methods: { checkNum: this.$options.propsData.check
// }
radioChange() { },
if (this.radioValue === 1) { name: 'crontab-hour',
this.$emit('update', 'hour', '*', 'hour'); props: ['check', 'cron'],
this.$emit('update', 'day', '*', 'hour'); methods: {
} else { selectChange() {
if (this.cron.min === '*') { this.radioValue = 4
this.$emit('update', 'min', '0', 'hour'); },
} init() {
if (this.cron.second === '*') { this.cycle01 = 0
this.$emit('update', 'second', '0', 'hour'); this.cycle02 = 1
} this.average01 = 0
} this.average02 = 1
switch (this.radioValue) { this.checkboxList = []
case 2: },
this.$emit('update', 'hour', this.cycle01 + '-' + this.cycle02); //
break; radioChange() {
case 3: if (this.radioValue === 1) {
this.$emit('update', 'hour', this.average01 + '/' + this.average02); this.$emit('update', 'hour', '*', 'hour');
break; }
case 4: switch (this.radioValue) {
this.$emit('update', 'hour', this.checkboxString); case 2:
break; this.$emit('update', 'hour', this.cycle01 + '-' + this.cycle02);
} break;
}, case 3:
// this.$emit('update', 'hour', this.average01 + '/' + this.average02);
cycleChange() { break;
if (this.radioValue == '2') { case 4:
this.$emit('update', 'hour', this.cycleTotal); this.$emit('update', 'hour', this.checkboxString);
} break;
}, }
// },
averageChange() { //
if (this.radioValue == '3') { cycleChange() {
this.$emit('update', 'hour', this.averageTotal); if (this.radioValue == '2') {
} this.$emit('update', 'hour', this.cycleTotal);
}, }
// checkbox },
checkboxChange() { //
if (this.radioValue == '4') { averageChange() {
this.$emit('update', 'hour', this.checkboxString); if (this.radioValue == '3') {
} this.$emit('update', 'hour', this.averageTotal);
} }
}, },
watch: { // checkbox
"radioValue": "radioChange", checkboxChange() {
'cycleTotal': 'cycleChange', if (this.radioValue == '4') {
'averageTotal': 'averageChange', this.$emit('update', 'hour', this.checkboxString);
'checkboxString': 'checkboxChange' }
}, }
computed: { },
// watch: {
cycleTotal: function () { "radioValue": "radioChange",
this.cycle01 = this.checkNum(this.cycle01, 0, 23) 'cycleTotal': 'cycleChange',
this.cycle02 = this.checkNum(this.cycle02, 0, 23) 'averageTotal': 'averageChange',
return this.cycle01 + '-' + this.cycle02; 'checkboxString': 'checkboxChange'
}, },
// computed: {
averageTotal: function () { //
this.average01 = this.checkNum(this.average01, 0, 23) cycleTotal: function () {
this.average02 = this.checkNum(this.average02, 1, 23) this.cycle01 = this.checkNum(this.cycle01, 0, 23)
return this.average01 + '/' + this.average02; this.cycle02 = this.checkNum(this.cycle02, 0, 23)
}, return this.cycle01 + '-' + this.cycle02;
// checkbox },
checkboxString: function () { //
let str = this.checkboxList.join(); averageTotal: function () {
return str == '' ? '*' : str; this.average01 = this.checkNum(this.average01, 0, 23)
} this.average02 = this.checkNum(this.average02, 1, 23)
} return this.average01 + '/' + this.average02;
} },
</script> // checkbox
checkboxString: function () {
let str = this.checkboxList.join();
return str == '' ? '*' : str;
}
}
}
</script>

View File

@ -1,110 +1,110 @@
<template> <template>
<div> <div>
<el-tabs type="border-card"> <el-tabs type="border-card">
<el-tab-pane label="秒" v-if="shouldHide('second')"> <el-tab-pane label="秒" v-if="shouldHide('second')">
<CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond" /> <CrontabSecond @update="updateCrontabValue" :check="checkNumber" ref="cronsecond"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分钟" v-if="shouldHide('min')"> <el-tab-pane label="分钟" v-if="shouldHide('min')">
<CrontabMin <CrontabMin
@update="updateCrontabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="crontabValueObj" :cron="crontabValueObj"
ref="cronmin" ref="cronmin"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="小时" v-if="shouldHide('hour')"> <el-tab-pane label="小时" v-if="shouldHide('hour')">
<CrontabHour <CrontabHour
@update="updateCrontabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="crontabValueObj" :cron="crontabValueObj"
ref="cronhour" ref="cronhour"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="日" v-if="shouldHide('day')"> <el-tab-pane label="日" v-if="shouldHide('day')">
<CrontabDay <CrontabDay
@update="updateCrontabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="crontabValueObj" :cron="crontabValueObj"
ref="cronday" ref="cronday"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="月" v-if="shouldHide('month')"> <el-tab-pane label="月" v-if="shouldHide('month')">
<CrontabMonth <CrontabMonth
@update="updateCrontabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="crontabValueObj" :cron="crontabValueObj"
ref="cronmonth" ref="cronmonth"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="周" v-if="shouldHide('week')"> <el-tab-pane label="周" v-if="shouldHide('week')">
<CrontabWeek <CrontabWeek
@update="updateCrontabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="crontabValueObj" :cron="crontabValueObj"
ref="cronweek" ref="cronweek"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="年" v-if="shouldHide('year')"> <el-tab-pane label="年" v-if="shouldHide('year')">
<CrontabYear <CrontabYear
@update="updateCrontabValue" @update="updateCrontabValue"
:check="checkNumber" :check="checkNumber"
:cron="crontabValueObj" :cron="crontabValueObj"
ref="cronyear" ref="cronyear"
/> />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="popup-main"> <div class="popup-main">
<div class="popup-result"> <div class="popup-result">
<p class="title">时间表达式</p> <p class="title">时间表达式</p>
<table> <table>
<thead> <thead>
<th v-for="item of tabTitles" width="40" :key="item">{{item}}</th> <th v-for="item of tabTitles" width="40" :key="item">{{ item }}</th>
<th>Cron 表达式</th> <th>Cron 表达式</th>
</thead> </thead>
<tbody> <tbody>
<td> <td>
<span>{{crontabValueObj.second}}</span> <span>{{ crontabValueObj.second }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueObj.min}}</span> <span>{{ crontabValueObj.min }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueObj.hour}}</span> <span>{{ crontabValueObj.hour }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueObj.day}}</span> <span>{{ crontabValueObj.day }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueObj.month}}</span> <span>{{ crontabValueObj.month }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueObj.week}}</span> <span>{{ crontabValueObj.week }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueObj.year}}</span> <span>{{ crontabValueObj.year }}</span>
</td> </td>
<td> <td>
<span>{{crontabValueString}}</span> <span>{{ crontabValueString }}</span>
</td> </td>
</tbody> </tbody>
</table> </table>
</div> </div>
<CrontabResult :ex="crontabValueString"></CrontabResult> <CrontabResult :ex="crontabValueString"></CrontabResult>
<div class="pop_btn"> <div class="pop_btn">
<el-button size="small" type="primary" @click="submitFill">确定</el-button> <el-button size="small" type="primary" @click="submitFill">确定</el-button>
<el-button size="small" type="warning" @click="clearCron">重置</el-button> <el-button size="small" type="warning" @click="clearCron">重置</el-button>
<el-button size="small" @click="hidePopup">取消</el-button> <el-button size="small" @click="hidePopup">取消</el-button>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
@ -118,308 +118,315 @@ import CrontabYear from "./year.vue";
import CrontabResult from "./result.vue"; import CrontabResult from "./result.vue";
export default { export default {
data() { data() {
return { return {
tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"], tabTitles: ["秒", "分钟", "小时", "日", "月", "周", "年"],
tabActive: 0, tabActive: 0,
myindex: 0, myindex: 0,
crontabValueObj: { crontabValueObj: {
second: "*", second: "*",
min: "*", min: "*",
hour: "*", hour: "*",
day: "*", day: "*",
month: "*", month: "*",
week: "?", week: "?",
year: "", year: "",
}, },
}; };
}, },
name: "vcrontab", name: "vcrontab",
props: ["expression", "hideComponent"], props: ["expression", "hideComponent"],
methods: { methods: {
shouldHide(key) { shouldHide(key) {
if (this.hideComponent && this.hideComponent.includes(key)) return false; if (this.hideComponent && this.hideComponent.includes(key)) return false;
return true; return true;
}, },
resolveExp() { resolveExp() {
// //
if (this.expression) { if (this.expression) {
let arr = this.expression.split(" "); let arr = this.expression.split(" ");
if (arr.length >= 6) { if (arr.length >= 6) {
//6 //6
let obj = { let obj = {
second: arr[0], second: arr[0],
min: arr[1], min: arr[1],
hour: arr[2], hour: arr[2],
day: arr[3], day: arr[3],
month: arr[4], month: arr[4],
week: arr[5], week: arr[5],
year: arr[6] ? arr[6] : "", year: arr[6] ? arr[6] : "",
}; };
this.crontabValueObj = { this.crontabValueObj = {
...obj, ...obj,
}; };
for (let i in obj) { for (let i in obj) {
if (obj[i]) this.changeRadio(i, obj[i]); if (obj[i]) this.changeRadio(i, obj[i]);
} }
} }
} else { } else {
// //
this.clearCron(); this.clearCron();
} }
}, },
// tab // tab
tabCheck(index) { tabCheck(index) {
this.tabActive = index; this.tabActive = index;
}, },
// //
updateCrontabValue(name, value, from) { updateCrontabValue(name, value, from) {
"updateCrontabValue", name, value, from; "updateCrontabValue", name, value, from;
this.crontabValueObj[name] = value; this.crontabValueObj[name] = value;
if (from && from !== name) { if (from && from !== name) {
console.log(`来自组件 ${from} 改变了 ${name} ${value}`); console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
this.changeRadio(name, value); this.changeRadio(name, value);
} }
}, },
// //
changeRadio(name, value) { changeRadio(name, value) {
let arr = ["second", "min", "hour", "month"], let arr = ["second", "min", "hour", "month"],
refName = "cron" + name, refName = "cron" + name,
insValue; insValue;
if (!this.$refs[refName]) return; if (!this.$refs[refName]) return;
this.$refs[refName].init()
if (arr.includes(name)) { if (arr.includes(name)) {
if (value === "*") { if (value === "*") {
insValue = 1; insValue = 1;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
let indexArr = value.split("-"); let indexArr = value.split("-");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0) ? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]); : (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1]; this.$refs[refName].cycle02 = indexArr[1];
insValue = 2; insValue = 2;
} else if (value.indexOf("/") > -1) { } else if (value.indexOf("/") > -1) {
let indexArr = value.split("/"); let indexArr = value.split("/");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].average01 = 0) ? (this.$refs[refName].average01 = 0)
: (this.$refs[refName].average01 = indexArr[0]); : (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1]; this.$refs[refName].average02 = indexArr[1];
insValue = 3; insValue = 3;
} else { } else {
insValue = 4; insValue = 4;
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
} }
} else if (name == "day") { } else if (name == "day") {
if (value === "*") { if (value === "*") {
insValue = 1; insValue = 1;
} else if (value == "?") { } else if (value == "?") {
insValue = 2; insValue = 2;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
let indexArr = value.split("-"); let indexArr = value.split("-");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0) ? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]); : (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1]; this.$refs[refName].cycle02 = indexArr[1];
insValue = 3; insValue = 3;
} else if (value.indexOf("/") > -1) { } else if (value.indexOf("/") > -1) {
let indexArr = value.split("/"); let indexArr = value.split("/");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].average01 = 0) ? (this.$refs[refName].average01 = 0)
: (this.$refs[refName].average01 = indexArr[0]); : (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1]; this.$refs[refName].average02 = indexArr[1];
insValue = 4; insValue = 4;
} else if (value.indexOf("W") > -1) { } else if (value.indexOf("W") > -1) {
let indexArr = value.split("W"); let indexArr = value.split("W");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].workday = 0) ? (this.$refs[refName].workday = 0)
: (this.$refs[refName].workday = indexArr[0]); : (this.$refs[refName].workday = indexArr[0]);
insValue = 5; insValue = 5;
} else if (value === "L") { } else if (value === "L") {
insValue = 6; insValue = 6;
} else { } else {
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
insValue = 7; insValue = 7;
} }
} else if (name == "week") { } else if (name == "week") {
if (value === "*") { if (value === "*") {
insValue = 1; insValue = 1;
} else if (value == "?") { } else if (value == "?") {
insValue = 2; insValue = 2;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
let indexArr = value.split("-"); let indexArr = value.split("-");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].cycle01 = 0) ? (this.$refs[refName].cycle01 = 0)
: (this.$refs[refName].cycle01 = indexArr[0]); : (this.$refs[refName].cycle01 = indexArr[0]);
this.$refs[refName].cycle02 = indexArr[1]; this.$refs[refName].cycle02 = indexArr[1];
insValue = 3; insValue = 3;
} else if (value.indexOf("#") > -1) { } else if (value.indexOf("#") > -1) {
let indexArr = value.split("#"); let indexArr = value.split("#");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].average01 = 1) ? (this.$refs[refName].average01 = 1)
: (this.$refs[refName].average01 = indexArr[0]); : (this.$refs[refName].average01 = indexArr[0]);
this.$refs[refName].average02 = indexArr[1]; this.$refs[refName].average02 = indexArr[1];
insValue = 4; insValue = 4;
} else if (value.indexOf("L") > -1) { } else if (value.indexOf("L") > -1) {
let indexArr = value.split("L"); let indexArr = value.split("L");
isNaN(indexArr[0]) isNaN(indexArr[0])
? (this.$refs[refName].weekday = 1) ? (this.$refs[refName].weekday = 1)
: (this.$refs[refName].weekday = indexArr[0]); : (this.$refs[refName].weekday = indexArr[0]);
insValue = 5; insValue = 5;
} else { } else {
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
insValue = 7; insValue = 7;
} }
} else if (name == "year") { } else if (name == "year") {
if (value == "") { if (value == "") {
insValue = 1; insValue = 1;
} else if (value == "*") { } else if (value == "*") {
insValue = 2; insValue = 2;
} else if (value.indexOf("-") > -1) { } else if (value.indexOf("-") > -1) {
insValue = 3; insValue = 3;
} else if (value.indexOf("/") > -1) { } else if (value.indexOf("/") > -1) {
insValue = 4; insValue = 4;
} else { } else {
this.$refs[refName].checkboxList = value.split(","); this.$refs[refName].checkboxList = value.split(",");
insValue = 5; insValue = 5;
} }
} }
this.$refs[refName].radioValue = insValue; this.$refs[refName].radioValue = insValue;
}, },
// -props // -props
checkNumber(value, minLimit, maxLimit) { checkNumber(value, minLimit, maxLimit) {
// //
value = Math.floor(value); value = Math.floor(value);
if (value < minLimit) { if (value < minLimit) {
value = minLimit; value = minLimit;
} else if (value > maxLimit) { } else if (value > maxLimit) {
value = maxLimit; value = maxLimit;
} }
return value; return value;
}, },
// //
hidePopup() { hidePopup() {
this.$emit("hide"); this.$emit("hide");
}, },
// //
submitFill() { submitFill() {
this.$emit("fill", this.crontabValueString); this.$emit("fill", this.crontabValueString);
this.hidePopup(); this.hidePopup();
}, },
clearCron() { clearCron() {
// //
("准备还原"); ("准备还原");
this.crontabValueObj = { this.crontabValueObj = {
second: "*", second: "*",
min: "*", min: "*",
hour: "*", hour: "*",
day: "*", day: "*",
month: "*", month: "*",
week: "?", week: "?",
year: "", year: "",
}; };
for (let j in this.crontabValueObj) { for (let j in this.crontabValueObj) {
this.changeRadio(j, this.crontabValueObj[j]); this.changeRadio(j, this.crontabValueObj[j]);
} }
}, },
}, },
computed: { computed: {
crontabValueString: function() { crontabValueString: function () {
let obj = this.crontabValueObj; let obj = this.crontabValueObj;
let str = let str =
obj.second + obj.second +
" " + " " +
obj.min + obj.min +
" " + " " +
obj.hour + obj.hour +
" " + " " +
obj.day + obj.day +
" " + " " +
obj.month + obj.month +
" " + " " +
obj.week + obj.week +
(obj.year == "" ? "" : " " + obj.year); (obj.year == "" ? "" : " " + obj.year);
return str; return str;
}, },
}, },
components: { components: {
CrontabSecond, CrontabSecond,
CrontabMin, CrontabMin,
CrontabHour, CrontabHour,
CrontabDay, CrontabDay,
CrontabMonth, CrontabMonth,
CrontabWeek, CrontabWeek,
CrontabYear, CrontabYear,
CrontabResult, CrontabResult,
}, },
watch: { watch: {
expression: "resolveExp", expression: "resolveExp",
hideComponent(value) { hideComponent(value) {
// //
}, },
}, },
mounted: function() { mounted: function () {
this.resolveExp(); this.resolveExp();
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.pop_btn { .pop_btn {
text-align: center; text-align: center;
margin-top: 20px; margin-top: 20px;
} }
.popup-main { .popup-main {
position: relative; position: relative;
margin: 10px auto; margin: 10px auto;
background: #fff; background: #fff;
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 12px;
overflow: hidden; overflow: hidden;
} }
.popup-title { .popup-title {
overflow: hidden; overflow: hidden;
line-height: 34px; line-height: 34px;
padding-top: 6px; padding-top: 6px;
background: #f2f2f2; background: #f2f2f2;
} }
.popup-result { .popup-result {
box-sizing: border-box; box-sizing: border-box;
line-height: 24px; line-height: 24px;
margin: 25px auto; margin: 25px auto;
padding: 15px 10px 10px; padding: 15px 10px 10px;
border: 1px solid #ccc; border: 1px solid #ccc;
position: relative; position: relative;
} }
.popup-result .title { .popup-result .title {
position: absolute; position: absolute;
top: -28px; top: -28px;
left: 50%; left: 50%;
width: 140px; width: 140px;
font-size: 14px; font-size: 14px;
margin-left: -70px; margin-left: -70px;
text-align: center; text-align: center;
line-height: 30px; line-height: 30px;
background: #fff; background: #fff;
} }
.popup-result table { .popup-result table {
text-align: center; text-align: center;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
} }
.popup-result table span { .popup-result table span {
display: block; display: block;
width: 100%; width: 100%;
font-family: arial; font-family: arial;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
border: 1px solid #e8e8e8; border: 1px solid #e8e8e8;
} }
.popup-result-scroll { .popup-result-scroll {
font-size: 12px; font-size: 12px;
line-height: 24px; line-height: 24px;
height: 10em; height: 10em;
overflow-y: auto; overflow-y: auto;
} }
</style> </style>

View File

@ -1,120 +1,127 @@
<template> <template>
<el-form size="small"> <el-form size="small">
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
分钟允许的通配符[, - * /] 分钟允许的通配符[, - * /]
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
周期从 周期从
<el-input-number v-model='cycle01' :min="0" :max="60" /> - <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='cycle02' :min="0" :max="60" /> 分钟
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="3"> <el-radio v-model='radioValue' :label="3">
<el-input-number v-model='average01' :min="0" :max="60" /> 分钟开始 <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='average02' :min="0" :max="60" /> 分钟执行一次
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="4"> <el-radio v-model='radioValue' :label="4">
指定 指定
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"> <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%" @change="selectChange">
<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option> <el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option>
</el-select> </el-select>
</el-radio> </el-radio>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
radioValue: 1, radioValue: 1,
cycle01: 1, cycle01: 1,
cycle02: 2, cycle02: 2,
average01: 0, average01: 0,
average02: 1, average02: 1,
checkboxList: [], checkboxList: [],
checkNum: this.$options.propsData.check checkNum: this.$options.propsData.check
} }
}, },
name: 'crontab-min', name: 'crontab-min',
props: ['check', 'cron'], props: ['check', 'cron'],
methods: { methods: {
// selectChange() {
radioChange() { this.radioValue = 4
if (this.radioValue !== 1 && this.cron.second === '*') { },
this.$emit('update', 'second', '0', 'min'); init() {
} this.cycle01 = 1
switch (this.radioValue) { this.cycle02 = 2
case 1: this.average01 = 0
this.$emit('update', 'min', '*', 'min'); this.average02 = 1
this.$emit('update', 'hour', '*', 'min'); this.checkboxList = []
break; },
case 2: //
this.$emit('update', 'min', this.cycle01 + '-' + this.cycle02, 'min'); radioChange() {
break; switch (this.radioValue) {
case 3: case 1:
this.$emit('update', 'min', this.average01 + '/' + this.average02, 'min'); this.$emit('update', 'min', '*', 'min');
break; this.$emit('update', 'hour', '*', 'min');
case 4: break;
this.$emit('update', 'min', this.checkboxString, 'min'); case 2:
break; this.$emit('update', 'min', this.cycle01 + '-' + this.cycle02, 'min');
} break;
}, case 3:
// this.$emit('update', 'min', this.average01 + '/' + this.average02, 'min');
cycleChange() { break;
if (this.radioValue == '2') { case 4:
this.$emit('update', 'min', this.cycleTotal, 'min'); this.$emit('update', 'min', this.checkboxString, 'min');
} break;
}, }
// },
averageChange() { //
if (this.radioValue == '3') { cycleChange() {
this.$emit('update', 'min', this.averageTotal, 'min'); if (this.radioValue == '2') {
} this.$emit('update', 'min', this.cycleTotal, 'min');
}, }
// checkbox },
checkboxChange() { //
if (this.radioValue == '4') { averageChange() {
this.$emit('update', 'min', this.checkboxString, 'min'); if (this.radioValue == '3') {
} this.$emit('update', 'min', this.averageTotal, 'min');
}, }
},
}, // checkbox
watch: { checkboxChange() {
"radioValue": "radioChange", if (this.radioValue == '4') {
'cycleTotal': 'cycleChange', this.$emit('update', 'min', this.checkboxString, 'min');
'averageTotal': 'averageChange', }
'checkboxString': 'checkboxChange', },
},
computed: { },
// watch: {
cycleTotal: function () { "radioValue": "radioChange",
this.cycle01 = this.checkNum(this.cycle01, 0, 59) 'cycleTotal': 'cycleChange',
this.cycle02 = this.checkNum(this.cycle02, 0, 59) 'averageTotal': 'averageChange',
return this.cycle01 + '-' + this.cycle02; 'checkboxString': 'checkboxChange',
}, },
// computed: {
averageTotal: function () { //
this.average01 = this.checkNum(this.average01, 0, 59) cycleTotal: function () {
this.average02 = this.checkNum(this.average02, 1, 59) this.cycle01 = this.checkNum(this.cycle01, 0, 59)
return this.average01 + '/' + this.average02; this.cycle02 = this.checkNum(this.cycle02, 0, 59)
}, return this.cycle01 + '-' + this.cycle02;
// checkbox },
checkboxString: function () { //
let str = this.checkboxList.join(); averageTotal: function () {
return str == '' ? '*' : str; this.average01 = this.checkNum(this.average01, 0, 59)
} this.average02 = this.checkNum(this.average02, 1, 59)
} return this.average01 + '/' + this.average02;
} },
</script> // checkbox
checkboxString: function () {
let str = this.checkboxList.join();
return str == '' ? '*' : str;
}
}
}
</script>

View File

@ -25,7 +25,7 @@
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="4"> <el-radio v-model='radioValue' :label="4">
指定 指定
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"> <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%" @change="selectChange">
<el-option v-for="item in 12" :key="item" :value="item">{{item}}</el-option> <el-option v-for="item in 12" :key="item" :value="item">{{item}}</el-option>
</el-select> </el-select>
</el-radio> </el-radio>
@ -48,25 +48,20 @@ export default {
}, },
name: 'crontab-month', name: 'crontab-month',
props: ['check', 'cron'], props: ['check', 'cron'],
methods: { methods: { selectChange() {
this.radioValue = 4
},
init() {
this.cycle01 = 1
this.cycle02 = 2
this.average01 = 1
this.average02 = 1
this.checkboxList = []
},
// //
radioChange() { radioChange() {
if (this.radioValue === 1) { if (this.radioValue === 1) {
this.$emit('update', 'month', '*'); this.$emit('update', 'month', '*');
this.$emit('update', 'year', '*');
} else {
if (this.cron.day === '*') {
this.$emit('update', 'day', '0', 'month');
}
if (this.cron.hour === '*') {
this.$emit('update', 'hour', '0', 'month');
}
if (this.cron.min === '*') {
this.$emit('update', 'min', '0', 'month');
}
if (this.cron.second === '*') {
this.$emit('update', 'second', '0', 'month');
}
} }
switch (this.radioValue) { switch (this.radioValue) {
case 2: case 2:

View File

@ -3,7 +3,7 @@
<p class="title">最近5次运行时间</p> <p class="title">最近5次运行时间</p>
<ul class="popup-result-scroll"> <ul class="popup-result-scroll">
<template v-if='isShow'> <template v-if='isShow'>
<li v-for='item in resultList' :key="item">{{item}}</li> <li v-for='item in resultList' :key="item">{{ item }}</li>
</template> </template>
<li v-else>计算结果中...</li> <li v-else>计算结果中...</li>
</ul> </ul>
@ -25,7 +25,6 @@ export default {
methods: { methods: {
// //
expressionChange() { expressionChange() {
// - // -
this.isShow = false; this.isShow = false;
// [0123456] // [0123456]
@ -151,7 +150,6 @@ export default {
} }
continue; continue;
} }
// //
if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') { if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
resetDay(); resetDay();
@ -160,7 +158,6 @@ export default {
// //
if (this.dayRule == 'lastDay') { if (this.dayRule == 'lastDay') {
// //
if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) { while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
DD--; DD--;
@ -200,7 +197,7 @@ export default {
// //
let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week'); let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
// dayRuleSup // dayRuleSup
if (Array.indexOf(this.dayRuleSup, thisWeek) < 0) { if (this.dayRuleSup.indexOf(thisWeek) < 0) {
// //
if (Di == DDate.length - 1) { if (Di == DDate.length - 1) {
resetDay(); resetDay();
@ -241,11 +238,9 @@ export default {
} }
// 1005 // 1005
DD = DD < 10 ? '0' + DD : DD; DD = DD < 10 ? '0' + DD : DD;
// //
goHour: for (let hi = hIdx; hi < hDate.length; hi++) { goHour: for (let hi = hIdx; hi < hDate.length; hi++) {
let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi] let hh = hDate[hi] < 10 ? '0' + hDate[hi] : hDate[hi]
// //
if (nMin > mDate[mDate.length - 1]) { if (nMin > mDate[mDate.length - 1]) {
resetMin(); resetMin();
@ -266,7 +261,6 @@ export default {
// "" // ""
goMin: for (let mi = mIdx; mi < mDate.length; mi++) { goMin: for (let mi = mIdx; mi < mDate.length; mi++) {
let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi]; let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi];
// //
if (nSecond > sDate[sDate.length - 1]) { if (nSecond > sDate[sDate.length - 1]) {
resetSecond(); resetSecond();

View File

@ -1,133 +1,147 @@
<template> <template>
<el-form size="small"> <el-form size="small">
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
允许的通配符[, - * /] 允许的通配符[, - * /]
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
周期从 周期从
<el-input-number v-model='cycle01' :min="0" :max="60" /> - <el-input-number v-model='cycle01' :min="0" :max="60"/>
<el-input-number v-model='cycle02' :min="0" :max="60" /> -
</el-radio> <el-input-number v-model='cycle02' :min="0" :max="60"/>
</el-form-item>
</el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="3"> <el-radio v-model='radioValue' :label="3">
<el-input-number v-model='average01' :min="0" :max="60" /> 秒开始 <el-input-number v-model='average01' :min="0" :max="60"/>
<el-input-number v-model='average02' :min="0" :max="60" /> 秒执行一次 秒开始
</el-radio> <el-input-number v-model='average02' :min="0" :max="60"/>
</el-form-item> 秒执行一次
</el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="4"> <el-radio v-model='radioValue' :label="4">
指定 指定
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"> <el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"
<el-option v-for="item in 60" :key="item" :value="item-1">{{item-1}}</el-option> @change="selectChange">
</el-select> <el-option v-for="item in 60" :key="item" :value="item-1">{{ item - 1 }}</el-option>
</el-radio> </el-select>
</el-form-item> </el-radio>
</el-form> </el-form-item>
</el-form>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
radioValue: 1, radioValue: 1,
cycle01: 1, cycle01: 1,
cycle02: 2, cycle02: 2,
average01: 0, average01: 0,
average02: 1, average02: 1,
checkboxList: [], checkboxList: [],
checkNum: this.$options.propsData.check checkNum: this.$options.propsData.check
} }
}, },
name: 'crontab-second', name: 'crontab-second',
props: ['check', 'radioParent'], props: ['check', 'radioParent'],
methods: { methods: {
// selectChange() {
radioChange() { this.radioValue = 4
switch (this.radioValue) { },
case 1: init() {
this.$emit('update', 'second', '*', 'second'); this.cycle01 = 1
this.$emit('update', 'min', '*', 'second'); this.cycle02 = 2
break; this.average01 = 0
case 2: this.average02 = 1
this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02); this.checkboxList = []
break; },
case 3: //
this.$emit('update', 'second', this.average01 + '/' + this.average02); radioChange() {
break; switch (this.radioValue) {
case 4: case 1:
this.$emit('update', 'second', this.checkboxString); this.$emit('update', 'second', '*', 'second');
break; break;
} case 2:
}, this.$emit('update', 'second', this.cycle01 + '-' + this.cycle02);
// break;
cycleChange() { case 3:
if (this.radioValue == '2') { this.$emit('update', 'second', this.average01 + '/' + this.average02);
this.$emit('update', 'second', this.cycleTotal); break;
} case 4:
}, this.$emit('update', 'second', this.checkboxString);
// break;
averageChange() { }
if (this.radioValue == '3') { },
this.$emit('update', 'second', this.averageTotal); //
} cycleChange() {
}, if (this.radioValue == '2') {
// checkbox this.$emit('update', 'second', this.cycleTotal);
checkboxChange() { }
if (this.radioValue == '4') { },
this.$emit('update', 'second', this.checkboxString); //
} averageChange() {
}, if (this.radioValue == '3') {
othChange() { this.$emit('update', 'second', this.averageTotal);
// }
let ins = this.cron.second },
('反解析 second', ins); // checkbox
if (ins === '*') { checkboxChange() {
this.radioValue = 1; if (this.radioValue == '4') {
} else if (ins.indexOf('-') > -1) { this.$emit('update', 'second', this.checkboxString);
this.radioValue = 2 }
} else if (ins.indexOf('/') > -1) { },
this.radioValue = 3 othChange() {
} else { //
this.radioValue = 4 let ins = this.cron.second
this.checkboxList = ins.split(',') ('反解析 second', ins);
} if (ins === '*') {
} this.radioValue = 1;
}, } else if (ins.indexOf('-') > -1) {
watch: { this.radioValue = 2
"radioValue": "radioChange", } else if (ins.indexOf('/') > -1) {
'cycleTotal': 'cycleChange', this.radioValue = 3
'averageTotal': 'averageChange', } else {
'checkboxString': 'checkboxChange', this.radioValue = 4
radioParent() { this.checkboxList = ins.split(',')
this.radioValue = this.radioParent }
} }
}, },
computed: { watch: {
// "radioValue": "radioChange",
cycleTotal: function () { 'cycleTotal': 'cycleChange',
this.cycle01 = this.checkNum(this.cycle01, 0, 59) 'averageTotal': 'averageChange',
this.cycle02 = this.checkNum(this.cycle02, 0, 59) 'checkboxString': 'checkboxChange',
return this.cycle01 + '-' + this.cycle02; radioParent() {
}, this.radioValue = this.radioParent
// }
averageTotal: function () { },
this.average01 = this.checkNum(this.average01, 0, 59) computed: {
this.average02 = this.checkNum(this.average02, 1, 59) //
return this.average01 + '/' + this.average02; cycleTotal: function () {
}, this.cycle01 = this.checkNum(this.cycle01, 0, 59)
// checkbox this.cycle02 = this.checkNum(this.cycle02, 0, 59)
checkboxString: function () { return this.cycle01 + '-' + this.cycle02;
let str = this.checkboxList.join(); },
return str == '' ? '*' : str; //
} averageTotal: function () {
} this.average01 = this.checkNum(this.average01, 0, 59)
this.average02 = this.checkNum(this.average02, 1, 59)
return this.average01 + '/' + this.average02;
},
// checkbox
checkboxString: function () {
let str = this.checkboxList.join();
return str == '' ? '*' : str;
}
}
} }
</script> </script>

View File

@ -1,167 +1,179 @@
<template> <template>
<el-form size='small'> <el-form size='small'>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="1"> <el-radio v-model='radioValue' :label="1">
允许的通配符[, - * / L #] 允许的通配符[, - * / L #]
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
不指定 不指定
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="3"> <el-radio v-model='radioValue' :label="3">
周期从星期 周期从星期
<el-input-number v-model='cycle01' :min="1" :max="7" /> - <el-input-number v-model='cycle01' :min="1" :max="7"/>
<el-input-number v-model='cycle02' :min="1" :max="7" /> -
</el-radio> <el-input-number v-model='cycle02' :min="1" :max="7"/>
</el-form-item> </el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="4"> <el-radio v-model='radioValue' :label="4">
<el-input-number v-model='average01' :min="1" :max="4" /> 周的星期 <el-input-number v-model='average01' :min="1" :max="4"/>
<el-input-number v-model='average02' :min="1" :max="7" /> 周的星期
</el-radio> <el-input-number v-model='average02' :min="1" :max="7"/>
</el-form-item> </el-radio>
</el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="5"> <el-radio v-model='radioValue' :label="5">
本月最后一个星期 本月最后一个星期
<el-input-number v-model='weekday' :min="1" :max="7" /> <el-input-number v-model='weekday' :min="1" :max="7"/>
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="6"> <el-radio v-model='radioValue' :label="6">
指定 指定
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%"> <el-select clearable v-model="checkboxDescribeList" placeholder="可多选" multiple style="width:100%"
<el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{item}}</el-option> @change="selectChange">
</el-select> <el-option v-for="(item,index) of weekList" :key="index" :value="item">{{ item }}</el-option>
</el-radio> </el-select>
</el-form-item> </el-radio>
</el-form-item>
</el-form> </el-form>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
radioValue: 2, radioValue: 2,
weekday: 1, weekday: 1,
cycle01: 1, cycle01: 1,
cycle02: 2, cycle02: 2,
average01: 1, average01: 1,
average02: 1, average02: 1,
checkboxList: [], checkboxList: [],
weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], checkboxDescribeList: [],
checkNum: this.$options.propsData.check weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
} checkNum: this.$options.propsData.check
}, }
name: 'crontab-week', },
props: ['check', 'cron'], name: 'crontab-week',
methods: { props: ['check', 'cron'],
// methods: {
radioChange() { selectChange(data) {
if (this.radioValue === 1) { this.radioValue = 6
this.$emit('update', 'week', '*'); this.checkboxList = []
this.$emit('update', 'year', '*'); data.forEach(value => {
} else { this.weekList.forEach((item,index) => {
if (this.cron.month === '*') { if (item === value) {
this.$emit('update', 'month', '0', 'week'); this.checkboxList.push(index + 1)
} }
if (this.cron.day === '*') { })
this.$emit('update', 'day', '0', 'week'); })
} },
if (this.cron.hour === '*') { init() {
this.$emit('update', 'hour', '0', 'week'); this.workday = 1
} this.cycle01 = 1
if (this.cron.min === '*') { this.cycle02 = 2
this.$emit('update', 'min', '0', 'week'); this.average01 = 1
} this.average02 = 1
if (this.cron.second === '*') { this.checkboxList = []
this.$emit('update', 'second', '0', 'week'); this.checkboxDescribeList = []
} },
} //
switch (this.radioValue) { radioChange() {
case 2:
this.$emit('update', 'week', '?');
break;
case 3:
this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
break;
case 4:
this.$emit('update', 'week', this.average01 + '#' + this.average02);
break;
case 5:
this.$emit('update', 'week', this.weekday + 'L');
break;
case 6:
this.$emit('update', 'week', this.checkboxString);
break;
}
},
// radio
// switch (this.radioValue) {
cycleChange() { case 1:
if (this.radioValue == '3') { this.$emit('update', 'week', '*');
this.$emit('update', 'week', this.cycleTotal); break;
} case 3:
}, this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
// break;
averageChange() { case 4:
if (this.radioValue == '4') { this.$emit('update', 'week', this.average01 + '#' + this.average02);
this.$emit('update', 'week', this.averageTotal); break;
} case 5:
}, this.$emit('update', 'week', this.weekday + 'L');
// break;
weekdayChange() { case 6:
if (this.radioValue == '5') { this.$emit('update', 'week', this.checkboxString);
this.$emit('update', 'week', this.weekday + 'L'); break;
} }
}, if (this.radioValue === 2) {
// checkbox this.$emit('update', 'week', '?');
checkboxChange() { this.$emit('update', 'day', '*');
if (this.radioValue == '6') { } else {
this.$emit('update', 'week', this.checkboxString); this.$emit('update', 'day', '?');
}
}, }
}, },
watch: { // radio
"radioValue": "radioChange",
'cycleTotal': 'cycleChange', //
'averageTotal': 'averageChange', cycleChange() {
'weekdayCheck': 'weekdayChange', if (this.radioValue == '3') {
'checkboxString': 'checkboxChange', this.$emit('update', 'week', this.cycleTotal);
}, }
computed: { },
// //
cycleTotal: function () { averageChange() {
this.cycle01 = this.checkNum(this.cycle01, 1, 7) if (this.radioValue == '4') {
this.cycle02 = this.checkNum(this.cycle02, 1, 7) this.$emit('update', 'week', this.averageTotal);
return this.cycle01 + '-' + this.cycle02; }
}, },
// //
averageTotal: function () { weekdayChange() {
this.average01 = this.checkNum(this.average01, 1, 4) if (this.radioValue == '5') {
this.average02 = this.checkNum(this.average02, 1, 7) this.$emit('update', 'week', this.weekday + 'L');
return this.average01 + '#' + this.average02; }
}, },
// // checkbox
weekdayCheck: function () { checkboxChange() {
this.weekday = this.checkNum(this.weekday, 1, 7) if (this.radioValue == '6') {
return this.weekday; this.$emit('update', 'week', this.checkboxString);
}, }
// checkbox },
checkboxString: function () { },
let str = this.checkboxList.join(); watch: {
return str == '' ? '*' : str; "radioValue": "radioChange",
} 'cycleTotal': 'cycleChange',
} 'averageTotal': 'averageChange',
'weekdayCheck': 'weekdayChange',
'checkboxString': 'checkboxChange',
},
computed: {
//
cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 1, 7)
this.cycle02 = this.checkNum(this.cycle02, 1, 7)
return this.cycle01 + '-' + this.cycle02;
},
//
averageTotal: function () {
this.average01 = this.checkNum(this.average01, 1, 4)
this.average02 = this.checkNum(this.average02, 1, 7)
return this.average01 + '#' + this.average02;
},
//
weekdayCheck: function () {
this.weekday = this.checkNum(this.weekday, 1, 7)
return this.weekday;
},
// checkbox
checkboxString: function () {
let str = this.checkboxList.join();
return str == '' ? '*' : str;
}
}
} }
</script> </script>

View File

@ -57,23 +57,16 @@ export default {
name: 'crontab-year', name: 'crontab-year',
props: ['check', 'month', 'cron'], props: ['check', 'month', 'cron'],
methods: { methods: {
init() {
this.fullYear = Number(new Date().getFullYear())
this.cycle01 = 0
this.cycle02 = 0
this.average01 = 0
this.average02 = 1
this.checkboxList = []
},
// //
radioChange() { 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) { switch (this.radioValue) {
case 1: case 1:
this.$emit('update', 'year', ''); this.$emit('update', 'year', '');

View File

@ -1,107 +1,108 @@
<template> <template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/> <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar class="sidebar-container"/> <sidebar class="sidebar-container"/>
<div :class="{hasTagsView:needTagsView}" class="main-container"> <div :class="{hasTagsView:needTagsView}" class="main-container">
<div :class="{'fixed-header':fixedHeader}"> <div :class="{'fixed-header':fixedHeader}">
<navbar /> <navbar />
<tags-view v-if="needTagsView" /> <tags-view v-if="needTagsView" />
</div> </div>
<app-main /> <app-main />
<right-panel> <right-panel>
<settings /> <settings />
</right-panel> </right-panel>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import RightPanel from '@/components/RightPanel' import RightPanel from '@/components/RightPanel'
import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components' import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
import ResizeMixin from './mixin/ResizeHandler' import ResizeMixin from './mixin/ResizeHandler'
import { mapState } from 'vuex' import { mapState } from 'vuex'
import variables from '@/assets/styles/variables.scss' import variables from '@/assets/styles/variables.scss'
export default { export default {
name: 'Layout', name: 'Layout',
components: { components: {
AppMain, AppMain,
Navbar, Navbar,
RightPanel, RightPanel,
Settings, Settings,
Sidebar, Sidebar,
TagsView TagsView
}, },
mixins: [ResizeMixin], mixins: [ResizeMixin],
computed: { computed: {
...mapState({ ...mapState({
theme: state => state.settings.theme, theme: state => state.settings.theme,
sideTheme: state => state.settings.sideTheme, sideTheme: state => state.settings.sideTheme,
sidebar: state => state.app.sidebar, sidebar: state => state.app.sidebar,
device: state => state.app.device, device: state => state.app.device,
needTagsView: state => state.settings.tagsView, needTagsView: state => state.settings.tagsView,
fixedHeader: state => state.settings.fixedHeader fixedHeader: state => state.settings.fixedHeader
}), }),
classObj() { classObj() {
return { return {
hideSidebar: !this.sidebar.opened, hideSidebar: !this.sidebar.opened,
openSidebar: this.sidebar.opened, openSidebar: this.sidebar.opened,
withoutAnimation: this.sidebar.withoutAnimation, withoutAnimation: this.sidebar.withoutAnimation,
mobile: this.device === 'mobile' mobile: this.device === 'mobile'
} }
}, },
variables() { variables() {
return variables; return variables;
} }
}, },
methods: { methods: {
handleClickOutside() { handleClickOutside() {
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "~@/assets/styles/mixin.scss"; @import "~@/assets/styles/mixin.scss";
@import "~@/assets/styles/variables.scss"; @import "~@/assets/styles/variables.scss";
.app-wrapper { .app-wrapper {
@include clearfix; @include clearfix;
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
&.mobile.openSidebar { &.mobile.openSidebar {
position: fixed; position: fixed;
top: 0; top: 0;
} }
} }
.drawer-bg { .drawer-bg {
background: #000; background: #000;
opacity: 0.3; opacity: 0.3;
width: 100%; width: 100%;
top: 0; top: 0;
height: 100%; height: 100%;
position: absolute; position: absolute;
z-index: 999; z-index: 999;
} }
.fixed-header { .fixed-header {
position: fixed; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
z-index: 9; z-index: 9;
width: calc(100% - #{$base-sidebar-width}); width: calc(100% - #{$base-sidebar-width});
transition: width 0.28s; transition: width 0.28s;
} padding-right: 0;
}
.hideSidebar .fixed-header {
width: calc(100% - 54px) .hideSidebar .fixed-header {
} width: calc(100% - 54px)
}
.mobile .fixed-header {
width: 100%; .mobile .fixed-header {
} width: 100%;
</style> }
</style>