Merge branch 'dev' into pr@dev@panal_map_drill

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 (isDrill) {
-                                if (j == xAxis.size() - 1) {
+                                a.append(row[xAxis.size() - 1]);
-                                    a.append(row[j]);
+                            } else {
-                                } else {
+                                for (int j = 0; j < xAxis.size(); j++) {
-                                    a.append(row[j]).append("\n");
+                                    if (j == xAxis.size() - 1) {
+                                        a.append(row[j]);
+                                    } else {
+                                        a.append(row[j]).append("\n");
+                                    }
                                 }
                             }
                             if (StringUtils.equals(a.toString(), x.get(i))) {

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)

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)