center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev@panal_map_drill

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-08-12 15:16:10 +08:00 committed by GitHub
commit 30d70b9d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,6 +696,9 @@ public class ChartViewService {
String stackColumn = row[xAxis.size()]; String stackColumn = row[xAxis.size()];
if (StringUtils.equals(ss.getName(), stackColumn)) { if (StringUtils.equals(ss.getName(), stackColumn)) {
StringBuilder a = new StringBuilder(); StringBuilder a = new StringBuilder();
if (isDrill) {
a.append(row[xAxis.size() - 1]);
} else {
for (int j = 0; j < xAxis.size(); j++) { for (int j = 0; j < xAxis.size(); j++) {
if (j == xAxis.size() - 1) { if (j == xAxis.size() - 1) {
a.append(row[j]); a.append(row[j]);
@ -703,6 +706,7 @@ public class ChartViewService {
a.append(row[j]).append("\n"); a.append(row[j]).append("\n");
} }
} }
}
if (StringUtils.equals(a.toString(), x.get(i))) { if (StringUtils.equals(a.toString(), x.get(i))) {
if (row.length > xAxis.size() + extStack.size()) { if (row.length > xAxis.size() + extStack.size()) {
List<ChartDimensionDTO> dimensionList = new ArrayList<>(); List<ChartDimensionDTO> dimensionList = new ArrayList<>();

2
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -267,6 +267,7 @@ export default {
} }
}, },
resetDrill() { resetDrill() {
const length = this.drillClickDimensionList.length const length = this.drillClickDimensionList.length
this.drillClickDimensionList = [] this.drillClickDimensionList = []
@ -274,6 +275,7 @@ export default {
this.backToParent(0, length) this.backToParent(0, length)
} }
}, },
drillJump(index) { drillJump(index) {
const length = this.drillClickDimensionList.length const length = this.drillClickDimensionList.length
this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index) this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index)

4
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -757,10 +757,10 @@ export default {
}, },
watch: { watch: {
'param': function() { 'param': function() {
this.resetDrill()
if (this.param.optType === 'new') { if (this.param.optType === 'new') {
// //
} else { } else {
this.resetDrill()
this.getData(this.param.id) this.getData(this.param.id)
} }
}, },
@ -909,8 +909,8 @@ export default {
// this.get(response.data.id); // this.get(response.data.id);
// this.getData(response.data.id) // this.getData(response.data.id)
this.resetDrill()
if (getData) { if (getData) {
this.resetDrill()
this.getData(response.data.id) this.getData(response.data.id)
} else { } else {
this.getChart(response.data.id) this.getChart(response.data.id)