github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8606 from dataease/pr@dev-v2@fix_field_desc

Browse Source 
fix: 修复字段描述不展示的问题
This commit is contained in:
Junjun 2024-03-20 16:01:16 +08:00 committed by GitHub
commit a91d516444
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java
View File

@ -107,7 +107,11 @@ public class DatasetDataManage {
} }
logger.info("calcite data table field sql: " + datasourceRequest.getQuery()); logger.info("calcite data table field sql: " + datasourceRequest.getQuery());
// 获取数据源表的原始字段 // 获取数据源表的原始字段
tableFields = (List<TableField>) calciteProvider.fetchResultField(datasourceRequest).get("fields"); if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB)) {
tableFields = calciteProvider.fetchTableField(datasourceRequest);
} else {
tableFields = (List<TableField>) calciteProvider.fetchResultField(datasourceRequest).get("fields");
}
} else { } else {
// excel,api // excel,api
CoreDatasource coreDatasource = engineManage.getDeEngine(); CoreDatasource coreDatasource = engineManage.getDeEngine();
@ -119,7 +123,7 @@ public class DatasetDataManage {
datasourceRequest.setDsList(Map.of(datasourceSchemaDTO.getId(), datasourceSchemaDTO)); datasourceRequest.setDsList(Map.of(datasourceSchemaDTO.getId(), datasourceSchemaDTO));
datasourceRequest.setQuery(TableUtils.tableName2Sql(datasourceSchemaDTO, tableInfoDTO.getTable()) + " LIMIT 0 OFFSET 0"); datasourceRequest.setQuery(TableUtils.tableName2Sql(datasourceSchemaDTO, tableInfoDTO.getTable()) + " LIMIT 0 OFFSET 0");
logger.info("calcite data table field sql: " + datasourceRequest.getQuery()); logger.info("calcite data table field sql: " + datasourceRequest.getQuery());
tableFields = (List<TableField>) calciteProvider.fetchResultField(datasourceRequest).get("fields"); tableFields = calciteProvider.fetchTableField(datasourceRequest);
} }
return transFields(tableFields, true); return transFields(tableFields, true);
} }
@ -136,6 +140,7 @@ public class DatasetDataManage {
dto.setDeType(deType); dto.setDeType(deType);
dto.setGroupType(FieldUtils.transDeType2DQ(deType)); dto.setGroupType(FieldUtils.transDeType2DQ(deType));
dto.setExtField(0); dto.setExtField(0);
dto.setDescription(StringUtils.isNotEmpty(ele.getName()) ? ele.getName() : null);
return dto; return dto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }