From 0ebcd24490469033b83861b2e60cce2b0e933600 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 22 Nov 2024 18:49:19 +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]=E7=94=A8=E6=88=B7=E5=A1=AB=E6=8A=A5=E5=A4=9A?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BF=AB=E9=80=9F=E7=A1=AE=E8=AE=A4=E5=AE=8C=E6=88=90=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/i18n/core_en_US.properties | 4 +++ .../main/resources/i18n/core_zh_CN.properties | 4 +++ .../main/resources/i18n/core_zh_TW.properties | 4 +++ core/core-frontend/src/locales/en.ts | 1 + core/core-frontend/src/locales/tw.ts | 1 + core/core-frontend/src/locales/zh-CN.ts | 1 + .../datafilling/dto/ExtFormSettings.java | 36 +++++++++++++++++++ 7 files changed, 51 insertions(+) create mode 100644 sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java diff --git a/core/core-backend/src/main/resources/i18n/core_en_US.properties b/core/core-backend/src/main/resources/i18n/core_en_US.properties index 088c0e13d7..c3e65682d8 100644 --- a/core/core-backend/src/main/resources/i18n/core_en_US.properties +++ b/core/core-backend/src/main/resources/i18n/core_en_US.properties @@ -103,6 +103,10 @@ i18n_df_decimal=decimal i18n_df_multiple_value_split=use ';' to split multiple value i18n_df_email_type=email type i18n_df_phone_type=phone type +i18n_df_lt_check=need less than %s: %s +i18n_df_gt_check=need greater than %s: %s +i18n_df_le_check=need less than or equal to %s: %s +i18n_df_ge_check=need greater than or equal to %s: %s diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 91c260a425..8eec27e3a4 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -123,6 +123,10 @@ i18n_df_decimal=\u5C0F\u6570\u6570\u5B57 i18n_df_multiple_value_split=\u591A\u4E2A\u503C\u4F7F\u7528\u5206\u53F7";"\u5206\u5272 i18n_df_email_type=\u90AE\u7BB1\u683C\u5F0F i18n_df_phone_type=\u624B\u673A\u53F7\u683C\u5F0F +i18n_df_lt_check=\u503C\u9700\u8981\u5C0F\u4E8E %s: %s +i18n_df_gt_check=\u503C\u9700\u8981\u5927\u4E8E %s: %s +i18n_df_le_check=\u503C\u9700\u8981\u5C0F\u4E8E\u7B49\u4E8E %s: %s +i18n_df_ge_check=\u503C\u9700\u8981\u5927\u4E8E\u7B49\u4E8E %s: %s diff --git a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties index fb41f15197..af514bbe63 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties @@ -123,6 +123,10 @@ i18n_df_decimal=\u5C0F\u6578\u6578\u5B57 i18n_df_multiple_value_split=\u591A\u500B\u503C\u4F7F\u7528\u5206\u865F";"\u5206\u5272 i18n_df_email_type=\u90F5\u7BB1\u683C\u5F0F i18n_df_phone_type=\u624B\u6A5F\u865F\u683C\u5F0F +i18n_df_lt_check=\u503C\u9700\u8981\u5C0F\u4E8E %s: %s +i18n_df_gt_check=\u503C\u9700\u8981\u5927\u4E8E %s: %s +i18n_df_le_check=\u503C\u9700\u8981\u5C0F\u4E8E\u7B49\u4E8E %s: %s +i18n_df_ge_check=\u503C\u9700\u8981\u5927\u4E8E\u7B49\u4E8E %s: %s diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 2869da3053..bffff6860d 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -3627,6 +3627,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr exporting: 'Backend export in progress, can go to', progress_to_download: 'Check progress and download', form: { + confirm_to_mark_as_complete: 'Confirm to mark as complete?', mobile_number_format_is_incorrect: 'Mobile number format is incorrect', email_format_is_incorrect: 'Email format is incorrect', name: 'Name', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 12bc4c8efd..88d20438c6 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -3536,6 +3536,7 @@ export default { exporting: '後台導出中,可前往', progress_to_download: '查看進度，進行下載', form: { + confirm_to_mark_as_complete: '確認標記為完成?', mobile_number_format_is_incorrect: '手機號碼格式不正確', email_format_is_incorrect: '郵件格式不正確', name: '名稱', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index b9289c8cd8..c2beecc97a 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -3539,6 +3539,7 @@ export default { exporting: '后台导出中,可前往', progress_to_download: '查看进度，进行下载', form: { + confirm_to_mark_as_complete: '确认标记为完成?', mobile_number_format_is_incorrect: '手机号码格式不正确', email_format_is_incorrect: '邮箱格式不正确', name: '名称', diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java new file mode 100644 index 0000000000..1b2fe57b44 --- /dev/null +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtFormSettings.java @@ -0,0 +1,36 @@ +package io.dataease.extensions.datafilling.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ExtFormSettings implements Serializable { + + @Serial + private static final long serialVersionUID = -6236922011567180831L; + + private String id; + private boolean disable; + private List numberInputRules; + + @Data + @Builder + @AllArgsConstructor + @NoArgsConstructor + public static class NumberRule implements Serializable { + @Serial + private static final long serialVersionUID = -8841727448573594811L; + private String column; + private String term; + + } +}