From 9932908dbf026079fe8b63c710d90248ea6069cf Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 28 Jul 2021 11:06:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=99=A8=E5=A4=9A?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=97=AE=E9=A2=98=EF=BC=9B=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/chart/ChartViewService.java       | 46 +++++++++----------
 frontend/src/views/dataset/data/FieldEdit.vue |  4 +-
 2 files changed, 24 insertions(+), 26 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 0c5caffd99..845cac0d35 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -136,33 +136,29 @@ public class ChartViewService {
         }.getType());
         List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
         }.getType());
-        List<ChartCustomFilterDTO> customFilter = fieldCustomFilter.stream().map(ele -> {
-            ChartCustomFilterDTO dto = new ChartCustomFilterDTO();
-            ele.getFilter().forEach(f -> {
+        List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
+            List<ChartCustomFilterDTO> collect = ele.getFilter().stream().map(f -> {
+                ChartCustomFilterDTO dto = new ChartCustomFilterDTO();
                 BeanUtils.copyBean(dto, f);
                 dto.setField(dataSetTableFieldsService.get(f.getFieldId()));
-            });
-            return dto;
-        }).collect(Collectors.toList());
-
-//        if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
-//            xAxis = new ArrayList<>();
-//            if (CollectionUtils.isEmpty(yAxis)) {
-//                ChartViewDTO dto = new ChartViewDTO();
-//                BeanUtils.copyBean(dto, view);
-//                return dto;
-//            }
-//        } else {
-//            if (CollectionUtils.isEmpty(xAxis) || CollectionUtils.isEmpty(yAxis)) {
-//                ChartViewDTO dto = new ChartViewDTO();
-//                BeanUtils.copyBean(dto, view);
-//                return dto;
-//            }
-//        }
-        if (CollectionUtils.isEmpty(xAxis) && CollectionUtils.isEmpty(yAxis)) {
-            ChartViewDTO dto = new ChartViewDTO();
-            BeanUtils.copyBean(dto, view);
-            return dto;
+                return dto;
+            }).collect(Collectors.toList());
+            customFilter.addAll(collect);
+        }
+        if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
+            xAxis = new ArrayList<>();
+            if (CollectionUtils.isEmpty(yAxis)) {
+                ChartViewDTO dto = new ChartViewDTO();
+                BeanUtils.copyBean(dto, view);
+                return dto;
+            }
+        } else {
+            if (CollectionUtils.isEmpty(xAxis) && CollectionUtils.isEmpty(yAxis)) {
+                ChartViewDTO dto = new ChartViewDTO();
+                BeanUtils.copyBean(dto, view);
+                return dto;
+            }
         }
 
         // 过滤来自仪表板的条件
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 702b9d89a9..f230e39f7f 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -129,7 +129,9 @@ export default {
     }
   },
   watch: {
-
+    'param': function() {
+      this.initField()
+    }
   },
   mounted() {
     window.onresize = () => {