From 7dc1ef10fd5616310f036c7b7c33138c18dbed67 Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 25 Feb 2025 16:25:59 +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=96=B0=E5=BB=BA=E8=A1=A8=E5=8D=95=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=BB=91=E5=AE=9A=E5=B7=B2=E6=9C=89=E8=A1=A8=20#12788?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/datasource/manage/DataSourceManage.java | 8 +++++++- .../src/main/resources/db/migration/V2.10.6__ddl.sql | 6 +++++- .../src/main/resources/i18n/core_en_US.properties | 1 + .../src/main/resources/i18n/core_zh_CN.properties | 3 ++- .../src/main/resources/i18n/core_zh_TW.properties | 3 ++- core/core-frontend/src/locales/en.ts | 5 +++++ core/core-frontend/src/locales/tw.ts | 5 +++++ core/core-frontend/src/locales/zh-CN.ts | 6 ++++++ .../api/xpack/dataFilling/dto/DataFillingDTO.java | 2 +- .../api/xpack/dataFilling/dto/DfUserTaskData.java | 6 +++--- .../extensions/datafilling/dto/ExtTableField.java | 2 ++ 11 files changed, 39 insertions(+), 8 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java index 61322e95cc..970f93441c 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java @@ -48,6 +48,9 @@ public class DataSourceManage { @Resource private CoreDatasourceExtMapper coreDatasourceExtMapper; + @Resource + private EngineManage engineManage; + private DatasourceNodeBO rootNode() { return new DatasourceNodeBO(0L, "root", false, 7, -1L, 0, "mysql"); } @@ -95,7 +98,7 @@ public class DataSourceManage { } public void checkName(DatasourceDTO dto) { - if(StringUtils.isEmpty(dto.getName()) || StringUtils.isEmpty(dto.getName().trim())){ + if (StringUtils.isEmpty(dto.getName()) || StringUtils.isEmpty(dto.getName().trim())) { DEException.throwException(Translator.get("i18n_df_name_can_not_empty")); } QueryWrapper wrapper = new QueryWrapper<>(); @@ -182,6 +185,9 @@ public class DataSourceManage { @XpackInteract(value = "datasourceResourceTree", before = false) public CoreDatasource getCoreDatasource(Long id) { + if (id == -1L) { + return engineManage.getDeEngine(); + } return coreDatasourceMapper.selectById(id); } diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql index bfd3066ded..e995940a20 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql @@ -5,4 +5,8 @@ ALTER TABLE `core_dataset_table_field` ADD COLUMN `other_group` longtext NULL COMMENT '未分组的值' AFTER `group_list`; ALTER TABLE `visualization_report_filter` -DROP PRIMARY KEY; \ No newline at end of file +DROP PRIMARY KEY; + + +alter table `per_data_filling_task_sub_instance` + modify `data_id` varchar(255) null comment '数据ID'; 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 7c4ebff7e5..13c7b0270f 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 @@ -129,6 +129,7 @@ i18n_df_lt_check=Value needs to be less than %s: %s i18n_df_gt_check=Value needs to be greater than %s: %s i18n_df_le_check=Value needs to be less than or equal to %s: %s i18n_df_ge_check=Value needs to be greater than or equal to %s: %s +i18n_df_column_exists=The column: %s exists i18n_wrong_email=Email format is incorrect i18n_wrong_tel=Phone number format is incorrect 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 9332882765..e7122b897b 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 @@ -128,6 +128,7 @@ 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 +i18n_df_column_exists=\u5B57\u6BB5: %s \u5DF2\u5B58\u5728 i18n_wrong_email=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF i18n_wrong_tel=\u624B\u673A\u53F7\u7801\u683C\u5F0F\u9519\u8BEF @@ -200,4 +201,4 @@ i18n_geo_sub_exists=\u5DF2\u5B58\u5728\u540C\u540D\u5B50\u533A\u57DF\uFF01 i18n_user_new_pwd_error=\u5BC6\u7801\u683C\u5F0F\uFF1A8-20\u4F4D\u4E14\u81F3\u5C11\u4E00\u4F4D\u5927\u5199\u5B57\u6BCD\u3001\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u7279\u6B8A\u5B57\u7B26 i18n_user_pwd_same_error=\u65B0\u65E7\u5BC6\u7801\u4E0D\u80FD\u76F8\u540C -i18n_copilot_ds=\u5f53\u524d\u4ec5\u652f\u6301MySQL\u6570\u636e\u6e90 +i18n_copilot_ds=\u5F53\u524D\u4EC5\u652F\u6301MySQL\u6570\u636E\u6E90 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 bd6230f835..030a292c3a 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 @@ -128,6 +128,7 @@ i18n_df_lt_check=\u503C\u9700\u8981\u5C0F\u65BC %s: %s i18n_df_gt_check=\u503C\u9700\u8981\u5927\u65BC %s: %s i18n_df_le_check=\u503C\u9700\u8981\u5C0F\u65BC\u7B49\u65BC %s: %s i18n_df_ge_check=\u503C\u9700\u8981\u5927\u65BC\u7B49\u65BC %s: %s +i18n_df_column_exists=\u5B57\u6BB5: %s \u5DF2\u5B58\u5728 i18n_wrong_email=\u90F5\u7BB1\u683C\u5F0F\u932F\u8AA4 i18n_wrong_tel=\u624B\u6A5F\u865F\u78BC\u683C\u5F0F\u932F\u8AA4 @@ -200,4 +201,4 @@ i18n_geo_sub_exists=\u5DF2\u5B58\u5728\u540C\u540D\u5B50\u5340\u57DF\uFF01 i18n_user_new_pwd_error=\u5BC6\u78BC\u683C\u5F0F\uFF1A8-20\u4F4D\u4E14\u81F3\u5C11\u4E00\u4F4D\u5927\u5BEB\u5B57\u6BCD\u3001\u5C0F\u5BEB\u5B57\u6BCD\u3001\u6578\u5B57\u3001\u7279\u6B8A\u5B57\u7B26 i18n_user_pwd_same_error=\u65B0\u820A\u5BC6\u78BC\u4E0D\u80FD\u76F8\u540C -i18n_copilot_ds=\u7576\u524d\u50c5\u652f\u6301MySQL\u6578\u64da\u6e90 +i18n_copilot_ds=\u7576\u524D\u50C5\u652F\u6301MySQL\u6578\u64DA\u6E90 diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index c54568def8..92631334a4 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -4176,6 +4176,11 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr confirm_truncate_table: 'Confirm to truncate table?', add_search_condition: 'Add search condition', form: { + create_type: 'Create type', + create_new_table: 'Create new table', + bind_exists_table: 'Bind exists table', + create_new_column: 'Create column', + select_exists_column: 'Bind column', add_detail_columns: 'Add column details', detail_columns: 'Column details', display_name: 'Display Name', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 4f71a18b04..952d19fda9 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -4061,6 +4061,11 @@ export default { confirm_truncate_table: '確定要清空數據嗎？', add_search_condition: '添加篩選條件', form: { + create_type: '創建方式', + create_new_table: '創建新表', + bind_exists_table: '綁定已有表', + create_new_column: '新建字段', + select_exists_column: '綁定字段', add_detail_columns: '添加字段描述', detail_columns: '字段描述', display_name: '顯示名稱', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 2343e80a87..2a5c0eb841 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -4065,6 +4065,12 @@ export default { confirm_truncate_table: '确定要清空数据吗？', add_search_condition: '添加筛选条件', form: { + create_type: '创建方式', + create_new_table: '创建新表', + bind_exists_table: '绑定已有表', + create_new_column: '新建字段', + select_exists_column: '绑定字段', + table_primary_key_not_exists: '此表不存在主键，不支持关联', add_detail_columns: '添加字段描述', detail_columns: '字段描述', display_name: '显示名称', diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java index b80739be52..6b76ad517f 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java @@ -89,5 +89,5 @@ public class DataFillingDTO implements Serializable { private String creator; private String updater; - + private boolean useExistsTable; } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java index 8bce741982..f1f98b774e 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java @@ -33,7 +33,7 @@ public class DfUserTaskData implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long formId; @JsonSerialize(using = ToStringSerializer.class) - private Long dataId; + private String dataId; private Long finishTime; private Integer status; @@ -43,8 +43,8 @@ public class DfUserTaskData implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long formId; private String formTitle; - @JsonSerialize(using = LongArray2StringSerialize.class) - private List dataIds; + //@JsonSerialize(using = LongArray2StringSerialize.class) + private List dataIds; private List subInstances; diff --git a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java index 4425285d5d..23291ba13b 100644 --- a/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java +++ b/sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java @@ -115,6 +115,8 @@ public class ExtTableField implements Serializable { //精度 private Integer accuracy; + private boolean useExistsTable; + } public enum BaseType {