open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-07 20:06:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复任务列表下次运行时间展示

Browse Source
This commit is contained in:
whyour 2024-12-03 22:35:34 +08:00
parent a1501705c1
commit 026640a757
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/index.ts
View File

@ -1,6 +1,7 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { LANG_MAP, LOG_END_SYMBOL } from './const'; import { LANG_MAP, LOG_END_SYMBOL } from './const';
import cron_parser from 'cron-parser'; import cron_parser from 'cron-parser';
import { ICrontab } from '@/pages/crontab/type';
export default function browserType() { export default function browserType() {
// 权重：系统 + 系统版本 > 平台 > 内核 + 载体 + 内核版本 + 载体版本 > 外壳 + 外壳版本 // 权重：系统 + 系统版本 > 平台 > 内核 + 载体 + 内核版本 + 载体版本 > 外壳 + 外壳版本
@ -343,12 +344,12 @@ export function parseCrontab(schedule: string): Date | null {
export function getCrontabsNextDate( export function getCrontabsNextDate(
schedule: string, schedule: string,
extra_schedules: string[], extra_schedules: ICrontab['extra_schedules'],
): Date | null { ): Date | null {
let date = parseCrontab(schedule); let date = parseCrontab(schedule);
if (extra_schedules?.length) { if (extra_schedules?.length) {
extra_schedules.forEach((x) => { extra_schedules.forEach((x) => {
const _date = parseCrontab(x); const _date = parseCrontab(x.schedule);
if (_date && (!date || _date < date)) { if (_date && (!date || _date < date)) {
date = _date; date = _date;
} }