Merge pull request #12764 from ulleo/dev-v2

feat(X-Pack): 数据填报按条件下发数据增加条件过滤功能

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',

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: '接收對象匹配字段',

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: '接收人不能为空！',

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;
 
 }