任务视图支持标签筛选

This commit is contained in:
whyour 2022-12-10 19:00:03 +08:00
parent a9cc1cb4b9
commit 4526c84330
2 changed files with 19 additions and 6 deletions

View File

@ -12,8 +12,7 @@ import {
killTask, killTask,
} from '../config/util'; } from '../config/util';
import { promises, existsSync } from 'fs'; import { promises, existsSync } from 'fs';
import { promisify } from 'util'; import { Op, where, col as colFn } from 'sequelize';
import { Op } from 'sequelize';
import path from 'path'; import path from 'path';
@Service() @Service()
@ -164,9 +163,23 @@ export default class CronService {
} }
if (operate && operate2) { if (operate && operate2) {
q[property] = { q[property] = {
[operate2]: [ [Op.or]: [
{ [operate]: `%${value}%` }, {
{ [operate]: `%${encodeURIComponent(value)}%` }, [operate2]: [
{ [operate]: `%${value}%` },
{ [operate]: `%${encodeURIComponent(value)}%` },
],
},
{
[operate2]: [
where(colFn(property), operate, `%${value}%`),
where(
colFn(property),
operate,
`%${encodeURIComponent(value)}%`,
),
],
},
], ],
}; };
} }

View File

@ -20,7 +20,7 @@ const PROPERTIES = [
{ name: '名称', value: 'name' }, { name: '名称', value: 'name' },
{ name: '定时规则', value: 'schedule' }, { name: '定时规则', value: 'schedule' },
{ name: '状态', value: 'status' }, { name: '状态', value: 'status' },
// { name: '标签', value: 'labels' }, { name: '标签', value: 'labels' },
]; ];
const EOperation: any = { const EOperation: any = {