From 87da905360069efbe0f0be468afe5c71607d7285 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 18 Oct 2024 11:18:24 +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=E6=8C=89=E6=9D=A1=E4=BB=B6=E4=B8=8B=E5=8F=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A2=9E=E5=8A=A0=E6=9D=A1=E4=BB=B6=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 2 ++ core/core-frontend/src/locales/tw.ts | 2 ++ core/core-frontend/src/locales/zh-CN.ts | 2 ++ de-xpack | 2 +- .../java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index fa79c509b4..f60e9c9640 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -567,6 +567,8 @@ export default { task_distribute_setting: 'Task Distribute Setting', form_template_setting: 'From Template Setting', template_setting: 'Template Setting', + form_filter_setting: 'From Filter Setting', + filter_setting: 'Filter Setting', component: 'Component Name', receive_object: 'Receive Object', receive_fit_column: 'Receive Fit Column', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index f52bc96cd5..9f41545bb3 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -305,6 +305,8 @@ export default { task_distribute_setting: '任務下發設置', form_template_setting: '表單模板設置', template_setting: '模板設置', + form_filter_setting: '表單過濾設置', + filter_setting: '過濾設置', component: '組件標題', receive_object: '接收對象', receive_fit_column: '接收對象匹配字段', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index ce23c85708..8e8dc601d4 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2904,6 +2904,8 @@ export default { receive_fit_column: '接收对象匹配字段', form_template_setting: '表单模板设置', template_setting: '模板设置', + form_filter_setting: '表单过滤设置', + filter_setting: '过滤设置', component: '组件标题', receiver: '接收人', receiver_not_null: '接收人不能为空！', diff --git a/de-xpack b/de-xpack index f18dfc4b4f..1ecd3eba40 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit f18dfc4b4f2cba91d71967a91556ad2e1d2ebcc7 +Subproject commit 1ecd3eba405c8453a30e2b9464b3dc8dd3c795f8 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java index 79c934c8cc..b140f12215 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java @@ -69,5 +69,6 @@ public class TaskInfoVO implements Serializable { private String formExtSetting; + private String formFilterSetting; }