From 60b0f9c124f9d2fe13e2457f38dff16e7b4525b4 Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 14 Jan 2025 17:18:10 +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]=E5=8D=95=E9=80=89=E5=92=8C=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/auto-imports.d.ts | 5 +++- core/core-frontend/src/locales/en.ts | 4 +++ core/core-frontend/src/locales/tw.ts | 4 +++ core/core-frontend/src/locales/zh-CN.ts | 4 +++ .../api/xpack/dataFilling/DataFillingApi.java | 3 +++ .../xpack/dataFilling/dto/ExtraDetails.java | 25 ++++++++++++++++++ .../dataFilling/dto/ExtraDetailsRequest.java | 26 +++++++++++++++++++ .../datafilling/provider/ExtDDLProvider.java | 2 ++ 8 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java diff --git a/core/core-frontend/auto-imports.d.ts b/core/core-frontend/auto-imports.d.ts index 918aad8808..4b8291902a 100644 --- a/core/core-frontend/auto-imports.d.ts +++ b/core/core-frontend/auto-imports.d.ts @@ -4,5 +4,8 @@ // Generated by unplugin-auto-import export {} declare global { - + const ElForm: typeof import('element-plus-secondary/es')['ElForm'] + const ElFormItem: typeof import('element-plus-secondary/es')['ElFormItem'] + const ElInput: typeof import('element-plus-secondary/es')['ElInput'] + const ElMessageBox: typeof import('element-plus-secondary/es')['ElMessageBox'] } diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 7c20b65a0d..b5216cd40e 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4126,6 +4126,10 @@ 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: { + add_detail_columns: 'Add column details', + detail_columns: 'Column details', + display_name: 'Display Name', + show_more_detail: 'Show more', 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', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 2007d4cc57..ce32a7c875 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4012,6 +4012,10 @@ export default { exporting: '後台導出中,可前往', progress_to_download: '查看進度，進行下載', form: { + add_detail_columns: '添加字段描述', + detail_columns: '字段描述', + display_name: '顯示名稱', + show_more_detail: '查看更多', confirm_to_mark_as_complete: '確認標記為完成?', mobile_number_format_is_incorrect: '手機號碼格式不正確', email_format_is_incorrect: '郵件格式不正確', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index d78c4789f1..884412d742 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4016,6 +4016,10 @@ export default { exporting: '后台导出中,可前往', progress_to_download: '查看进度，进行下载', form: { + add_detail_columns: '添加字段描述', + detail_columns: '字段描述', + display_name: '显示名称', + show_more_detail: '查看更多', confirm_to_mark_as_complete: '确认标记为完成?', mobile_number_format_is_incorrect: '手机号码格式不正确', email_format_is_incorrect: '邮箱格式不正确', 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 588655eb3f..d11d531a84 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 @@ -57,6 +57,9 @@ public interface DataFillingApi { @PostMapping("/form/{optionDatasource}/options") List listColumnData(@PathVariable("optionDatasource") Long optionDatasource, @RequestBody DatasourceOptionsRequest request) throws Exception; + @PostMapping("/form/{id}/extraDetails") + List extraDetails(@PathVariable("id") Long formId, @RequestBody ExtraDetailsRequest request) throws Exception; + @PostMapping("/form/{id}/tableData") DataFillFormTableDataResponse tableData(@PathVariable("id") Long id, @RequestBody DataFillFormTableDataRequest request) throws Exception; diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java new file mode 100644 index 0000000000..3eddbe9e29 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetails.java @@ -0,0 +1,25 @@ +package io.dataease.api.xpack.dataFilling.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Accessors(chain = true) +public class ExtraDetails implements Serializable { + + @Serial + private static final long serialVersionUID = -7249780247687230185L; + + private String name; + + private Object value; +} diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java new file mode 100644 index 0000000000..56cb955fa2 --- /dev/null +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/ExtraDetailsRequest.java @@ -0,0 +1,26 @@ +package io.dataease.api.xpack.dataFilling.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + +@Data +@Accessors(chain = true) +public class ExtraDetailsRequest { + + @JsonSerialize(using = ToStringSerializer.class) + private Long optionDatasource; + private String optionTable; + private String optionColumn; + private List extraColumns; + private String value; + + @Data + public static class ExtraColumnItem { + private String fieldName; + private String displayName; + } +} diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java index 7efbea81db..abe7358afd 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/provider/ExtDDLProvider.java @@ -27,6 +27,8 @@ public abstract class ExtDDLProvider { public abstract String searchColumnData(String table, String column, String order); + public abstract String searchColumnRowDataOne(String table, List searchFields, TableFieldWithValue tableFieldWithValue); + public abstract String countSql(String table, String whereSql); public abstract String dropTableSql(String table);