mirror of
https://github.com/whyour/qinglong.git
synced 2025-05-25 16:36:07 +08:00
修复定时任务排序
This commit is contained in:
parent
c3c585bd6e
commit
e1c04bb7fb
|
@ -42,7 +42,7 @@ enum CrontabStatus {
|
||||||
'queued',
|
'queued',
|
||||||
}
|
}
|
||||||
|
|
||||||
const CrontabSort = [0, 3, 1];
|
const CrontabSort: any = { 0: 0, 3: 1, 1: 2, 4: 3 };
|
||||||
|
|
||||||
enum OperationName {
|
enum OperationName {
|
||||||
'启用',
|
'启用',
|
||||||
|
@ -188,33 +188,20 @@ const Crontab = () => {
|
||||||
const [logCron, setLogCron] = useState<any>();
|
const [logCron, setLogCron] = useState<any>();
|
||||||
const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
|
const [selectedRowIds, setSelectedRowIds] = useState<string[]>([]);
|
||||||
|
|
||||||
const getCrons = (needLoading: boolean = true) => {
|
const getCrons = () => {
|
||||||
needLoading && setLoading(true);
|
setLoading(true);
|
||||||
request
|
request
|
||||||
.get(`${config.apiPrefix}crons?searchValue=${searchText}`)
|
.get(`${config.apiPrefix}crons?searchValue=${searchText}`)
|
||||||
.then((data: any) => {
|
.then((data: any) => {
|
||||||
setValue(
|
setValue(
|
||||||
data.data.sort((a: any, b: any) => {
|
data.data.sort((a: any, b: any) => {
|
||||||
if (a.status === b.status && a.status === CrontabStatus.idle) {
|
const sortA = a.isDisabled ? 4 : a.status;
|
||||||
return a.isDisabled - b.isDisabled;
|
const sortB = b.isDisabled ? 4 : b.status;
|
||||||
}
|
return CrontabSort[sortA] - CrontabSort[sortB];
|
||||||
return CrontabSort[a.status] - CrontabSort[b.status];
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
const runningTasks = data.data.filter(
|
|
||||||
(x: any) => x.status !== CrontabStatus.idle,
|
|
||||||
);
|
|
||||||
if (
|
|
||||||
runningTasks.length > 0 &&
|
|
||||||
!logCron &&
|
|
||||||
location.pathname === '/crontab'
|
|
||||||
) {
|
|
||||||
setTimeout(() => {
|
|
||||||
getCrons(false);
|
|
||||||
}, 5000);
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
.finally(() => needLoading && setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
};
|
};
|
||||||
|
|
||||||
const addCron = () => {
|
const addCron = () => {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user