fix: 过滤器多条件问题；视图编辑字段问题

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -136,34 +136,30 @@ public class ChartViewService {
         }.getType());
         List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
         }.getType());
-        List<ChartCustomFilterDTO> customFilter = fieldCustomFilter.stream().map(ele -> {
+        List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
+            List<ChartCustomFilterDTO> collect = ele.getFilter().stream().map(f -> {
                 ChartCustomFilterDTO dto = new ChartCustomFilterDTO();
-            ele.getFilter().forEach(f -> {
                 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;
-//            }
-//        }
+            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;
             }
+        }
 
         // 过滤来自仪表板的条件
         List<ChartExtFilterRequest> extFilterList = new ArrayList<>();

frontend/src/views/dataset/data/FieldEdit.vue

@@ -129,7 +129,9 @@ export default {
     }
   },
   watch: {
-
+    'param': function() {
+      this.initField()
+    }
   },
   mounted() {
     window.onresize = () => {