diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 3ab743ceb9..206eaf5eee 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -696,11 +696,15 @@ public class ChartViewService { String stackColumn = row[xAxis.size()]; if (StringUtils.equals(ss.getName(), stackColumn)) { StringBuilder a = new StringBuilder(); - for (int j = 0; j < xAxis.size(); j++) { - if (j == xAxis.size() - 1) { - a.append(row[j]); - } else { - a.append(row[j]).append("\n"); + if (isDrill) { + a.append(row[xAxis.size() - 1]); + } else { + for (int j = 0; j < xAxis.size(); j++) { + if (j == xAxis.size() - 1) { + a.append(row[j]); + } else { + a.append(row[j]).append("\n"); + } } } if (StringUtils.equals(a.toString(), x.get(i))) { diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 3c617c39a2..4e91e732eb 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -267,6 +267,7 @@ export default { } }, + resetDrill() { const length = this.drillClickDimensionList.length this.drillClickDimensionList = [] @@ -274,6 +275,7 @@ export default { this.backToParent(0, length) } }, + drillJump(index) { const length = this.drillClickDimensionList.length this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 9b44803d6a..e8e0746700 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -757,10 +757,10 @@ export default { }, watch: { 'param': function() { - this.resetDrill() if (this.param.optType === 'new') { // } else { + this.resetDrill() this.getData(this.param.id) } }, @@ -909,8 +909,8 @@ export default { // this.get(response.data.id); // this.getData(response.data.id) - this.resetDrill() if (getData) { + this.resetDrill() this.getData(response.data.id) } else { this.getChart(response.data.id)