diff --git a/back/services/cron.ts b/back/services/cron.ts index 7f0ac69e..7e1ff0b2 100644 --- a/back/services/cron.ts +++ b/back/services/cron.ts @@ -18,7 +18,7 @@ import { TASK_PREFIX, QL_PREFIX } from '../config/const'; @Service() export default class CronService { - constructor(@Inject('logger') private logger: winston.Logger) { } + constructor(@Inject('logger') private logger: winston.Logger) {} private isSixCron(cron: Crontab) { const { schedule } = cron; @@ -246,8 +246,12 @@ export default class CronService { for (const key of filterKeys) { let q: any = {}; if (!filterQuery[key]) continue; - if (key === 'status' && filterQuery[key].includes(2)) { - q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] }; + if (key === 'status') { + if (filterQuery[key].includes(2)) { + q = { [Op.or]: [{ [key]: filterQuery[key] }, { isDisabled: 1 }] }; + } else { + q = { [Op.and]: [{ [key]: filterQuery[key] }, { isDisabled: 0 }] }; + } } else { q[key] = filterQuery[key]; } @@ -264,7 +268,11 @@ export default class CronService { } } - public async find({ log_path }: { log_path: string }): Promise { + public async find({ + log_path, + }: { + log_path: string; + }): Promise { try { const result = await CrontabModel.findOne({ where: { log_path } }); return result; diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index 8984f09f..58d768fd 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -279,13 +279,6 @@ const Crontab = () => { value: 3, }, ], - onFilter: (value, record) => { - if (record.isDisabled && record.status !== 0) { - return value === 2; - } else { - return record.status === value; - } - }, render: (text, record) => ( <> {(!record.isDisabled || record.status !== CrontabStatus.idle) && ( @@ -1051,7 +1044,7 @@ const Crontab = () => { rowSelection={rowSelection} rowClassName={getRowClassName} onChange={onPageChange} - components={isPhone ? undefined : vt} + // components={isPhone ? undefined : vt} />