mirror of
https://github.com/whyour/qinglong.git
synced 2025-05-22 22:36:06 +08:00
修复任务视图状态包含筛选
This commit is contained in:
parent
1a185f5682
commit
eb1c00984c
|
@ -215,14 +215,24 @@ export default class CronService {
|
||||||
operate2 = Op.and;
|
operate2 = Op.and;
|
||||||
break;
|
break;
|
||||||
case 'In':
|
case 'In':
|
||||||
q[Op.or] = [
|
if (
|
||||||
{
|
property === 'status' &&
|
||||||
[property]: Array.isArray(value) ? value : [value],
|
!value.includes(CrontabStatus.disabled)
|
||||||
},
|
) {
|
||||||
property === 'status' && value.includes(2)
|
q[Op.and] = [
|
||||||
? { isDisabled: 1 }
|
{ [property]: Array.isArray(value) ? value : [value] },
|
||||||
: {},
|
{ isDisabled: 0 },
|
||||||
];
|
];
|
||||||
|
} else {
|
||||||
|
q[Op.or] = [
|
||||||
|
{
|
||||||
|
[property]: Array.isArray(value) ? value : [value],
|
||||||
|
},
|
||||||
|
property === 'status' && value.includes(CrontabStatus.disabled)
|
||||||
|
? { isDisabled: 1 }
|
||||||
|
: {},
|
||||||
|
];
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'Nin':
|
case 'Nin':
|
||||||
q[Op.and] = [
|
q[Op.and] = [
|
||||||
|
|
Loading…
Reference in New Issue
Block a user