From a8cd74434b17f3c0043dad81debd74dae1c19e20 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 12 Aug 2021 14:18:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E4=B8=8B?=
 =?UTF-8?q?=E9=92=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/custom-component/UserView.vue | 3 ---
 frontend/src/views/chart/view/ChartEdit.vue                  | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index f0ef6e4f13..e89b31708f 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -266,9 +266,6 @@ export default {
       }
     },
 
-    resetDrill() {
-      this.drillClickDimensionList = []
-    },
     drillJump(index) {
       this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index)
       this.getData(this.element.propValue.viewId)
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 555e744fa2..9ce904ffea 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)

From b2718c6c1419e23aa0c3de1305c36e0ada30c247 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 12 Aug 2021 15:11:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A0=86=E5=8F=A0=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8B=E9=92=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/chart/ChartViewService.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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))) {