Merge branch 'dev' of /Users/gin/dataease/dataease with conflicts.
This commit is contained in:
junjie
parent
9bbe0af8d8
commit
18b68616ac
@ -0,0 +1,15 @@
|
||||
package io.dataease.controller.request.chart;
|
||||
|
||||
import io.dataease.dto.chart.ChartDimensionDTO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author gin
|
||||
* @Date 2021/8/10 12:25 下午
|
||||
*/
|
||||
@Data
|
||||
public class ChartDrillRequest {
|
||||
private List<ChartDimensionDTO> dimensionList;
|
||||
}
|
||||
@ -16,4 +16,5 @@ public class ChartExtRequest {
|
||||
|
||||
//联动过滤条件
|
||||
private List<ChartExtFilterRequest> linkageFilters;
|
||||
private List<ChartDrillRequest> drill;
|
||||
}
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
package io.dataease.dto.chart;
|
||||
|
||||
import io.dataease.base.domain.ChartViewWithBLOBs;
|
||||
import io.dataease.controller.request.chart.ChartDrillRequest;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@ -20,4 +22,6 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
|
||||
private Boolean isLeaf;
|
||||
private String pid;
|
||||
private String sql;
|
||||
|
||||
private List<ChartDrillRequest> dimensionList;
|
||||
}
|
||||
|
||||
@ -11,19 +11,12 @@ import io.dataease.commons.utils.AuthUtils;
|
||||
import io.dataease.commons.utils.BeanUtils;
|
||||
import io.dataease.commons.utils.CommonBeanFactory;
|
||||
import io.dataease.commons.utils.LogUtil;
|
||||
import io.dataease.controller.request.chart.ChartExtFilterRequest;
|
||||
import io.dataease.controller.request.chart.ChartExtRequest;
|
||||
import io.dataease.controller.request.chart.ChartGroupRequest;
|
||||
import io.dataease.controller.request.chart.ChartViewRequest;
|
||||
import io.dataease.controller.request.dataset.DataSetGroupRequest;
|
||||
import io.dataease.controller.request.dataset.DataSetTableRequest;
|
||||
import io.dataease.controller.request.chart.*;
|
||||
import io.dataease.datasource.provider.DatasourceProvider;
|
||||
import io.dataease.datasource.provider.ProviderFactory;
|
||||
import io.dataease.datasource.request.DatasourceRequest;
|
||||
import io.dataease.datasource.service.DatasourceService;
|
||||
import io.dataease.dto.chart.*;
|
||||
import io.dataease.dto.dataset.DataSetGroupDTO;
|
||||
import io.dataease.dto.dataset.DataSetTableDTO;
|
||||
import io.dataease.dto.dataset.DataSetTableUnionDTO;
|
||||
import io.dataease.dto.dataset.DataTableInfoDTO;
|
||||
import io.dataease.i18n.Translator;
|
||||
@ -197,6 +190,8 @@ public class ChartViewService {
|
||||
}.getType());
|
||||
List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
|
||||
}.getType());
|
||||
List<ChartViewFieldDTO> drill = new Gson().fromJson(view.getDrillFields(), new TypeToken<List<ChartViewFieldDTO>>() {
|
||||
}.getType());
|
||||
List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
|
||||
for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
|
||||
List<ChartCustomFilterDTO> collect = ele.getFilter().stream().map(f -> {
|
||||
@ -260,6 +255,38 @@ public class ChartViewService {
|
||||
}
|
||||
}
|
||||
|
||||
// 下钻
|
||||
boolean isDrill = false;
|
||||
List<ChartDrillRequest> drillRequest = requestList.getDrill();
|
||||
if (drill.size() > drillRequest.size()) {
|
||||
for (int i = 0; i < drillRequest.size(); i++) {
|
||||
ChartDrillRequest request = drillRequest.get(i);
|
||||
for (ChartDimensionDTO dto : request.getDimensionList()) {
|
||||
ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
|
||||
// 将钻取值作为条件传递，将所有钻取字段作为xAxis并加上下一个钻取字段
|
||||
if (StringUtils.equalsIgnoreCase(dto.getId(), chartViewFieldDTO.getId())) {
|
||||
isDrill = true;
|
||||
DatasetTableField datasetTableField = dataSetTableFieldsService.get(dto.getId());
|
||||
ChartViewFieldDTO d = new ChartViewFieldDTO();
|
||||
BeanUtils.copyBean(d, datasetTableField);
|
||||
|
||||
ChartExtFilterRequest drillFilter = new ChartExtFilterRequest();
|
||||
drillFilter.setFieldId(dto.getId());
|
||||
drillFilter.setValue(new ArrayList<String>() {{
|
||||
add(dto.getValue());
|
||||
}});
|
||||
drillFilter.setOperator("in");
|
||||
drillFilter.setDatasetTableField(datasetTableField);
|
||||
extFilterList.add(drillFilter);
|
||||
// xAxis.add(d);
|
||||
// if (i == drillRequest.size() - 1) {
|
||||
// xAxis.add(drill.get(i + 1));
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 获取数据集,需校验权限
|
||||
DatasetTable table = dataSetTableService.get(view.getTableId());
|
||||
if (ObjectUtils.isEmpty(table)) {
|
||||
@ -402,6 +429,11 @@ public class ChartViewService {
|
||||
BeanUtils.copyBean(dto, view);
|
||||
dto.setData(map);
|
||||
dto.setSql(datasourceRequest.getQuery());
|
||||
|
||||
if (CollectionUtils.isNotEmpty(drillRequest) && !isDrill) {
|
||||
drillRequest = drillRequest.subList(0, drillRequest.size() - 1);
|
||||
}
|
||||
dto.setDimensionList(drillRequest);
|
||||
return dto;
|
||||
}
|
||||
|
||||
|
||||
@ -64,6 +64,7 @@ export default {
|
||||
const _store = this.$store
|
||||
// 基于准备好的dom，初始化echarts实例
|
||||
// 渲染echart等待dom加载完毕,渲染之前先尝试销毁具有相同id的echart 放置多次切换仪表板有重复id情况
|
||||
const that = this
|
||||
new Promise((resolve) => { resolve() }).then(() => {
|
||||
// 此dom为echarts图标展示dom
|
||||
this.myChart = this.$echarts.getInstanceByDom(document.getElementById(this.chartId))
|
||||
@ -71,6 +72,11 @@ export default {
|
||||
this.myChart = this.$echarts.init(document.getElementById(this.chartId))
|
||||
}
|
||||
this.drawEcharts()
|
||||
|
||||
this.myChart.off('click')
|
||||
this.myChart.on('click', function(param) {
|
||||
that.$emit('onChartClick', param)
|
||||
})
|
||||
this.myChart.on('click', function(param) {
|
||||
debugger
|
||||
console.log(JSON.stringify(param.data))
|
||||
|
||||
@ -483,7 +483,7 @@
|
||||
<el-col style="height: 100%;min-width: 500px;border-top: 1px solid #E6E6E6;">
|
||||
<el-row style="width: 100%;height: 100%;" class="padding-lr">
|
||||
<div ref="imageWrapper" style="height: 100%">
|
||||
<chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :chart-id="chart.id" :chart="chart" class="chart-class" />
|
||||
<chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :chart-id="chart.id" :chart="chart" class="chart-class" @onChartClick="chartClick" />
|
||||
<table-normal v-if="httpRequest.status && chart.type && chart.type.includes('table')" :chart="chart" class="table-class" />
|
||||
<label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :chart="chart" class="table-class" />
|
||||
<div v-if="!httpRequest.status" class="chart-error-class">
|
||||
@ -738,7 +738,8 @@ export default {
|
||||
filterItem: {},
|
||||
places: [],
|
||||
attrActiveNames: [],
|
||||
styleActiveNames: []
|
||||
styleActiveNames: [],
|
||||
drillClickDimensionList: []
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -894,6 +895,7 @@ export default {
|
||||
// this.get(response.data.id);
|
||||
// this.getData(response.data.id)
|
||||
|
||||
this.resetDrill()
|
||||
if (getData) {
|
||||
this.getData(response.data.id)
|
||||
} else {
|
||||
@ -983,7 +985,8 @@ export default {
|
||||
getData(id) {
|
||||
if (id) {
|
||||
ajaxGetData(id, {
|
||||
filter: []
|
||||
filter: [],
|
||||
drill: this.drillClickDimensionList
|
||||
}).then(response => {
|
||||
this.initTableData(response.data.tableId)
|
||||
this.view = JSON.parse(JSON.stringify(response.data))
|
||||
@ -1003,8 +1006,10 @@ export default {
|
||||
if (this.chart.privileges) {
|
||||
this.param.privileges = this.chart.privileges
|
||||
}
|
||||
this.drillClickDimensionList = response.data.drillClickDimensionList ? response.data.drillClickDimensionList : []
|
||||
}).catch(err => {
|
||||
this.resetView()
|
||||
this.resetDrill()
|
||||
this.httpRequest.status = err.response.data.success
|
||||
this.httpRequest.msg = err.response.data.message
|
||||
this.$nextTick(() => {
|
||||
@ -1487,6 +1492,16 @@ export default {
|
||||
bubbleItemRemove(item) {
|
||||
this.view.extBubble.splice(item.index, 1)
|
||||
this.save(true)
|
||||
},
|
||||
|
||||
chartClick(param) {
|
||||
console.log(param)
|
||||
this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
|
||||
this.getData(this.param.id)
|
||||
},
|
||||
|
||||
resetDrill() {
|
||||
this.drillClickDimensionList = []
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user