1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-09-13 18:15:31 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 解决计划任务执行周期错误的问题 (#5412)

Browse source 
Refs #5404
This commit is contained in:
ssongliu 2024-06-11 18:08:34 +08:00 • committed by GitHub
parent ff549a4793
commit 05e62a6f94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/lang/modules/tw.ts
View file

@ -827,12 +827,12 @@ const message = {
perMonth: '每月',
perWeek: '每周',
perHour: '每小時',
perNDay: '每隔 N 日',
perNDay: '每 N 日',
perDay: '每天',
perNHour: '每隔 N 時',
perNMinute: '每隔 N 分鐘',
perNSecond: '每隔 N 秒',
per: '每隔',
perNHour: '每 N 時',
perNMinute: '每 N 分鐘',
perNSecond: '每 N 秒',
per: '每',
handle: '執行',
day: '日',
monday: '周一',

10
frontend/src/lang/modules/zh.ts
View file

@ -828,12 +828,12 @@ const message = {
perMonth: '每月',
perWeek: '每周',
perHour: '每小时',
perNDay: '每隔 N 日',
perNDay: '每 N 日',
perDay: '每天',
perNHour: '每隔 N 时',
perNMinute: '每隔 N 分钟',
perNSecond: '每隔 N 秒',
per: '每隔',
perNHour: '每 N 时',
perNMinute: '每 N 分钟',
perNSecond: '每 N 秒',
per: '每',
handle: '执行',
day: '日',
monday: '周一',

6
frontend/src/views/cronjob/helper.ts
View file

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