|
|
@ -92,12 +92,10 @@ export function transObjToSpec(specType: string, week, day, hour, minute, second
|
|
|
|
case 'perWeek':
|
|
|
|
case 'perWeek':
|
|
|
|
return `${minute} ${hour} * * ${week}`;
|
|
|
|
return `${minute} ${hour} * * ${week}`;
|
|
|
|
case 'perNDay':
|
|
|
|
case 'perNDay':
|
|
|
|
day = Number(day) + 1 + '';
|
|
|
|
|
|
|
|
return `${minute} ${hour} */${day} * *`;
|
|
|
|
return `${minute} ${hour} */${day} * *`;
|
|
|
|
case 'perDay':
|
|
|
|
case 'perDay':
|
|
|
|
return `${minute} ${hour} * * *`;
|
|
|
|
return `${minute} ${hour} * * *`;
|
|
|
|
case 'perNHour':
|
|
|
|
case 'perNHour':
|
|
|
|
hour = Number(hour) + 1 + '';
|
|
|
|
|
|
|
|
return `${minute} */${hour} * * *`;
|
|
|
|
return `${minute} */${hour} * * *`;
|
|
|
|
case 'perHour':
|
|
|
|
case 'perHour':
|
|
|
|
return `${minute} * * * *`;
|
|
|
|
return `${minute} * * * *`;
|
|
|
@ -141,13 +139,13 @@ export function transSpecToObj(spec: string) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (specs[1].indexOf('*/') !== -1) {
|
|
|
|
if (specs[1].indexOf('*/') !== -1) {
|
|
|
|
specItem.specType = 'perNHour';
|
|
|
|
specItem.specType = 'perNHour';
|
|
|
|
specItem.hour = Number(specs[1].replaceAll('*/', '')) - 1;
|
|
|
|
specItem.hour = Number(specs[1].replaceAll('*/', ''));
|
|
|
|
return specItem;
|
|
|
|
return specItem;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
specItem.hour = Number(specs[1]);
|
|
|
|
specItem.hour = Number(specs[1]);
|
|
|
|
if (specs[2].indexOf('*/') !== -1) {
|
|
|
|
if (specs[2].indexOf('*/') !== -1) {
|
|
|
|
specItem.specType = 'perNDay';
|
|
|
|
specItem.specType = 'perNDay';
|
|
|
|
specItem.day = Number(specs[2].replaceAll('*/', '')) - 1;
|
|
|
|
specItem.day = Number(specs[2].replaceAll('*/', ''));
|
|
|
|
return specItem;
|
|
|
|
return specItem;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (specs[2] !== '*') {
|
|
|
|
if (specs[2] !== '*') {
|
|
|
|