feat(图表): 图表过滤器支持复杂的与或条件设置

sdk/api/api-base/src/main/java/io/dataease/api/chart/dto/ChartViewBaseDTO.java

@@ -3,6 +3,7 @@ package io.dataease.api.chart.dto;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.dataease.api.chart.filter.FilterTreeObj;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -120,7 +121,7 @@ public class ChartViewBaseDTO implements Serializable {
     /**
      * 结果过滤
      */
-    private List<ChartFieldCustomFilterDTO> customFilter;
+    private FilterTreeObj customFilter;
 
     /**
      * 钻取字段

sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeItem.java

@@ -0,0 +1,24 @@
+package io.dataease.api.chart.filter;
+
+import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class FilterTreeItem implements Serializable {
+    private String type;// 'item' or 'tree'
+    // item
+    private Long fieldId;
+    private DatasetTableFieldDTO field;// field object
+    private String filterType;// 'logic' or 'enum'
+    private String term;//'eq','not_eq','lt','le','gt','ge','in','not in','like','not like','null','not_null','empty','not_empty','between'
+    private String value;// 'a'
+    private List<String> enumValue;// ['a','b']
+    // tree
+    private FilterTreeObj subTree;
+}

sdk/api/api-base/src/main/java/io/dataease/api/chart/filter/FilterTreeObj.java

@@ -0,0 +1,15 @@
+package io.dataease.api.chart.filter;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * @Author Junjun
+ */
+@Data
+public class FilterTreeObj {
+    private String logic;
+    private List<FilterTreeItem> items;
+}