From 013f25d0f7ff874628fd0855ac62ac7d5028877c Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Mon, 9 Sep 2024 18:43:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5-=E6=89=B9=E9=87=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=A1=A8=E6=A0=BC=E9=A2=84=E8=A7=88=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=99=BD=E8=89=B2=E6=96=87=E5=AD=97=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/en.ts                         | 3 +++
 core/core-frontend/src/locales/tw.ts                         | 3 +++
 core/core-frontend/src/locales/zh-CN.ts                      | 3 +++
 de-xpack                                                     | 2 +-
 .../io/dataease/api/xpack/dataFilling/DataFillingApi.java    | 5 ++++-
 5 files changed, 14 insertions(+), 2 deletions(-)

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<String, String> data);
+
+    @GetMapping("/template/{itemId}")
+    String getTemplateByUserTaskItemId(@PathVariable("itemId") Long itemId);
 }