diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index d510e00099..ddf4a9ac8e 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -397,6 +397,9 @@ export default { interval: 'Interval', distribute_setting: 'Distribute Setting', task_distribute_setting: 'Task Distribute Setting', + form_template_setting: 'From Template Setting', + template_setting: 'Template Setting', + component: 'Component Name', receive_object: 'Receive Object', receive_fit_column: 'Receive Fit Column', receiver: 'Receiver', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index d15ed8c0e4..878f25b35e 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -298,6 +298,9 @@ export default { interval: '定期下發', distribute_setting: '下發設置', task_distribute_setting: '任務下發設置', + form_template_setting: '表單模板設置', + template_setting: '模板設置', + component: '組件標題', receive_object: '接收對象', receive_fit_column: '接收對象匹配字段', receiver: '接收人', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index b22eefe05d..3b69db823f 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2732,6 +2732,9 @@ export default { task_distribute_setting: '任务下发设置', receive_object: '接收对象', receive_fit_column: '接收对象匹配字段', + form_template_setting: '表单模板设置', + template_setting: '模板设置', + component: '组件标题', receiver: '接收人', receiver_not_null: '接收人不能为空!', commit_type: '数据提交方式', diff --git a/de-xpack b/de-xpack index b9dd2ca673..8509fba76a 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit b9dd2ca673906e337d98609a1f894221da047473 +Subproject commit 8509fba76a0302c73e7c94ae4bb42f7e321adbff 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 547406160b..cfa29dac23 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 @@ -76,7 +76,7 @@ public interface DataFillingApi { @DePermit({"#p0.formId+':manage'"}) @PostMapping("/task/save") - Long save(@RequestBody TaskInfoVO task); + Long saveTask(@RequestBody TaskInfoVO task); @PostMapping("/task/logMsg") String logMsg(@RequestBody ReportInstanceMsgRequest request); @@ -131,4 +131,7 @@ public interface DataFillingApi { @DePermit({"#p0+':manage'"}) @PostMapping("/form/{formId}/confirmUpload") void confirmUpload(@PathVariable("formId") Long formId, @RequestBody Map data); + + @GetMapping("/template/{itemId}") + String getTemplateByUserTaskItemId(@PathVariable("itemId") Long itemId); }