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

Merge branch 'dev' into v1.18

Browse Source
This commit is contained in:
taojinlong 2023-03-23 18:33:55 +08:00
commit 9a2d59b3ad
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
View File

@ -645,7 +645,7 @@
last_sync_time) last_sync_time)
SELECT uuid() AS id, SELECT uuid() AS id,
chart_view_field.table_id, chart_view_field.table_id,
chart_view_field.pv_copy.chart_view_id AS chart_id, pv_copy.chart_view_id AS chart_id,
chart_view_field.origin_name, chart_view_field.origin_name,
chart_view_field.`name`, chart_view_field.`name`,
chart_view_field.dataease_name, chart_view_field.dataease_name,

9
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -879,10 +879,11 @@ public class ChartViewService {
fieldsToFilter.addAll(xAxisBase); fieldsToFilter.addAll(xAxisBase);
} }
ChartDrillRequest head = drillRequestList.get(0); ChartDrillRequest head = drillRequestList.get(0);
Map<String, String> dimValMap = head.getDimensionList().stream().collect(Collectors.toMap(ChartDimensionDTO::getId, ChartDimensionDTO::getValue, ((p, n) -> p))); Map<String, String> dimValMap = new HashMap<>();
Map<String, ChartViewFieldDTO> fieldMap = Stream.of(xAxisBase, xAxisExt, extStack). head.getDimensionList().forEach(item -> dimValMap.put(item.getId(), item.getValue()));
flatMap(Collection::stream). Map<String, ChartViewFieldDTO> fieldMap = Stream.of(xAxisBase, xAxisExt, extStack)
collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p))); .flatMap(Collection::stream)
.collect(Collectors.toMap(ChartViewFieldDTO::getId, o -> o, ((p, n) -> p)));
for (int i = 0; i < drillRequestList.size(); i++) { for (int i = 0; i < drillRequestList.size(); i++) {
ChartDrillRequest request = drillRequestList.get(i); ChartDrillRequest request = drillRequestList.get(i);
ChartViewFieldDTO chartViewFieldDTO = drill.get(i); ChartViewFieldDTO chartViewFieldDTO = drill.get(i);

8
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1168,8 +1168,12 @@ public class DataSetTableService {
binaryExpression = (BinaryExpression) expr; binaryExpression = (BinaryExpression) expr;
} catch (Exception e) { } catch (Exception e) {
} }
if (binaryExpression != null && !(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getRightExpression() instanceof BinaryExpression) && hasVariable(binaryExpression.toString())) { if (binaryExpression != null) {
stringBuilder.append(SubstitutedSql); if (!(binaryExpression.getLeftExpression() instanceof BinaryExpression) && !(binaryExpression.getLeftExpression() instanceof InExpression) && hasVariable(binaryExpression.getRightExpression().toString())) {
stringBuilder.append(SubstitutedSql);
}else {
expr.accept(getExpressionDeParser(stringBuilder));
}
} else { } else {
expr.accept(getExpressionDeParser(stringBuilder)); expr.accept(getExpressionDeParser(stringBuilder));
} }

4
frontend/src/components/elVisualSelect/index.vue
View File

@ -270,7 +270,5 @@ export default {
.select-all { .select-all {
padding: 10px 20px 0 20px; padding: 10px 20px 0 20px;
} }
.coustom-de-select {
z-index: 999 !important;
}
</style> </style>

8
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -463,14 +463,6 @@
> >
<template #header> <template #header>
{{ $t('commons.params_value') }} {{ $t('commons.params_value') }}
<el-tooltip
class="item"
effect="dark"
:content="$t('commons.parameter_effect')"
placement="top"
>
<svg-icon icon-class="icon_info_filled" />
</el-tooltip>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input

12
frontend/src/views/panel/filter/FilterDialog.vue
View File

@ -567,6 +567,7 @@ export default {
const data = res.data const data = res.data
this.viewInfos = data this.viewInfos = data
this.updateParentName()
this.childViews.viewInfos = data this.childViews.viewInfos = data
}) })
var type = 'TEXT' var type = 'TEXT'
@ -582,6 +583,17 @@ export default {
this.childViews.datasetParams = data this.childViews.datasetParams = data
}) })
}, },
updateParentName() {
if (this.fieldsParent && this.viewInfos?.length && this.activeName !== 'dataset') {
this.viewInfos.forEach(info => {
if (info.id === this.fieldsParent.id && info.name !== this.fieldsParent.name) {
this.fieldsParent.name = info.name
this.comBackLink(this.fieldsParent)
this.comShowFieldData(this.fieldsParent)
}
})
}
},
handleNodeClick(data) { handleNodeClick(data) {
if (data.modelInnerType !== 'group') { if (data.modelInnerType !== 'group') {
this.showFieldData(data) this.showFieldData(data)