dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

8
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());
// 获取数据源表的原始字段
if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB)) {
if (StringUtils.equalsIgnoreCase(type, DatasetTableType.DB)
&& !StringUtils.equalsIgnoreCase("excel", coreDatasource.getType())
&& !StringUtils.equalsIgnoreCase("api", coreDatasource.getType())) {
datasourceRequest.setDatasource(coreDatasource);
datasourceRequest.setTable(tableInfoDTO.getTable());
tableFields = calciteProvider.fetchTableField(datasourceRequest);
} else {
tableFields = (List<TableField>) calciteProvider.fetchResultField(datasourceRequest).get("fields");
@ -123,7 +127,7 @@ public class DatasetDataManage {
datasourceRequest.setDsList(Map.of(datasourceSchemaDTO.getId(), datasourceSchemaDTO));
datasourceRequest.setQuery(TableUtils.tableName2Sql(datasourceSchemaDTO, tableInfoDTO.getTable()) + " LIMIT 0 OFFSET 0");
logger.info("calcite data table field sql: " + datasourceRequest.getQuery());
tableFields = calciteProvider.fetchTableField(datasourceRequest);
tableFields = (List<TableField>) calciteProvider.fetchResultField(datasourceRequest).get("fields");
}
return transFields(tableFields, true);
}