From 026640a7579f13d46e6e87f2df952a4269a5fdb1 Mon Sep 17 00:00:00 2001 From: whyour Date: Tue, 3 Dec 2024 22:35:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E6=AC=A1=E8=BF=90=E8=A1=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 09bc2f5a..9d6a35ca 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,6 +1,7 @@ import intl from 'react-intl-universal'; import { LANG_MAP, LOG_END_SYMBOL } from './const'; import cron_parser from 'cron-parser'; +import { ICrontab } from '@/pages/crontab/type'; export default function browserType() { // 权重:系统 + 系统版本 > 平台 > 内核 + 载体 + 内核版本 + 载体版本 > 外壳 + 外壳版本 @@ -343,12 +344,12 @@ export function parseCrontab(schedule: string): Date | null { export function getCrontabsNextDate( schedule: string, - extra_schedules: string[], + extra_schedules: ICrontab['extra_schedules'], ): Date | null { let date = parseCrontab(schedule); if (extra_schedules?.length) { extra_schedules.forEach((x) => { - const _date = parseCrontab(x); + const _date = parseCrontab(x.schedule); if (_date && (!date || _date < date)) { date = _date; }