public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(X-Pack): [数据填报]新建表单支持绑定已有表

Browse Source 
#12788
This commit is contained in:
ulleo
2025-02-25 16:25:59 +08:00
committed by dataeaseShu
parent 8085dcdfc1
commit 7dc1ef10fd
11 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
View File

@@ -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<CoreDatasource> 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);
}

6
core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql
View File

@@ -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;
DROP PRIMARY KEY;
alter table `per_data_filling_task_sub_instance`
modify `data_id` varchar(255) null comment '数据ID';

1
core/core-backend/src/main/resources/i18n/core_en_US.properties
View File

@@ -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

3
core/core-backend/src/main/resources/i18n/core_zh_CN.properties
View File

@@ -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

3
core/core-backend/src/main/resources/i18n/core_zh_TW.properties
View File

@@ -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

5
core/core-frontend/src/locales/en.ts
View File

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

5
core/core-frontend/src/locales/tw.ts
View File

@@ -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: '顯示名稱',

6
core/core-frontend/src/locales/zh-CN.ts
View File

@@ -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: '显示名称',

2
sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DataFillingDTO.java
View File

@@ -89,5 +89,5 @@ public class DataFillingDTO implements Serializable {
private String creator;
private String updater;
private boolean useExistsTable;
}

6
sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/DfUserTaskData.java
View File

@@ -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<Long> dataIds;
//@JsonSerialize(using = LongArray2StringSerialize.class)
private List<String> dataIds;
private List<DfSubInstance> subInstances;

2
sdk/extensions/extensions-datafilling/src/main/java/io/dataease/extensions/datafilling/dto/ExtTableField.java
View File

@@ -115,6 +115,8 @@ public class ExtTableField implements Serializable {
//精度
private Integer accuracy;
private boolean useExistsTable;
}
public enum BaseType {