diff --git a/apps/vue/src/api/auditing/model/auditLogModel.ts b/apps/vue/src/api/auditing/model/auditLogModel.ts index ccd6182e9..2c0d2e78f 100644 --- a/apps/vue/src/api/auditing/model/auditLogModel.ts +++ b/apps/vue/src/api/auditing/model/auditLogModel.ts @@ -17,7 +17,7 @@ export interface PropertyChange { export interface EntityChange { id: string; changeTime?: Date; - changeType?: ChangeType; + changeType: ChangeType; entityTenantId?: string; entityId?: string; entityTypeFullName?: string; diff --git a/apps/vue/src/api/task-management/backgroundJobInfo.ts b/apps/vue/src/api/task-management/backgroundJobInfo.ts index 4dbb69242..3f0480c38 100644 --- a/apps/vue/src/api/task-management/backgroundJobInfo.ts +++ b/apps/vue/src/api/task-management/backgroundJobInfo.ts @@ -17,7 +17,14 @@ enum Api { Pause = '/api/task-management/background-jobs/{id}/pause', Resume = '/api/task-management/background-jobs/{id}/resume', Trigger = '/api/task-management/background-jobs/{id}/trigger', + Start = '/api/task-management/background-jobs/{id}/start', Stop = '/api/task-management/background-jobs/{id}/stop', + BulkPause = '/api/task-management/background-jobs/bulk-pause', + BulkResume = '/api/task-management/background-jobs/bulk-resume', + BulkTrigger = '/api/task-management/background-jobs/bulk-trigger', + BulkStart = '/api/task-management/background-jobs/bulk-start', + BulkStop = '/api/task-management/background-jobs/bulk-stop', + BulkDelete = '/api/task-management/background-jobs/bulk-delete', } export const getById = (id: string) => { @@ -71,8 +78,68 @@ export const trigger = (id: string) => { }); }; +export const start = (id: string) => { + return defAbpHttp.put({ + url: format(Api.Stop, { id: id }), + }); +}; + export const stop = (id: string) => { return defAbpHttp.put({ url: format(Api.Stop, { id: id }), }); }; + +export const bulkPause = (ids: string[]) => { + return defAbpHttp.put({ + url: Api.BulkPause, + data: { + jobIds: ids, + }, + }); +}; + +export const bulkResume = (ids: string[]) => { + return defAbpHttp.put({ + url: Api.BulkResume, + data: { + jobIds: ids, + }, + }); +}; + +export const bulkTrigger = (ids: string[]) => { + return defAbpHttp.put({ + url: Api.BulkTrigger, + data: { + jobIds: ids, + }, + }); +}; + +export const bulkStart = (ids: string[]) => { + return defAbpHttp.put({ + url: Api.BulkStart, + data: { + jobIds: ids, + }, + }); +}; + +export const bulkStop = (ids: string[]) => { + return defAbpHttp.put({ + url: Api.BulkStop, + data: { + jobIds: ids, + }, + }); +}; + +export const bulkDelete = (ids: string[]) => { + return defAbpHttp.put({ + url: Api.BulkDelete, + data: { + jobIds: ids, + }, + }); +}; diff --git a/apps/vue/src/components/Permission/src/PermissionModal.vue b/apps/vue/src/components/Permission/src/PermissionModal.vue index 458c7d62f..44d3fd3d1 100644 --- a/apps/vue/src/components/Permission/src/PermissionModal.vue +++ b/apps/vue/src/components/Permission/src/PermissionModal.vue @@ -6,6 +6,7 @@ :width="800" :min-height="600" @ok="handleSubmit" + @visible-change="handleVisibleChange" > @@ -35,7 +36,6 @@ @@ -76,13 +84,14 @@