diff --git a/apps/vue/src/views/task-management/background-jobs/datas/ModalData.ts b/apps/vue/src/views/task-management/background-jobs/datas/ModalData.ts index 189d2d92d..8a5f47d47 100644 --- a/apps/vue/src/views/task-management/background-jobs/datas/ModalData.ts +++ b/apps/vue/src/views/task-management/background-jobs/datas/ModalData.ts @@ -25,13 +25,14 @@ export function getSearchFormSchemas(): Partial { field: 'type', component: 'Input', label: L('DisplayName:Type'), - colProps: { span: 12 }, + colProps: { span: 6 }, }, { field: 'status', component: 'Select', label: L('DisplayName:Status'), colProps: { span: 6 }, + defaultValue: JobStatus.Running, componentProps: { options: [ { label: JobStatusMap[JobStatus.None], value: JobStatus.None }, @@ -42,6 +43,19 @@ export function getSearchFormSchemas(): Partial { ], }, }, + { + field: 'jobType', + component: 'Select', + label: L('DisplayName:JobType'), + colProps: { span: 6 }, + componentProps: { + options: [ + { label: JobTypeMap[JobType.Once], value: JobType.Once }, + { label: JobTypeMap[JobType.Period], value: JobType.Period }, + { label: JobTypeMap[JobType.Persistent], value: JobType.Persistent }, + ], + }, + }, { field: 'beginTime', component: 'DatePicker', @@ -65,15 +79,17 @@ export function getSearchFormSchemas(): Partial { }, }, { - field: 'jobType', + field: 'priority', component: 'Select', - label: L('DisplayName:JobType'), + label: L('DisplayName:Priority'), colProps: { span: 6 }, componentProps: { options: [ - { label: JobTypeMap[JobType.Once], value: JobType.Once }, - { label: JobTypeMap[JobType.Period], value: JobType.Period }, - { label: JobTypeMap[JobType.Persistent], value: JobType.Persistent }, + { label: JobPriorityMap[JobPriority.Low], value: JobPriority.Low }, + { label: JobPriorityMap[JobPriority.BelowNormal], value: JobPriority.BelowNormal }, + { label: JobPriorityMap[JobPriority.Normal], value: JobPriority.Normal }, + { label: JobPriorityMap[JobPriority.AboveNormal], value: JobPriority.AboveNormal }, + { label: JobPriorityMap[JobPriority.High], value: JobPriority.High }, ], }, }, @@ -100,19 +116,11 @@ export function getSearchFormSchemas(): Partial { }, }, { - field: 'priority', - component: 'Select', - label: L('DisplayName:Priority'), - colProps: { span: 6 }, - componentProps: { - options: [ - { label: JobPriorityMap[JobPriority.Low], value: JobPriority.Low }, - { label: JobPriorityMap[JobPriority.BelowNormal], value: JobPriority.BelowNormal }, - { label: JobPriorityMap[JobPriority.Normal], value: JobPriority.Normal }, - { label: JobPriorityMap[JobPriority.AboveNormal], value: JobPriority.AboveNormal }, - { label: JobPriorityMap[JobPriority.High], value: JobPriority.High }, - ], - }, + field: 'isAbandoned', + component: 'Checkbox', + label: L('DisplayName:IsAbandoned'), + colProps: { span: 4 }, + renderComponentContent: L('DisplayName:IsAbandoned'), }, { field: 'beginCreationTime', @@ -136,18 +144,11 @@ export function getSearchFormSchemas(): Partial { }, }, }, - { - field: 'isAbandoned', - component: 'Checkbox', - label: L('DisplayName:IsAbandoned'), - colProps: { span: 4 }, - renderComponentContent: L('DisplayName:IsAbandoned'), - }, { field: 'filter', component: 'Input', label: L('Search'), - colProps: { span: 20 }, + colProps: { span: 24 }, }, ], };