diff --git a/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts b/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
index 8bf3a9d8d..801f13dc3 100644
--- a/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
+++ b/apps/vue/src/api/task-management/model/backgroundJobInfoModel.ts
@@ -4,6 +4,7 @@ export enum JobStatus {
None = -1,
Completed = 0,
Running = 10,
+ FailedRetry = 15,
Paused = 20,
Stopped = 30,
}
diff --git a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoModal.vue b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoModal.vue
index ea653d3ea..e4fc03acf 100644
--- a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoModal.vue
+++ b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoModal.vue
@@ -4,6 +4,7 @@
:width="800"
:height="400"
:title="modalTitle"
+ :help-message="modalTips"
:mask-closable="false"
@ok="handleSubmit"
>
@@ -27,7 +28,7 @@
-
+
@@ -204,7 +205,19 @@
return false;
});
const modalTitle = computed(() => {
- return isEditModal.value ? L('BackgroundJobs:Edit') : L('BackgroundJobs:AddNew');
+ if (!isEditModal.value) {
+ return L('BackgroundJobs:AddNew');
+ }
+ if (modelRef.value.isAbandoned) {
+ return `${L('BackgroundJobs:Edit')} - ${L('DisplayName:IsAbandoned')}`;
+ }
+ return L('BackgroundJobs:Edit');
+ });
+ const modalTips = computed(() => {
+ if (modelRef.value.isAbandoned) {
+ return L('Description:IsAbandoned');
+ }
+ return '';
});
const modelRules = reactive({
group: ruleCreator.fieldRequired({
diff --git a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue
index 75a49d28a..273d7be35 100644
--- a/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue
+++ b/apps/vue/src/views/task-management/background-jobs/components/BackgroundJobInfoTable.vue
@@ -13,7 +13,10 @@
- {{ JobStatusMap[record.status] }}
+
+ {{ JobStatusMap[record.status] }}
+
+ {{ JobStatusMap[record.status] }}
{{ JobTypeMap[record.jobType] }}
@@ -43,7 +46,7 @@
{
auth: 'TaskManagement.BackgroundJobs.Pause',
label: L('BackgroundJobs:Pause'),
- ifShow: record.status === JobStatus.Running,
+ ifShow: [JobStatus.Running, JobStatus.FailedRetry].includes(record.status),
onClick: handlePause.bind(null, record),
},
{
@@ -55,13 +58,13 @@
{
auth: 'TaskManagement.BackgroundJobs.Trigger',
label: L('BackgroundJobs:Trigger'),
- ifShow: [JobStatus.Running, JobStatus.Completed].includes(record.status),
+ ifShow: [JobStatus.Running, JobStatus.Completed, JobStatus.FailedRetry].includes(record.status),
onClick: handleTrigger.bind(null, record),
},
{
auth: 'TaskManagement.BackgroundJobs.Stop',
label: L('BackgroundJobs:Stop'),
- ifShow: record.status === JobStatus.Running,
+ ifShow: [JobStatus.Running, JobStatus.FailedRetry].includes(record.status),
onClick: handleStop.bind(null, record),
},
]"
@@ -73,7 +76,7 @@