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

feat(仪表板): 文本下拉组件支持显示字段和排序字段设置

Browse Source
This commit is contained in:
junjun 2024-04-16 11:34:25 +08:00
parent 3c93768369
commit bbaea04325
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
View File

@ -151,6 +151,7 @@ public class ChartViewManege {
for (String func : FunctionConstant.AGG_FUNC) { for (String func : FunctionConstant.AGG_FUNC) {
if (Utils.matchFunction(func, originField)) { if (Utils.matchFunction(func, originField)) {
ele.setSummary(""); ele.setSummary("");
ele.setAgg(true);
break; break;
} }
} }

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

@ -588,7 +588,7 @@ public class DatasetDataManage {
Field2SQLObj.field2sqlObj(sqlMeta, fields, crossDs, dsMap); Field2SQLObj.field2sqlObj(sqlMeta, fields, crossDs, dsMap);
WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap); WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, fields, crossDs, dsMap);
Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap); Order2SQLObj.getOrders(sqlMeta, fields, datasetGroupInfoDTO.getSortFields(), crossDs, dsMap);
String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, true, 0, 1000); String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, 0, 1000);
querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap); querySQL = SqlUtils.rebuildSQL(querySQL, sqlMeta, crossDs, dsMap);
logger.info("calcite data enum sql: " + querySQL); logger.info("calcite data enum sql: " + querySQL);

2
sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewFieldDTO.java
View File

@ -21,4 +21,6 @@ public class ChartViewFieldDTO extends ChartViewFieldBaseDTO implements Serializ
private List<String> customSort; private List<String> customSort;
private String busiType; private String busiType;
private boolean isAgg;
} }