From 0ea9a0e107f4cbc1de6673554fc455d7e9407dab Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 19 Dec 2024 15:41:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20[=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5]=E4=BB=BB=E5=8A=A1=E4=B8=8B=E5=8F=91=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=AB=E6=8D=B7=E5=85=A5=E5=8F=A3=EF=BC=9A?= =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en-US.ts | 4 ++++ core/core-frontend/src/locales/en.ts | 4 ++++ core/core-frontend/src/locales/tw.ts | 4 ++++ core/core-frontend/src/locales/zh-CN.ts | 4 ++++ .../io/dataease/api/xpack/dataFilling/DataFillingApi.java | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/core/core-frontend/src/locales/en-US.ts b/core/core-frontend/src/locales/en-US.ts index 664ddbbbf8..4dd6aa1b45 100644 --- a/core/core-frontend/src/locales/en-US.ts +++ b/core/core-frontend/src/locales/en-US.ts @@ -4138,6 +4138,10 @@ export default { distribute_frequency: 'Sending frequency', one_time: 'Only send once', interval: 'Regularly send', + execute_now: 'Execute now', + end_time: 'Task end time', + please_select_end_time: 'Please select task end time', + end_time_error: 'End time must greater than current', distribute_setting: 'Sending settings', task_distribute_setting: 'Task sending settings', receive_object: 'Receiving object', diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index e2423849e6..7cbc5ac4f7 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4180,6 +4180,10 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr distribute_frequency: 'Sending frequency', one_time: 'Only send once', interval: 'Regularly send', + execute_now: 'Execute now', + end_time: 'Task end time', + please_select_end_time: 'Please select task end time', + end_time_error: 'End time must greater than current', distribute_setting: 'Sending settings', task_distribute_setting: 'Task sending settings', receive_object: 'Receiving object', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index b822aefa4c..46e2266290 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4069,6 +4069,10 @@ export default { distribute_frequency: '傳送頻率', one_time: '僅下發一次', interval: '定期下發', + execute_now: '立即執行', + end_time: '任務結束時間', + please_select_end_time: '請選擇任務結束時間', + end_time_error: '結束時間必須大于當前時間', distribute_setting: '下發設定', task_distribute_setting: '任務下發設定', receive_object: '接收物件', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 94cac972bb..d59e15aaf1 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4073,6 +4073,10 @@ export default { distribute_frequency: '发送频率', one_time: '仅下发一次', interval: '定期下发', + execute_now: '立即执行', + end_time: '任务结束时间', + please_select_end_time: '请选择任务结束时间', + end_time_error: '结束时间必须大于当前时间', distribute_setting: '下发设置', task_distribute_setting: '任务下发设置', receive_object: '接收对象', diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java index 1488f9fcd7..588655eb3f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/DataFillingApi.java @@ -79,6 +79,10 @@ public interface DataFillingApi { @PostMapping("/task/save") Long saveTask(@RequestBody TaskInfoVO task); + @DePermit({"#p0.formId+':manage'"}) + @PostMapping("/task/executeNow") + void executeNow(@RequestBody TaskInfoVO task); + @PostMapping("/task/logMsg") String logMsg(@RequestBody ReportInstanceMsgRequest request);