Merge branch 'dev' into pr@dev@refactor_filter_default_value

backend/pom.xml

@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backend</artifactId>
-    
+
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -207,7 +207,7 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.5</version>
+            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -419,19 +419,19 @@
     </build>
 
     <repositories>
-    <repository>
-        <id>pentaho-public</id>
-        <name>Pentaho Public</name>
-        <url>http://nexus.pentaho.org/content/groups/omni</url>
-        <releases>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-        </releases>
-        <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-        </snapshots>
-    </repository>
+        <repository>
+            <id>pentaho-public</id>
+            <name>Pentaho Public</name>
+            <url>http://nexus.pentaho.org/content/groups/omni</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
     </repositories>
 
 </project>

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java

@@ -9,4 +9,5 @@ public interface ExtDataSetTableMapper {
     List<DataSetTableDTO> search(DataSetTableRequest request);
 
     DataSetTableDTO searchOne(DataSetTableRequest request);
+
 }

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml

@@ -7,6 +7,12 @@
         <result column="privileges" property="privileges"/>
     </resultMap>
 
+
+    <resultMap id="roleItemMap" type="io.dataease.controller.sys.response.RoleUserItem">
+        <id property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
     <select id="searchOne" resultMap="BaseResultMapDTO">
         select
         id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
@@ -93,4 +99,5 @@
         </where>
         ORDER BY CONVERT(`name` using gbk)
     </select>
+
 </mapper>

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml

@@ -12,6 +12,7 @@
     <resultMap id="LinkJumpInfoMap" type="io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO" extends="io.dataease.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap">
         <result column="source_field_id" jdbcType="VARCHAR" property="sourceFieldId"/>
         <result column="source_field_name" jdbcType="VARCHAR" property="sourceFieldName"/>
+        <result column="publicJumpId" jdbcType="VARCHAR" property="publicJumpId"/>
         <collection property="targetViewInfoList" ofType="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
             <result column="target_view_id" jdbcType="VARCHAR" property="targetViewId"/>
             <result column="target_field_id" jdbcType="VARCHAR" property="targetFieldId"/>
@@ -35,6 +36,7 @@
             panel_link_jump_info.jump_type,
             panel_link_jump_info.target_panel_id,
             panel_link_jump_info.content,
+            panel_link_mapping.id as publicJumpId,
             ifnull( panel_link_jump_info.checked, 0 ) AS checked,
             panel_link_jump_target_view_info.target_view_id,
             panel_link_jump_target_view_info.target_field_id
@@ -45,6 +47,7 @@
             LEFT JOIN panel_link_jump_info ON panel_link_jump.id = panel_link_jump_info.link_jump_id
             AND dataset_table_field.id = panel_link_jump_info.source_field_id
             LEFT JOIN panel_link_jump_target_view_info ON panel_link_jump_info.id = panel_link_jump_target_view_info.link_jump_info_id
+            LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
         WHERE
             chart_view.id =#{source_view_id}
         ORDER BY

backend/src/main/java/io/dataease/dto/chart/ChartFieldCustomFilterDTO.java

@@ -1,5 +1,6 @@
 package io.dataease.dto.chart;
 
+import io.dataease.base.domain.DatasetTableField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +13,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ChartFieldCustomFilterDTO implements Serializable {
+public class ChartFieldCustomFilterDTO extends ChartViewFieldBaseDTO implements Serializable {
     private List<ChartCustomFilterItemDTO> filter;
+
+    private DatasetTableField field;
 }

backend/src/main/java/io/dataease/dto/chart/ChartViewFieldBaseDTO.java

@@ -0,0 +1,51 @@
+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author gin
+ * @Date 2021/3/11 1:18 下午
+ */
+@Data
+public class ChartViewFieldBaseDTO implements Serializable {
+    private String id;
+
+    private String tableId;
+
+    private String originName;
+
+    private String dataeaseName;
+
+    private String name;
+
+    private String type;
+
+    private Boolean checked;
+
+    private Integer columnIndex;
+
+    private Long lastSyncTime;
+
+    private Integer deType;
+
+    private String summary;
+
+    private String sort;
+
+    private Integer deExtractType;
+
+    private String dateStyle;
+
+    private String datePattern;
+
+    private Integer extField;
+
+    private String chartType;
+
+    private ChartFieldCompareDTO compareCalc;
+
+    private String logic;
+}

backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java

@@ -10,42 +10,6 @@ import java.util.List;
  * @Date 2021/3/11 1:18 下午
  */
 @Data
-public class ChartViewFieldDTO implements Serializable {
-    private String id;
-
-    private String tableId;
-
-    private String originName;
-
-    private String dataeaseName;
-
-    private String name;
-
-    private String type;
-
-    private Boolean checked;
-
-    private Integer columnIndex;
-
-    private Long lastSyncTime;
-
-    private Integer deType;
-
-    private String summary;
-
-    private String sort;
-
+public class ChartViewFieldDTO extends ChartViewFieldBaseDTO implements Serializable {
     private List<ChartViewFieldFilterDTO> filter;
-
-    private Integer deExtractType;
-
-    private String dateStyle;
-
-    private String datePattern;
-
-    private Integer extField;
-
-    private String chartType;
-
-    private ChartFieldCompareDTO compareCalc;
 }

backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java

@@ -19,6 +19,9 @@ public class PanelLinkJumpInfoDTO extends PanelLinkJumpInfo {
 
     private String sourceJumpInfo;
 
+    //存在公共链接的目标仪表板
+    private String publicJumpId;
+
     private List<PanelLinkJumpTargetViewInfo> targetViewInfoList=new ArrayList<>();// linkType = inner 时使用
 
 

backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java

@@ -0,0 +1,39 @@
+package io.dataease.plugins.server;
+
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.xpack.auth.dto.request.DataSetRowPermissionsDTO;
+import io.dataease.plugins.xpack.auth.dto.request.DatasetRowPermissions;
+import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetailDTO;
+import io.dataease.plugins.xpack.auth.service.RowPermissionService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("plugin/dataset/rowPermissions")
+public class RowPermissionsController {
+
+    @ApiOperation("保存")
+    @PostMapping("save")
+    public void save(@RequestBody DatasetRowPermissions datasetRowPermissions) throws Exception {
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+        rowPermissionService.save(datasetRowPermissions);
+    }
+
+    @ApiOperation("分页查询")
+    @PostMapping("/list")
+    public List<DataSetRowPermissionsDTO> rowPermissions(@RequestBody XpackSysAuthDetailDTO request) {
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+       return rowPermissionService.searchRowPermissions(request);
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("/delete/{id}")
+    public void dataSetRowPermissionInfo(@PathVariable String id) {
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+        rowPermissionService.delete(id);
+    }
+
+}

backend/src/main/java/io/dataease/plugins/server/XAuthServer.java

@@ -41,7 +41,15 @@ public class XAuthServer {
     @I18n
     public List<XpackSysAuthDetail>authDetailsModel(@PathVariable String authType){
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
-        return sysAuthService.searchAuthDetailsModel(authType);
+        List<XpackSysAuthDetail> authDetails =  sysAuthService.searchAuthDetailsModel(authType);
+        if(authType.equalsIgnoreCase("dataset")){
+            XpackSysAuthDetail xpackSysAuthDetail = new XpackSysAuthDetail();
+            xpackSysAuthDetail.setPrivilegeName("i18n_auth_row_permission");
+            xpackSysAuthDetail.setPrivilegeType(20);
+            xpackSysAuthDetail.setPrivilegeValue(1);
+            authDetails.add(0,xpackSysAuthDetail);
+        }
+        return authDetails;
     }
 
     @PostMapping("/authChange")

backend/src/main/java/io/dataease/provider/query/QueryProvider.java

@@ -5,9 +5,9 @@ import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.datasource.JdbcConfiguration;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.pg.PgConstants;
 
@@ -23,52 +23,43 @@ public abstract class QueryProvider {
 
     public abstract String createSQLPreview(String sql, String orderBy);
 
-    public abstract String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds);
+    public abstract String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup);
+    public abstract String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds);
+    public abstract String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup);
+    public abstract String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds);
+    public abstract String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup);
+    public abstract String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
 
-    public abstract String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view);
 
-    public abstract String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view);
 
     public abstract String searchTable(String table);
 
-    public abstract String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
+    public abstract String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
 
     public Integer transFieldSize(String type) {
         return 50;
     }
 
-    /**
-     * 单指标汇总
-     *
-     * @param sql
-     * @param yAxis
-     * @param customFilter
-     * @param extFilterRequestList
-     * @return
-     */
-    public abstract String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
+    public abstract String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
 
     public abstract String wrapSql(String sql);
 
@@ -84,7 +75,19 @@ public abstract class QueryProvider {
         }
     }
 
-    public String convertTableToSql(String tableName, Datasource ds){
+    public String convertTableToSql(String tableName, Datasource ds) {
         return "select * from  TABLE_NAME".replace("TABLE_NAME", tableName);
     }
+
+    public String getLogic(String logic) {
+        if (logic != null) {
+            switch (logic) {
+                case "and":
+                    return "AND";
+                case "or":
+                    return "OR";
+            }
+        }
+        return "AND";
+    }
 }

backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java

@@ -7,7 +7,8 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
@@ -26,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -107,7 +109,7 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(CKConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -170,42 +172,45 @@ public class CKQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit;
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(CKConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -234,7 +239,7 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -252,7 +257,7 @@ public class CKQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -264,25 +269,24 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -304,13 +308,12 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(CKConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -339,16 +342,15 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -375,24 +377,23 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(CKConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -424,7 +425,7 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -442,7 +443,7 @@ public class CKQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -454,25 +455,24 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -494,18 +494,17 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(CKConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -534,7 +533,7 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -555,7 +554,7 @@ public class CKQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -567,25 +566,24 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -607,8 +605,8 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -617,14 +615,14 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(CKConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -642,7 +640,7 @@ public class CKQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -654,21 +652,21 @@ public class CKQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -689,8 +687,8 @@ public class CKQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -764,84 +762,92 @@ public class CKQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(CKConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(CKConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == DeTypeConstants.DE_TIME) {
-                if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
-                    whereName = String.format(CKConstants.toDateTime, originName);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == 4) {
-                    String cast = String.format(CKConstants.toFloat64, originName);
-                    whereName = String.format(CKConstants.toDateTime, cast);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(CKConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(CKConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+                if (field.getDeType() == DeTypeConstants.DE_TIME) {
+                    if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
+                        whereName = String.format(CKConstants.toDateTime, originName);
+                    }
+                    if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == 4) {
+                        String cast = String.format(CKConstants.toFloat64, originName);
+                        whereName = String.format(CKConstants.toDateTime, cast);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
-            }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                if (field.getDeType() == DeTypeConstants.DE_TIME) {
-                    whereValue = String.format(CKConstants.toDateTime, "'" + value + "'");
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
                 } else {
-                    whereValue = String.format(CKConstants.WHERE_VALUE_VALUE, value);
+                    if (field.getDeType() == DeTypeConstants.DE_TIME) {
+                        whereValue = String.format(CKConstants.toDateTime, "'" + value + "'");
+                    } else {
+                        whereValue = String.format(CKConstants.WHERE_VALUE_VALUE, value);
+                    }
+                }
+                if (field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    list.add(SQLObj.builder()
+                            .whereField(whereName)
+                            .whereTermAndValue("is null")
+                            .build());
+                } else if (field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    list.add(SQLObj.builder()
+                            .whereField(whereName)
+                            .whereTermAndValue("is not null")
+                            .build());
+                } else {
+                    list.add(SQLObj.builder()
+                            .whereField(whereName)
+                            .whereTermAndValue(whereTerm + whereValue)
+                            .build());
                 }
             }
-            if (field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                list.add(SQLObj.builder()
-                        .whereField(whereName)
-                        .whereTermAndValue("is null")
-                        .build());
-            } else if (field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                list.add(SQLObj.builder()
-                        .whereField(whereName)
-                        .whereTermAndValue("is not null")
-                        .build());
-            } else {
-                list.add(SQLObj.builder()
-                        .whereField(whereName)
-                        .whereTermAndValue(whereTerm + whereValue)
-                        .build());
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -916,7 +922,9 @@ public class CKQueryProvider extends QueryProvider {
                         .build());
             }
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -1014,7 +1022,7 @@ public class CKQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1058,7 +1066,9 @@ public class CKQueryProvider extends QueryProvider {
                 }
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java

@@ -1,5 +1,6 @@
 package io.dataease.provider.query.db2;
 
+import com.google.gson.Gson;
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
@@ -7,8 +8,10 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.datasource.Db2Configuration;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
 import io.dataease.provider.query.SQLConstants;
@@ -26,6 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -76,11 +80,12 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(Db2Constants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(fields)) {
             for (int i = 0; i < fields.size(); i++) {
@@ -139,41 +144,40 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         Integer size = (page - 1) * pageSize + realSize;
-        return createQuerySQL(table, fields, isGroup, null) + String.format(" fetch first %s rows only; ", size);
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + String.format(" fetch first %s rows only; ", size);
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + String.format(" fetch first %s rows only; ", limit);
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + String.format(" fetch first %s rows only; ", limit);
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + String.format(" fetch first %s rows only; ", limit);
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + String.format(" fetch first %s rows only; ", limit);
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         Integer size = (page - 1) * pageSize + realSize;
-        return createQuerySQLAsTmp(sql, fields, isGroup) + String.format(" fetch first %s rows only; ", size);
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + String.format(" fetch first %s rows only; ", size);
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        System.out.println(table);
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(Db2Constants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -202,7 +206,7 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -220,7 +224,7 @@ public class Db2QueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -232,25 +236,24 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -272,13 +275,13 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(Db2Constants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -307,16 +310,15 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -343,24 +345,24 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(Db2Constants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -392,7 +394,7 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -410,7 +412,7 @@ public class Db2QueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -422,25 +424,24 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -462,18 +463,18 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(Db2Constants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -502,7 +503,7 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -523,7 +524,7 @@ public class Db2QueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -535,25 +536,24 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -575,8 +575,8 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -585,14 +585,14 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(Db2Constants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -610,7 +610,7 @@ public class Db2QueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -622,21 +622,21 @@ public class Db2QueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -657,8 +657,8 @@ public class Db2QueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -678,7 +678,8 @@ public class Db2QueryProvider extends QueryProvider {
             stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table);
+        Db2Configuration db2Configuration = new Gson().fromJson(ds.getConfiguration(), Db2Configuration.class);
+        return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), db2Configuration.getSchema() + ".\"" + table + "\"");
     }
 
     @Override
@@ -728,72 +729,82 @@ public class Db2QueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(Db2Constants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(Db2Constants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == DeTypeConstants.DE_TIME) {
-                if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
-                    originName = String.format(Db2Constants.STR_TO_DATE, originName);
-                    whereName = String.format(Db2Constants.DATE_FORMAT, originName, Db2Constants.DEFAULT_DATE_FORMAT);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT) {
-                    String cast = String.format(Db2Constants.CAST, originName, Db2Constants.DEFAULT_INT_FORMAT);
-                    whereName = String.format(Db2Constants.FROM_UNIXTIME, cast, Db2Constants.DEFAULT_DATE_FORMAT);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(Db2Constants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(Db2Constants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
+                if (field.getDeType() == DeTypeConstants.DE_TIME) {
+                    if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
+                        originName = String.format(Db2Constants.STR_TO_DATE, originName);
+                        whereName = String.format(Db2Constants.DATE_FORMAT, originName, Db2Constants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT) {
+                        String cast = String.format(Db2Constants.CAST, originName, Db2Constants.DEFAULT_INT_FORMAT);
+                        whereName = String.format(Db2Constants.FROM_UNIXTIME, cast, Db2Constants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
-            }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                if(field.getDeType().equals(DeTypeConstants.DE_TIME)){
-                    whereValue = String.format(Db2Constants.DATE_FORMAT, "'" + value + "'", Db2Constants.DEFAULT_DATE_FORMAT);;
-                }else {
-                    whereValue = String.format(Db2Constants.WHERE_VALUE_VALUE, value);
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    if (field.getDeType().equals(DeTypeConstants.DE_TIME)) {
+                        whereValue = String.format(Db2Constants.DATE_FORMAT, "'" + value + "'", Db2Constants.DEFAULT_DATE_FORMAT);
+                    } else {
+                        whereValue = String.format(Db2Constants.WHERE_VALUE_VALUE, value);
+                    }
                 }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
+            }
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -856,7 +867,9 @@ public class Db2QueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -951,7 +964,7 @@ public class Db2QueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -971,9 +984,10 @@ public class Db2QueryProvider extends QueryProvider {
                 } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
                     whereValue = "'%" + f.getValue() + "%'";
                 } else {
-                    if(y.getDeType().equals(DeTypeConstants.DE_TIME)){
-                        whereValue = String.format(Db2Constants.DATE_FORMAT, "'" + f.getValue() + "'", Db2Constants.DEFAULT_DATE_FORMAT);;
-                    }else {
+                    if (y.getDeType().equals(DeTypeConstants.DE_TIME)) {
+                        whereValue = String.format(Db2Constants.DATE_FORMAT, "'" + f.getValue() + "'", Db2Constants.DEFAULT_DATE_FORMAT);
+                        ;
+                    } else {
                         whereValue = String.format(Db2Constants.WHERE_VALUE_VALUE, f.getValue());
                     }
                 }
@@ -984,7 +998,9 @@ public class Db2QueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java

@@ -6,7 +6,8 @@ import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
@@ -25,6 +26,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -78,7 +80,7 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -140,6 +142,11 @@ public class DorisQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+
         if ((fields.size() > 0)) {
             xOrders.add(SQLObj.builder()
                     .orderDirection("asc")
@@ -152,38 +159,37 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sql + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sql + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit;
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -212,7 +218,7 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -230,7 +236,7 @@ public class DorisQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -242,25 +248,24 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -282,13 +287,12 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -317,16 +321,15 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -353,23 +356,22 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sql + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sql + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -401,7 +403,7 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -419,7 +421,7 @@ public class DorisQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -431,25 +433,24 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -471,18 +472,17 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + table + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -511,7 +511,7 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -532,7 +532,7 @@ public class DorisQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -544,25 +544,24 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -584,8 +583,8 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + table + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -594,14 +593,14 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -619,7 +618,7 @@ public class DorisQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -631,21 +630,21 @@ public class DorisQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -666,8 +665,8 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sql + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sql + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -744,72 +743,83 @@ public class DorisQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName());
-            } else {
-                originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName());
-            }
-
-            if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
-                    whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
-                    whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
-                }
-            } else if (field.getDeType() == 0) {
-                whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR);
-            } else {
-                whereName = originName;
-            }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    whereValue = String.format(DorisConstants.WHERE_NUMBER_VALUE, value);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName());
                 } else {
-                    whereValue = String.format(DorisConstants.WHERE_VALUE_VALUE, value);
+                    originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName());
                 }
+
+                if (field.getDeType() == 1) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                        whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
+                        whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
+                    }
+                } else if (field.getDeType() == 0) {
+                    whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR);
+                } else {
+                    whereName = originName;
+                }
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        whereValue = String.format(DorisConstants.WHERE_NUMBER_VALUE, value);
+                    } else {
+                        whereValue = String.format(DorisConstants.WHERE_VALUE_VALUE, value);
+                    }
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
+            }
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -874,7 +884,9 @@ public class DorisQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String transDateFormat(String dateStyle, String datePattern) {
@@ -1003,7 +1015,7 @@ public class DorisQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1032,7 +1044,9 @@ public class DorisQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java

@@ -7,7 +7,8 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
@@ -26,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -110,7 +112,7 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -169,42 +171,47 @@ public class EsQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null);
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null);
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup);
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter);
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup);
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter);
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -233,7 +240,7 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -251,7 +258,7 @@ public class EsQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -263,25 +270,24 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -304,28 +310,27 @@ public class EsQueryProvider extends QueryProvider {
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         return null;
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         return null;
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -357,7 +362,7 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -375,7 +380,7 @@ public class EsQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -387,25 +392,24 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -427,18 +431,17 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -467,7 +470,7 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -488,7 +491,7 @@ public class EsQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -500,25 +503,24 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -540,8 +542,8 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -550,14 +552,14 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(EsSqlLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -575,7 +577,7 @@ public class EsQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -587,21 +589,21 @@ public class EsQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -622,8 +624,8 @@ public class EsQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -693,67 +695,78 @@ public class EsQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == DeTypeConstants.DE_TIME) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    whereName = String.format(EsSqlLConstants.CAST, originName, "timestamp");
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == DeTypeConstants.DE_BOOL) {
-                    String cast = String.format(EsSqlLConstants.CAST, originName, "timestamp");
-                    whereName = String.format(EsSqlLConstants.DATETIME_FORMAT, cast, EsSqlLConstants.DEFAULT_DATE_FORMAT);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(EsSqlLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+                if (field.getDeType() == DeTypeConstants.DE_TIME) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                        whereName = String.format(EsSqlLConstants.CAST, originName, "timestamp");
+                    }
+                    if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == DeTypeConstants.DE_FLOAT || field.getDeExtractType() == DeTypeConstants.DE_BOOL) {
+                        String cast = String.format(EsSqlLConstants.CAST, originName, "timestamp");
+                        whereName = String.format(EsSqlLConstants.DATETIME_FORMAT, cast, EsSqlLConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(EsSqlLConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(EsSqlLConstants.WHERE_VALUE_VALUE, value);
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -815,7 +828,9 @@ public class EsQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -910,7 +925,7 @@ public class EsQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -939,7 +954,9 @@ public class EsQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java

@@ -7,7 +7,8 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
@@ -26,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -71,7 +73,7 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(HiveConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -130,42 +132,45 @@ public class HiveQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit;
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(HiveConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -194,7 +199,7 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -212,7 +217,7 @@ public class HiveQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -224,25 +229,24 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -264,13 +268,12 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(HiveConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -299,16 +302,15 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -335,24 +337,23 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(HiveConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -384,7 +385,7 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -402,7 +403,7 @@ public class HiveQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -414,25 +415,24 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -454,18 +454,17 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(HiveConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -494,7 +493,7 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -515,7 +514,7 @@ public class HiveQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -527,25 +526,24 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -567,8 +565,8 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -577,14 +575,14 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(HiveConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -602,7 +600,7 @@ public class HiveQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -614,21 +612,21 @@ public class HiveQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -649,8 +647,8 @@ public class HiveQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -724,67 +722,78 @@ public class HiveQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(HiveConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(HiveConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == DeTypeConstants.DE_TIME) {
-                if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
-                    whereName = String.format(HiveConstants.STR_TO_DATE, originName, HiveConstants.DEFAULT_DATE_FORMAT);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(HiveConstants.CAST, originName, HiveConstants.DEFAULT_INT_FORMAT) + "/1000";
-                    whereName = String.format(HiveConstants.FROM_UNIXTIME, cast, HiveConstants.DEFAULT_DATE_FORMAT);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(HiveConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(HiveConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
+                if (field.getDeType() == DeTypeConstants.DE_TIME) {
+                    if (field.getDeExtractType() == DeTypeConstants.DE_STRING || field.getDeExtractType() == 5) {
+                        whereName = String.format(HiveConstants.STR_TO_DATE, originName, HiveConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == DeTypeConstants.DE_INT || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(HiveConstants.CAST, originName, HiveConstants.DEFAULT_INT_FORMAT) + "/1000";
+                        whereName = String.format(HiveConstants.FROM_UNIXTIME, cast, HiveConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(HiveConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(HiveConstants.WHERE_VALUE_VALUE, value);
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -846,7 +855,9 @@ public class HiveQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -979,7 +990,7 @@ public class HiveQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1008,7 +1019,9 @@ public class HiveQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java

@@ -7,7 +7,8 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
@@ -26,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -81,7 +83,7 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MongoConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -114,42 +116,45 @@ public class MongoQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit;
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MongoConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -177,7 +182,7 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -195,7 +200,7 @@ public class MongoQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -207,25 +212,24 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -247,13 +251,12 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MongoConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -281,16 +284,15 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -317,24 +319,23 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MongoConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -365,7 +366,7 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -383,7 +384,7 @@ public class MongoQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -395,25 +396,24 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -435,18 +435,17 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MongoConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -474,7 +473,7 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -495,7 +494,7 @@ public class MongoQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -507,25 +506,24 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -547,8 +545,8 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -557,14 +555,14 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MongoConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -582,7 +580,7 @@ public class MongoQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -594,21 +592,21 @@ public class MongoQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -629,8 +627,8 @@ public class MongoQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -704,54 +702,64 @@ public class MongoQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
+                }
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == DeTypeConstants.DE_INT) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == DeTypeConstants.DE_TIME) {
+                    originName = String.format(MongoConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(MongoConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                }
+                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(MongoConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == DeTypeConstants.DE_INT) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == DeTypeConstants.DE_TIME) {
-                originName = String.format(MongoConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(MongoConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            whereName = originName;
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(MongoConstants.WHERE_VALUE_VALUE, value);
-            }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -799,7 +807,9 @@ public class MongoQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -869,7 +879,7 @@ public class MongoQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -898,7 +908,9 @@ public class MongoQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java

@@ -6,7 +6,8 @@ import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
@@ -25,6 +26,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -78,7 +80,7 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -137,42 +139,47 @@ public class MysqlQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT 0," + limit;
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT 0," + limit;
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT 0," + limit;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + (page - 1) * pageSize + "," + realSize;
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -200,7 +207,7 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -218,7 +225,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -230,25 +237,24 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -270,13 +276,12 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -304,16 +309,15 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -340,24 +344,23 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -388,7 +391,7 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -406,7 +409,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -418,25 +421,24 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -458,18 +460,17 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -497,7 +498,7 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -518,7 +519,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -530,25 +531,24 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -570,8 +570,8 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -580,14 +580,14 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -605,7 +605,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -617,21 +617,21 @@ public class MysqlQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -652,8 +652,8 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -727,67 +727,76 @@ public class MysqlQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
-                    whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+                if (field.getDeType() == 1) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                        whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
+                        whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, value);
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -849,7 +858,9 @@ public class MysqlQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -982,7 +993,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1011,7 +1022,9 @@ public class MysqlQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java

@@ -7,10 +7,11 @@ import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
+import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.datasource.OracleConfiguration;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
-import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
 import io.dataease.provider.query.SQLConstants;
@@ -28,6 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -93,7 +95,7 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
@@ -107,6 +109,10 @@ public class OracleQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
@@ -182,45 +188,44 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         List<SQLObj> xFields = xFields(table, fields);
 
         return MessageFormat.format("SELECT {0} FROM ( SELECT DE_TMP.*, rownum r FROM ( {1} ) DE_TMP WHERE rownum <= {2} ) WHERE r > {3} ",
-                sqlColumn(xFields), createQuerySQL(table, fields, isGroup, ds), Integer.valueOf(page * realSize).toString(), Integer.valueOf((page - 1) * pageSize).toString());
+                sqlColumn(xFields), createQuerySQL(table, fields, isGroup, ds, fieldCustomFilter), Integer.valueOf(page * realSize).toString(), Integer.valueOf((page - 1) * pageSize).toString());
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         List<SQLObj> xFields = xFields("(" + sqlFix(sql) + ")", fields);
         return MessageFormat.format("SELECT {0} FROM ( SELECT DE_TMP.*, rownum r FROM ( {1} ) DE_TMP WHERE rownum <= {2} ) WHERE r > {3} ",
-                sqlColumn(xFields), createQuerySQLAsTmp(sql, fields, isGroup), Integer.valueOf(page * realSize).toString(), Integer.valueOf((page - 1) * pageSize).toString());
+                sqlColumn(xFields), createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter), Integer.valueOf(page * realSize).toString(), Integer.valueOf((page - 1) * pageSize).toString());
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema();
         return String.format("SELECT *  from %s  WHERE rownum <= %s ", schema + "." + String.format(OracleConstants.KEYWORD_TABLE, table), limit.toString());
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         return String.format("SELECT * from %s  WHERE rownum <= %s ", "(" + sqlFix(sql) + ")", limit.toString());
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -248,7 +253,7 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -266,7 +271,7 @@ public class OracleQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -278,25 +283,24 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -318,14 +322,13 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -353,16 +356,15 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -389,24 +391,23 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -437,7 +438,7 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -455,7 +456,7 @@ public class OracleQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -467,25 +468,24 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -507,19 +507,18 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -547,7 +546,7 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -568,7 +567,7 @@ public class OracleQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -580,25 +579,24 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -620,8 +618,8 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -630,14 +628,14 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -655,7 +653,7 @@ public class OracleQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -667,20 +665,20 @@ public class OracleQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -701,8 +699,8 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -780,73 +778,83 @@ public class OracleQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-
-            if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
-                    whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+
+                if (field.getDeType() == 1) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                        whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
+                        whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
-            }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                if (field.getDeType() == 1) {
-                    whereValue = String.format(OracleConstants.TO_DATE, "'" + value + "'", OracleConstants.DEFAULT_DATE_FORMAT);
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
                 } else {
-                    whereValue = String.format(OracleConstants.WHERE_VALUE_VALUE, value);
+                    if (field.getDeType() == 1) {
+                        whereValue = String.format(OracleConstants.TO_DATE, "'" + value + "'", OracleConstants.DEFAULT_DATE_FORMAT);
+                    } else {
+                        whereValue = String.format(OracleConstants.WHERE_VALUE_VALUE, value);
+                    }
                 }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
+            }
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -909,7 +917,9 @@ public class OracleQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -1056,7 +1066,7 @@ public class OracleQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1085,7 +1095,9 @@ public class OracleQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java

@@ -8,9 +8,10 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.datasource.JdbcConfiguration;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
 import io.dataease.provider.query.SQLConstants;
@@ -29,6 +30,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -97,7 +99,7 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -158,43 +160,46 @@ public class PgQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, ds) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, ds, fieldCustomFilter) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, ds) + " LIMIT " + limit + " offset 0";
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, ds, fieldCustomFilter) + " LIMIT " + limit + " offset 0";
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + limit + " offset 0";
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + limit + " offset 0";
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -222,7 +227,7 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -240,7 +245,7 @@ public class PgQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -252,25 +257,24 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -292,14 +296,13 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -327,16 +330,15 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -363,25 +365,24 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -412,7 +413,7 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -430,7 +431,7 @@ public class PgQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -442,25 +443,24 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -482,19 +482,18 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -522,7 +521,7 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -543,7 +542,7 @@ public class PgQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -555,25 +554,24 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -595,8 +593,8 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -605,14 +603,14 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -630,7 +628,7 @@ public class PgQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -642,21 +640,21 @@ public class PgQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -677,8 +675,8 @@ public class PgQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -756,67 +754,77 @@ public class PgQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    whereName = String.format(PgConstants.CAST, originName, "timestamp");
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(PgConstants.CAST, originName, "bigint");
-                    whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+                if (field.getDeType() == 1) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                        whereName = String.format(PgConstants.CAST, originName, "timestamp");
+                    }
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(PgConstants.CAST, originName, "bigint");
+                        whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, value);
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -877,7 +885,9 @@ public class PgQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -972,7 +982,7 @@ public class PgQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1001,7 +1011,9 @@ public class PgQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java

@@ -8,9 +8,10 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.datasource.JdbcConfiguration;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.QueryProvider;
 import io.dataease.provider.query.SQLConstants;
@@ -30,6 +31,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -106,7 +108,7 @@ public class RedshiftQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -167,43 +169,46 @@ public class RedshiftQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, ds) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, ds, fieldCustomFilter) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + limit + " offset 0";
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL(table, fields, isGroup, null, fieldCustomFilter) + " LIMIT " + limit + " offset 0";
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + limit + " offset 0";
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter) + " LIMIT " + limit + " offset 0";
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -231,7 +236,7 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -249,7 +254,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -261,25 +266,24 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -302,29 +306,28 @@ public class RedshiftQueryProvider extends QueryProvider {
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         return null;
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         return null;
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -355,7 +358,7 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -373,7 +376,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -385,25 +388,24 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -425,19 +427,18 @@ public class RedshiftQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -465,7 +466,7 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -486,7 +487,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -498,25 +499,24 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -538,8 +538,8 @@ public class RedshiftQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -548,14 +548,14 @@ public class RedshiftQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -573,7 +573,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -585,21 +585,21 @@ public class RedshiftQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -620,8 +620,8 @@ public class RedshiftQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -656,9 +656,9 @@ public class RedshiftQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String convertTableToSql(String tableName, Datasource ds){
+    public String convertTableToSql(String tableName, Datasource ds) {
         String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema();
-        schema = String.format( RedshiftConstants.KEYWORD_TABLE, schema);
+        schema = String.format(RedshiftConstants.KEYWORD_TABLE, schema);
         return createSQLPreview("SELECT * FROM " + schema + "." + String.format(RedshiftConstants.KEYWORD_TABLE, tableName), null);
     }
 
@@ -695,63 +695,73 @@ public class RedshiftQueryProvider extends QueryProvider {
         }
     }
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    whereName = String.format(PgConstants.CAST, originName, "timestamp");
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(PgConstants.CAST, originName, "bigint");
-                    whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+                if (field.getDeType() == 1) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                        whereName = String.format(PgConstants.CAST, originName, "timestamp");
+                    }
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(PgConstants.CAST, originName, "bigint");
+                        whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = PgConstants.WHERE_VALUE_NULL;
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereTerm = String.format(whereTerm, originName);
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = PgConstants.WHERE_VALUE_NULL;
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereTerm = String.format(whereTerm, originName);
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, value);
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -812,7 +822,9 @@ public class RedshiftQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -901,7 +913,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -926,7 +938,9 @@ public class RedshiftQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java

@@ -8,7 +8,8 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.sqlObj.SQLObj;
@@ -28,6 +29,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
@@ -86,7 +88,7 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
 
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
@@ -148,47 +150,50 @@ public class SqlserverQueryProvider extends QueryProvider {
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
         return st_sql.render();
     }
 
     @Override
-    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
-        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null, fieldCustomFilter);
     }
 
     @Override
-    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
+    public String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         Integer size = (page - 1) * pageSize + realSize;
-        return String.format("SELECT top %s * from ( %s ) AS DE_SQLSERVER_TMP ", size.toString(), createQuerySQL(table, fields, isGroup, ds));
+        return String.format("SELECT top %s * from ( %s ) AS DE_SQLSERVER_TMP ", size.toString(), createQuerySQL(table, fields, isGroup, ds, fieldCustomFilter));
 
     }
 
     @Override
-    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema();
         return String.format("SELECT top %s * from %s ", limit.toString(), schema + "." + table);
     }
 
     @Override
-    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
+    public String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         Integer size = (page - 1) * pageSize + realSize;
-        return String.format("SELECT top %s * from ( %s ) AS DE_SQLSERVER_TMP ", size.toString(), createQuerySQLAsTmp(sql, fields, isGroup));
+        return String.format("SELECT top %s * from ( %s ) AS DE_SQLSERVER_TMP ", size.toString(), createQuerySQLAsTmp(sql, fields, isGroup, fieldCustomFilter));
     }
 
     @Override
-    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter) {
         return String.format("SELECT top %s * from ( %s ) as DE_SQLSERVER_TMP ", limit.toString(), sqlFix(sql));
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -216,7 +221,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -234,7 +239,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -246,25 +251,24 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -290,14 +294,13 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -325,16 +328,15 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
@@ -365,25 +367,24 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
-        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
+        return getSQLTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
 
     @Override
-    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null, view);
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, null, view);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         List<ChartViewFieldDTO> xList = new ArrayList<>();
         xList.addAll(xAxis);
@@ -414,7 +415,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -432,7 +433,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -463,25 +464,24 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -507,19 +507,18 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null, view);
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extStack, null, view);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
-        List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(xAxis)) {
             for (int i = 0; i < xAxis.size(); i++) {
@@ -547,7 +546,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         List<ChartViewFieldDTO> yList = new ArrayList<>();
         yList.addAll(yAxis);
@@ -568,7 +567,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -580,25 +579,24 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(xFields);
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        wheres.addAll(xWheres);
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         groups.addAll(xFields);
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(xOrders);
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -624,8 +622,8 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null, view);
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, fieldCustomFilter, extFilterRequestList, extBubble, null, view);
     }
 
     @Override
@@ -634,14 +632,14 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
-        List<SQLObj> yWheres = new ArrayList<>();
+        List<String> yWheres = new ArrayList<>();
         List<SQLObj> yOrders = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(yAxis)) {
             for (int i = 0; i < yAxis.size(); i++) {
@@ -659,7 +657,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 // 处理纵轴字段
                 yFields.add(getYFields(y, originField, fieldAlias));
                 // 处理纵轴过滤
-                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                yWheres.add(getYWheres(y, originField, fieldAlias));
                 // 处理纵轴排序
                 if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
                     yOrders.add(SQLObj.builder()
@@ -671,21 +669,21 @@ public class SqlserverQueryProvider extends QueryProvider {
             }
         }
         // 处理视图中字段过滤
-        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        String customWheres = transCustomFilterList(tableObj, fieldCustomFilter);
         // 处理仪表板字段过滤
-        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        String extWheres = transExtFilterList(tableObj, extFilterRequestList);
         // 构建sql所有参数
         List<SQLObj> fields = new ArrayList<>();
         fields.addAll(yFields);
-        List<SQLObj> wheres = new ArrayList<>();
-        if (customWheres != null) wheres.addAll(customWheres);
-        if (extWheres != null) wheres.addAll(extWheres);
+        List<String> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.add(customWheres);
+        if (extWheres != null) wheres.add(extWheres);
         List<SQLObj> groups = new ArrayList<>();
         // 外层再次套sql
         List<SQLObj> orders = new ArrayList<>();
         orders.addAll(yOrders);
-        List<SQLObj> aggWheres = new ArrayList<>();
-        aggWheres.addAll(yWheres);
+        List<String> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres.stream().filter(ObjectUtils::isNotEmpty).collect(Collectors.toList()));
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
         ST st_sql = stg.getInstanceOf("querySql");
@@ -710,8 +708,8 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
-        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList, view);
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, fieldCustomFilter, extFilterRequestList, view);
     }
 
     @Override
@@ -790,67 +788,77 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
 
-    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+    public String transCustomFilterList(SQLObj tableObj, List<ChartFieldCustomFilterDTO> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
-        List<SQLObj> list = new ArrayList<>();
-        for (ChartCustomFilterDTO request : requestList) {
+        List<String> res = new ArrayList<>();
+        for (ChartFieldCustomFilterDTO request : requestList) {
+            List<SQLObj> list = new ArrayList<>();
             DatasetTableField field = request.getField();
-            if (ObjectUtils.isEmpty(field)) {
-                continue;
-            }
-            String value = request.getValue();
-            String whereName = "";
-            String whereTerm = transMysqlFilterTerm(request.getTerm());
-            String whereValue = "";
-            String originName;
-            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
-                // 解析origin name中有关联的字段生成sql表达式
-                originName = calcFieldRegex(field.getOriginName(), tableObj);
-            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            } else {
-                originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            }
-            if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
-                    whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName);
+            List<ChartCustomFilterItemDTO> filter = request.getFilter();
+            for (ChartCustomFilterItemDTO filterItemDTO : filter) {
+                if (ObjectUtils.isEmpty(field)) {
+                    continue;
                 }
-                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                    String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
-                    whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
+                String value = filterItemDTO.getValue();
+                String whereName = "";
+                String whereTerm = transMysqlFilterTerm(filterItemDTO.getTerm());
+                String whereValue = "";
+                String originName;
+                if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originName = calcFieldRegex(field.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                    originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                } else {
+                    originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
                 }
-                if (field.getDeExtractType() == 1) {
+                if (field.getDeType() == 1) {
+                    if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                        whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName);
+                    }
+                    if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
+                        String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
+                        whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
+                    }
+                    if (field.getDeExtractType() == 1) {
+                        whereName = originName;
+                    }
+                } else {
                     whereName = originName;
                 }
-            } else {
-                whereName = originName;
+                if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {
+                    whereValue = "";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_empty")) {
+                    whereValue = "''";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(value, "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(filterItemDTO.getTerm(), "like")) {
+                    whereValue = "'%" + value + "%'";
+                } else {
+                    whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
+                }
+                list.add(SQLObj.builder()
+                        .whereField(whereName)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
             }
-            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
-                whereValue = "";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "empty")) {
-                whereValue = "''";
-            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_empty")) {
-                whereValue = "''";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
-                whereValue = "('" + StringUtils.join(value, "','") + "')";
-            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
-                whereValue = "'%" + value + "%'";
-            } else {
-                whereValue = String.format(SqlServerSQLConstants.WHERE_VALUE_VALUE, value);
+
+            List<String> strList = new ArrayList<>();
+            list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+            if (CollectionUtils.isNotEmpty(list)) {
+                res.add("(" + String.join(" " + getLogic(request.getLogic()) + " ", strList) + ")");
             }
-            list.add(SQLObj.builder()
-                    .whereField(whereName)
-                    .whereTermAndValue(whereTerm + whereValue)
-                    .build());
         }
-        return list;
+        return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
     }
 
-    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+    public String transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
         if (CollectionUtils.isEmpty(requestList)) {
             return null;
         }
@@ -912,7 +920,9 @@ public class SqlserverQueryProvider extends QueryProvider {
                     .whereTermAndValue(whereTerm + whereValue)
                     .build());
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" AND ", strList) + ")" : null;
     }
 
     private String sqlFix(String sql) {
@@ -1022,7 +1032,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 .build();
     }
 
-    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+    private String getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
         List<SQLObj> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
             y.getFilter().forEach(f -> {
@@ -1051,7 +1061,9 @@ public class SqlserverQueryProvider extends QueryProvider {
                         .build());
             });
         }
-        return list;
+        List<String> strList = new ArrayList<>();
+        list.forEach(ele -> strList.add(ele.getWhereField() + " " + ele.getWhereTermAndValue()));
+        return CollectionUtils.isNotEmpty(list) ? "(" + String.join(" " + getLogic(y.getLogic()) + " ", strList) + ")" : null;
     }
 
     private String calcFieldRegex(String originField, SQLObj tableObj) {

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

@@ -208,15 +208,15 @@ public class ChartViewService {
         }.getType());
         List<ChartViewFieldDTO> drill = new Gson().fromJson(view.getDrillFields(), new TypeToken<List<ChartViewFieldDTO>>() {
         }.getType());
-        List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
+        // 获取对应数据集行权限
+        DatasetTableField datasetTableFieldObj = DatasetTableField.builder().tableId(view.getTableId()).checked(Boolean.TRUE).build();
+        List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableFieldObj);
+        DatasetTable datasetTable = dataSetTableService.get(view.getTableId());
+        List<ChartFieldCustomFilterDTO> permissionFields = dataSetTableService.getCustomFilters(fields, datasetTable);
+        fieldCustomFilter.addAll(permissionFields);
+
         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());
-            customFilter.addAll(collect);
+            ele.setField(dataSetTableFieldsService.get(ele.getId()));
         }
 
         if (StringUtils.equalsIgnoreCase("text", view.getType())
@@ -245,19 +245,29 @@ public class ChartViewService {
 
         // 过滤来自仪表板的条件
         List<ChartExtFilterRequest> extFilterList = new ArrayList<>();
-
         //组件过滤条件
         if (ObjectUtils.isNotEmpty(requestList.getFilter())) {
             for (ChartExtFilterRequest request : requestList.getFilter()) {
-                DatasetTableField datasetTableField = dataSetTableFieldsService.get(request.getFieldId());
-                request.setDatasetTableField(datasetTableField);
-                if (StringUtils.equalsIgnoreCase(datasetTableField.getTableId(), view.getTableId())) {
-                    if (CollectionUtils.isNotEmpty(request.getViewIds())) {
-                        if (request.getViewIds().contains(view.getId())) {
-                            extFilterList.add(request);
+                // 解析多个fieldId,fieldId是一个逗号分隔的字符串
+                String fieldId = request.getFieldId();
+                if (StringUtils.isNotEmpty(fieldId)) {
+                    String[] fieldIds = fieldId.split(",");
+                    for (String fId : fieldIds) {
+                        ChartExtFilterRequest filterRequest = new ChartExtFilterRequest();
+                        BeanUtils.copyBean(filterRequest, request);
+                        filterRequest.setFieldId(fId);
+
+                        DatasetTableField datasetTableField = dataSetTableFieldsService.get(fId);
+                        filterRequest.setDatasetTableField(datasetTableField);
+                        if (StringUtils.equalsIgnoreCase(datasetTableField.getTableId(), view.getTableId())) {
+                            if (CollectionUtils.isNotEmpty(filterRequest.getViewIds())) {
+                                if (filterRequest.getViewIds().contains(view.getId())) {
+                                    extFilterList.add(filterRequest);
+                                }
+                            } else {
+                                extFilterList.add(filterRequest);
+                            }
                         }
-                    } else {
-                        extFilterList.add(request);
                     }
                 }
             }
@@ -341,42 +351,42 @@ public class ChartViewService {
             if (StringUtils.equalsIgnoreCase(table.getType(), "db")) {
                 datasourceRequest.setTable(dataTableInfoDTO.getTable());
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLSummary(dataTableInfoDTO.getTable(), yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLSummary(dataTableInfoDTO.getTable(), yAxis, fieldCustomFilter, extFilterList, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                    datasourceRequest.setQuery(qp.getSQLStack(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extStack, ds, view));
+                    datasourceRequest.setQuery(qp.getSQLStack(dataTableInfoDTO.getTable(), xAxis, yAxis, fieldCustomFilter, extFilterList, extStack, ds, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                    datasourceRequest.setQuery(qp.getSQLScatter(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extBubble, ds, view));
+                    datasourceRequest.setQuery(qp.getSQLScatter(dataTableInfoDTO.getTable(), xAxis, yAxis, fieldCustomFilter, extFilterList, extBubble, ds, view));
                 } else if (StringUtils.equalsIgnoreCase("table-info", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLTableInfo(dataTableInfoDTO.getTable(), xAxis, customFilter, extFilterList, ds, view));
+                    datasourceRequest.setQuery(qp.getSQLTableInfo(dataTableInfoDTO.getTable(), xAxis, fieldCustomFilter, extFilterList, ds, view));
                 } else {
-                    datasourceRequest.setQuery(qp.getSQL(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, ds, view));
+                    datasourceRequest.setQuery(qp.getSQL(dataTableInfoDTO.getTable(), xAxis, yAxis, fieldCustomFilter, extFilterList, ds, view));
                 }
             } else if (StringUtils.equalsIgnoreCase(table.getType(), "sql")) {
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(dataTableInfoDTO.getSql(), yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(dataTableInfoDTO.getSql(), yAxis, fieldCustomFilter, extFilterList, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(dataTableInfoDTO.getSql(), xAxis, yAxis, customFilter, extFilterList, extStack, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(dataTableInfoDTO.getSql(), xAxis, yAxis, fieldCustomFilter, extFilterList, extStack, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpScatter(dataTableInfoDTO.getSql(), xAxis, yAxis, customFilter, extFilterList, extBubble, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpScatter(dataTableInfoDTO.getSql(), xAxis, yAxis, fieldCustomFilter, extFilterList, extBubble, view));
                 } else if (StringUtils.equalsIgnoreCase("table-info", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpTableInfo(dataTableInfoDTO.getSql(), xAxis, customFilter, extFilterList, ds, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpTableInfo(dataTableInfoDTO.getSql(), xAxis, fieldCustomFilter, extFilterList, ds, view));
                 } else {
-                    datasourceRequest.setQuery(qp.getSQLAsTmp(dataTableInfoDTO.getSql(), xAxis, yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmp(dataTableInfoDTO.getSql(), xAxis, yAxis, fieldCustomFilter, extFilterList, view));
                 }
             } else if (StringUtils.equalsIgnoreCase(table.getType(), "custom")) {
                 DataTableInfoDTO dt = new Gson().fromJson(table.getInfo(), DataTableInfoDTO.class);
                 List<DataSetTableUnionDTO> list = dataSetTableUnionService.listByTableId(dt.getList().get(0).getTableId());
                 String sql = dataSetTableService.getCustomSQLDatasource(dt, list, ds);
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, fieldCustomFilter, extFilterList, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(sql, xAxis, yAxis, customFilter, extFilterList, extStack, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(sql, xAxis, yAxis, fieldCustomFilter, extFilterList, extStack, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpScatter(sql, xAxis, yAxis, customFilter, extFilterList, extBubble, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpScatter(sql, xAxis, yAxis, fieldCustomFilter, extFilterList, extBubble, view));
                 } else if (StringUtils.equalsIgnoreCase("table-info", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpTableInfo(sql, xAxis, customFilter, extFilterList, ds, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpTableInfo(sql, xAxis, fieldCustomFilter, extFilterList, ds, view));
                 } else {
-                    datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, extFilterList, view));
                 }
             } else if (StringUtils.equalsIgnoreCase(table.getType(), "union")) {
                 DataTableInfoDTO dt = new Gson().fromJson(table.getInfo(), DataTableInfoDTO.class);
@@ -384,15 +394,15 @@ public class ChartViewService {
                 String sql = (String) sqlMap.get("sql");
 
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, fieldCustomFilter, extFilterList, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(sql, xAxis, yAxis, customFilter, extFilterList, extStack, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(sql, xAxis, yAxis, fieldCustomFilter, extFilterList, extStack, view));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpScatter(sql, xAxis, yAxis, customFilter, extFilterList, extBubble, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpScatter(sql, xAxis, yAxis, fieldCustomFilter, extFilterList, extBubble, view));
                 } else if (StringUtils.equalsIgnoreCase("table-info", view.getType())) {
-                    datasourceRequest.setQuery(qp.getSQLAsTmpTableInfo(sql, xAxis, customFilter, extFilterList, ds, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmpTableInfo(sql, xAxis, fieldCustomFilter, extFilterList, ds, view));
                 } else {
-                    datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, customFilter, extFilterList, view));
+                    datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, extFilterList, view));
                 }
             }
             data = datasourceProvider.getData(datasourceRequest);
@@ -405,15 +415,15 @@ public class ChartViewService {
             datasourceRequest.setTable(tableName);
             QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
             if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
-                datasourceRequest.setQuery(qp.getSQLSummary(tableName, yAxis, customFilter, extFilterList, view));
+                datasourceRequest.setQuery(qp.getSQLSummary(tableName, yAxis, fieldCustomFilter, extFilterList, view));
             } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                datasourceRequest.setQuery(qp.getSQLStack(tableName, xAxis, yAxis, customFilter, extFilterList, extStack, ds, view));
+                datasourceRequest.setQuery(qp.getSQLStack(tableName, xAxis, yAxis, fieldCustomFilter, extFilterList, extStack, ds, view));
             } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                datasourceRequest.setQuery(qp.getSQLScatter(tableName, xAxis, yAxis, customFilter, extFilterList, extBubble, ds, view));
+                datasourceRequest.setQuery(qp.getSQLScatter(tableName, xAxis, yAxis, fieldCustomFilter, extFilterList, extBubble, ds, view));
             } else if (StringUtils.equalsIgnoreCase("table-info", view.getType())) {
-                datasourceRequest.setQuery(qp.getSQLTableInfo(tableName, xAxis, customFilter, extFilterList, ds, view));
+                datasourceRequest.setQuery(qp.getSQLTableInfo(tableName, xAxis, fieldCustomFilter, extFilterList, ds, view));
             } else {
-                datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, customFilter, extFilterList, ds, view));
+                datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, fieldCustomFilter, extFilterList, ds, view));
             }
             // 仪表板有参数不实用缓存
             if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter())

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -1,7 +1,10 @@
 package io.dataease.service.dataset;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import io.dataease.auth.api.dto.CurrentRoleDto;
+import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.*;
 import io.dataease.base.mapper.ext.ExtDataSetGroupMapper;
@@ -18,6 +21,8 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.dataset.DataSetTaskRequest;
 import io.dataease.controller.request.datasource.DatasourceRequest;
 import io.dataease.controller.response.DataSetDetail;
+import io.dataease.dto.chart.ChartCustomFilterItemDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.dataset.*;
 import io.dataease.dto.dataset.union.UnionDTO;
 import io.dataease.dto.dataset.union.UnionItemDTO;
@@ -25,7 +30,10 @@ import io.dataease.dto.dataset.union.UnionParamDTO;
 import io.dataease.dto.datasource.TableFiled;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
+import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.loader.ClassloaderResponsity;
+import io.dataease.plugins.xpack.auth.dto.request.DatasetRowPermissions;
+import io.dataease.plugins.xpack.auth.service.RowPermissionService;
 import io.dataease.provider.ProviderFactory;
 import io.dataease.provider.datasource.DatasourceProvider;
 import io.dataease.provider.datasource.JdbcProvider;
@@ -60,6 +68,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+;
+
 /**
  * @Author gin
  * @Date 2021/2/23 2:54 下午
@@ -93,6 +103,7 @@ public class DataSetTableService {
     private ExtDataSetGroupMapper extDataSetGroupMapper;
     @Resource
     private DatasetTableFieldMapper datasetTableFieldMapper;
+
     private static final String lastUpdateTime = "${__last_update_time__}";
     private static final String currentUpdateTime = "${__current_update_time__}";
 
@@ -431,11 +442,55 @@ public class DataSetTableService {
         return map;
     }
 
+    private List<DatasetRowPermissions> rowPermissions(String datasetId) {
+        List<DatasetRowPermissions> datasetRowPermissions = new ArrayList<>();
+        Map<String, RowPermissionService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((RowPermissionService.class));
+        if (beansOfType.keySet().size() == 0) {
+            return new ArrayList<>();
+        }
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+        CurrentUserDto user = AuthUtils.getUser();
+        if (user != null) {
+            datasetRowPermissions.addAll(rowPermissionService.listDatasetRowPermissions(datasetId, Collections.singletonList(user.getUserId()), "user"));
+            datasetRowPermissions.addAll(rowPermissionService.listDatasetRowPermissions(datasetId, user.getRoles().stream().map(CurrentRoleDto::getId).collect(Collectors.toList()), "role"));
+            datasetRowPermissions.addAll(rowPermissionService.listDatasetRowPermissions(datasetId, Collections.singletonList(user.getDeptId()), "dept"));
+        }
+        return datasetRowPermissions;
+    }
+
+    private DatasetTableField getFieldById(List<DatasetTableField> fields, String fieldId) {
+        DatasetTableField field = null;
+        for (DatasetTableField datasetTableField : fields) {
+            if (fieldId.equalsIgnoreCase(datasetTableField.getId())) {
+                field = datasetTableField;
+            }
+        }
+        return field;
+    }
+
+    public List<ChartFieldCustomFilterDTO> getCustomFilters(List<DatasetTableField> fields, DatasetTable datasetTable) {
+        List<ChartFieldCustomFilterDTO> customFilter = new ArrayList<>();
+        rowPermissions(datasetTable.getId()).forEach(datasetRowPermissions -> {
+            List<ChartCustomFilterItemDTO> lists = JSONObject.parseArray(datasetRowPermissions.getFilter(), ChartCustomFilterItemDTO.class);
+            ChartFieldCustomFilterDTO dto = new ChartFieldCustomFilterDTO();
+            DatasetTableField field = getFieldById(fields, datasetRowPermissions.getDatasetFieldId());
+            lists.forEach(chartCustomFilterDTO -> {
+                chartCustomFilterDTO.setFieldId(field.getId());
+            });
+            if (field != null) {
+                dto.setFilter(lists);
+                dto.setField(field);
+                dto.setId(field.getId());
+                dto.setLogic(datasetRowPermissions.getLogic());
+                customFilter.add(dto);
+            }
+        });
+        return customFilter;
+    }
+
     public Map<String, Object> getPreviewData(DataSetTableRequest dataSetTableRequest, Integer page, Integer pageSize) throws Exception {
         Map<String, Object> map = new HashMap<>();
-        DatasetTableField datasetTableField = DatasetTableField.builder().build();
-        datasetTableField.setTableId(dataSetTableRequest.getId());
-        datasetTableField.setChecked(Boolean.TRUE);
+        DatasetTableField datasetTableField = DatasetTableField.builder().tableId(dataSetTableRequest.getId()).checked(Boolean.TRUE).build();
         List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
         if (CollectionUtils.isEmpty(fields)) {
             map.put("fields", fields);
@@ -443,10 +498,12 @@ public class DataSetTableService {
             map.put("page", new DataSetPreviewPage());
             return map;
         }
+        DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(dataSetTableRequest.getId());
+        List<ChartFieldCustomFilterDTO> customFilter = getCustomFilters(fields, datasetTable);
         String[] fieldArray = fields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new);
 
         DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class);
-        DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(dataSetTableRequest.getId());
+
 
         List<String[]> data = new ArrayList<>();
         DataSetPreviewPage dataSetPreviewPage = new DataSetPreviewPage();
@@ -468,7 +525,10 @@ public class DataSetTableService {
                 datasourceRequest.setDatasource(ds);
                 String table = dataTableInfoDTO.getTable();
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds));
+
+
+                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds, customFilter));
+
                 map.put("sql", datasourceRequest.getQuery());
                 datasourceRequest.setPage(page);
                 datasourceRequest.setFetchSize(Integer.parseInt(dataSetTableRequest.getRow()));
@@ -484,7 +544,7 @@ public class DataSetTableService {
                 }
 
                 try {
-                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
+                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
                     datasourceRequest.setPageable(false);
                     dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
@@ -502,7 +562,7 @@ public class DataSetTableService {
                 datasourceRequest.setDatasource(ds);
                 String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds));
+                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 try {
                     data.addAll(jdbcProvider.getData(datasourceRequest));
@@ -511,7 +571,7 @@ public class DataSetTableService {
                     DEException.throwException(Translator.get("i18n_ds_error"));
                 }
                 try {
-                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
+                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
                     dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -531,7 +591,7 @@ public class DataSetTableService {
 
                 String sql = dataTableInfoDTO.getSql();
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false));
+                datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 datasourceRequest.setPage(page);
                 datasourceRequest.setFetchSize(Integer.parseInt(dataSetTableRequest.getRow()));
@@ -547,7 +607,7 @@ public class DataSetTableService {
                 }
                 try {
                     datasourceRequest.setPageable(false);
-                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false));
+                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, customFilter));
                     dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -564,7 +624,7 @@ public class DataSetTableService {
                 datasourceRequest.setDatasource(ds);
                 String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds));
+                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 try {
                     data.addAll(jdbcProvider.getData(datasourceRequest));
@@ -573,7 +633,7 @@ public class DataSetTableService {
                     DEException.throwException(Translator.get("i18n_ds_error"));
                 }
                 try {
-                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
+                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
                     dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -591,7 +651,7 @@ public class DataSetTableService {
             datasourceRequest.setDatasource(ds);
             String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
             QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-            datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds));
+            datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds, customFilter));
             map.put("sql", datasourceRequest.getQuery());
             try {
                 data.addAll(jdbcProvider.getData(datasourceRequest));
@@ -600,7 +660,7 @@ public class DataSetTableService {
                 DEException.throwException(Translator.get("i18n_ds_error"));
             }
             try {
-                datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
+                datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
                 dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
             } catch (Exception e) {
                 logger.error(e.getMessage());
@@ -627,7 +687,7 @@ public class DataSetTableService {
                     DEException.throwException(Translator.get("i18n_ds_error"));
                 }
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false));
+                datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 datasourceRequest.setPage(page);
                 datasourceRequest.setFetchSize(Integer.parseInt(dataSetTableRequest.getRow()));
@@ -643,7 +703,7 @@ public class DataSetTableService {
                 }
                 try {
                     datasourceRequest.setPageable(false);
-                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false));
+                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, customFilter));
                     dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -656,7 +716,7 @@ public class DataSetTableService {
                 datasourceRequest.setDatasource(ds);
                 String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds));
+                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 try {
                     data.addAll(jdbcProvider.getData(datasourceRequest));
@@ -666,7 +726,7 @@ public class DataSetTableService {
                 }
 
                 try {
-                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
+                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
                     dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -693,7 +753,7 @@ public class DataSetTableService {
                     DEException.throwException(Translator.get("i18n_ds_error"));
                 }
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false));
+                datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 datasourceRequest.setPage(page);
                 datasourceRequest.setFetchSize(Integer.parseInt(dataSetTableRequest.getRow()));
@@ -709,7 +769,7 @@ public class DataSetTableService {
                 }
                 try {
                     datasourceRequest.setPageable(false);
-                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false));
+                    datasourceRequest.setQuery(qp.createQuerySqlWithLimit(sql, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, customFilter));
                     dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -722,7 +782,7 @@ public class DataSetTableService {
                 datasourceRequest.setDatasource(ds);
                 String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
                 QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds));
+                datasourceRequest.setQuery(qp.createQueryTableWithPage(table, fields, page, pageSize, realSize, false, ds, customFilter));
                 map.put("sql", datasourceRequest.getQuery());
                 try {
                     data.addAll(jdbcProvider.getData(datasourceRequest));
@@ -732,7 +792,7 @@ public class DataSetTableService {
                 }
 
                 try {
-                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds));
+                    datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
                     dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
                 } catch (Exception e) {
                     logger.error(e.getMessage());
@@ -1636,6 +1696,7 @@ public class DataSetTableService {
         dataSetDetail.setTable(table);
         if (ObjectUtils.isNotEmpty(table)) {
             Datasource datasource = datasourceMapper.selectByPrimaryKey(table.getDataSourceId());
+            Optional.ofNullable(datasource).orElse(new Datasource()).setConfiguration(null);
             dataSetDetail.setDatasource(datasource);
         }
         return dataSetDetail;

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -992,7 +992,7 @@ public class ExtractDataService {
         String tmp_code = code.replace("handleWraps", handleWraps).replace("handleBinaryType", handleBinaryTypeCode.toString());
 
         String Column_Fields;
-        if (datasourceType.equals(DatasourceTypes.oracle)) {
+        if (datasourceType.equals(DatasourceTypes.oracle) || datasourceType.equals(DatasourceTypes.db2)) {
             Column_Fields = datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.joining(","));
         } else {
             Column_Fields = datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.joining(","));

backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java

@@ -5,6 +5,8 @@ import io.dataease.base.domain.DatasetTable;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.provider.datasource.DatasourceProvider;
 import io.dataease.provider.ProviderFactory;
 import io.dataease.controller.request.datasource.DatasourceRequest;
@@ -41,8 +43,6 @@ public class DirectFieldService implements DataSetFieldService {
 
     @Override
     public List<Object> fieldValues(String fieldId) {
-
-
         List<DatasetTableField> list = dataSetTableFieldsService.getListByIds(new ArrayList<String>() {{
             add(fieldId);
         }});
@@ -51,9 +51,14 @@ public class DirectFieldService implements DataSetFieldService {
         DatasetTableField field = list.get(0);
         String tableId = field.getTableId();
         if (StringUtils.isEmpty(tableId)) return null;
+
         DatasetTable datasetTable = dataSetTableService.get(tableId);
         if (ObjectUtils.isEmpty(datasetTable) || StringUtils.isEmpty(datasetTable.getName())) return null;
-        String tableName = datasetTable.getName();
+        String tableName;
+
+        DatasetTableField datasetTableField = DatasetTableField.builder().tableId(tableId).checked(Boolean.TRUE).build();
+        List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
+        List<ChartFieldCustomFilterDTO> customFilter = dataSetTableService.getCustomFilters(fields, datasetTable);
 
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         DatasourceProvider datasourceProvider = null;
@@ -67,18 +72,18 @@ public class DirectFieldService implements DataSetFieldService {
             QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
             if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) {
                 datasourceRequest.setTable(dataTableInfoDTO.getTable());
-                datasourceRequest.setQuery(qp.createQuerySQL(dataTableInfoDTO.getTable(), Collections.singletonList(field), true, ds));
+                datasourceRequest.setQuery(qp.createQuerySQL(dataTableInfoDTO.getTable(), Collections.singletonList(field), true, ds, customFilter));
             } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) {
-                datasourceRequest.setQuery(qp.createQuerySQLAsTmp(dataTableInfoDTO.getSql(), Collections.singletonList(field), true));
+                datasourceRequest.setQuery(qp.createQuerySQLAsTmp(dataTableInfoDTO.getSql(), Collections.singletonList(field), true, customFilter));
             } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
                 DataTableInfoDTO dt = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
                 List<DataSetTableUnionDTO> listUnion = dataSetTableUnionService.listByTableId(dt.getList().get(0).getTableId());
                 String sql = dataSetTableService.getCustomSQLDatasource(dt, listUnion, ds);
-                datasourceRequest.setQuery(qp.createQuerySQLAsTmp(sql, Collections.singletonList(field), true));
+                datasourceRequest.setQuery(qp.createQuerySQLAsTmp(sql, Collections.singletonList(field), true, customFilter));
             } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "union")) {
                 DataTableInfoDTO dt = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
                 String sql = (String) dataSetTableService.getUnionSQLDatasource(dt, ds).get("sql");
-                datasourceRequest.setQuery(qp.createQuerySQLAsTmp(sql, Collections.singletonList(field), true));
+                datasourceRequest.setQuery(qp.createQuerySQLAsTmp(sql, Collections.singletonList(field), true, customFilter));
             }
         } else if (datasetTable.getMode() == 1) {// 抽取
             // 连接doris，构建doris数据源查询
@@ -89,7 +94,7 @@ public class DirectFieldService implements DataSetFieldService {
             tableName = "ds_" + datasetTable.getId().replaceAll("-", "_");
             datasourceRequest.setTable(tableName);
             QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
-            datasourceRequest.setQuery(qp.createQuerySQL(tableName, Collections.singletonList(field), true, null));
+            datasourceRequest.setQuery(qp.createQuerySQL(tableName, Collections.singletonList(field), true, null, customFilter));
         }
 
         try {

backend/src/main/resources/db/migration/V29__de1.6.sql

@@ -0,0 +1,11 @@
+CREATE TABLE `dataset_row_permissions` (
+   `id`         varchar(64) NOT NULL COMMENT 'File ID',
+   `auth_target_type`  varchar(255) DEFAULT NULL COMMENT '权限类型：组织/角色/用户',
+   `auth_target_id`    bigint(20) DEFAULT NULL COMMENT '权限对象ID',
+   `dataset_id`    varchar(64) DEFAULT NULL COMMENT '数据集ID',
+   `dataset_field_id`    varchar(64) DEFAULT NULL COMMENT '数据集字段ID',
+   `logic`    varchar(64) DEFAULT NULL COMMENT '与/或',
+   `filter`  longtext DEFAULT NULL COMMENT '数值',
+   `update_time` bigint(13) NULL DEFAULT NULL,
+   PRIMARY KEY (`id`)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;

backend/src/main/resources/generatorConfig.xml

@@ -5,7 +5,6 @@
     <!--配置数据库连接的位置-->
     <properties url="file:///opt/dataease/conf/dataease.properties"/>
     <!-- 设置mysql驱动路径 -->
-    <!--<classPathEntry location="/Users/liuruibin/.m2/repository/mysql/mysql-connector-java/5.1.34/mysql-connector-java-5.1.34.jar"/>-->
     <!-- 此处指定生成针对MyBatis3的DAO -->
     <context id="mysql" targetRuntime="MyBatis3">
         <!-- 字段带`,解决列表跟关键字冲突问题 -->
@@ -37,8 +36,6 @@
         </commentGenerator>
 
         <!-- jdbc连接信息 --> <!-- EduLoanManage EduTestDataBase -->
-        <!--<jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://192.168.20.180:3306/fit2cloud"-->
-        <!--userId="root" password="Fit2cloud2015!" />-->
         <jdbcConnection driverClass="com.mysql.cj.jdbc.Driver"
                         connectionURL="${spring.datasource.url}&amp;nullCatalogMeansCurrent=true"
                         userId="${spring.datasource.username}" password="${spring.datasource.password}"/>
@@ -63,9 +60,9 @@
         </javaClientGenerator>
 
         <!--要生成的数据库表 -->
-
-
-        <table tableName="v_auth_model"/>
+        <table tableName="dataset_row_permissions">
+            <columnOverride column="filter" javaType="java.lang.String" jdbcType="VARCHAR" />
+        </table>
 
 
     </context>

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -290,3 +290,4 @@ i18n_dataset_field_delete=该自定义数据集有关联字段被删除，请重
 i18n_es_limit=Elasticsearch 版本不能小于6.3
 i18n_ds_error=预览数据错误：执行SQL失败。可能因相关字段、表、数据集等元素发生变更，请检查
 i18n_union_ds_no_checked=当前关联数据集，无选中字段，请重新编辑
+i18n_auth_row_permission=行权限

backend/src/main/resources/sql/sqlTemplate.stg

@@ -18,7 +18,7 @@ FROM
     <table.tableName>   <table.tableAlias>
 <if(filters)>
 WHERE
-    <filters:{filter|<if(filter)><filter.whereField> <filter.whereTermAndValue><endif>}; separator="\nAND ">
+    <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
 <endif>
 <if(groups)>
 GROUP BY
@@ -31,9 +31,12 @@ ORDER BY
 >>
 
 
-previewSql(groups, aggregators, filters, orders, table, isGroup)
+previewSql(limitFiled, groups, aggregators, filters, orders, table, isGroup)
 ::=<<
 SELECT
+<if(limitFiled)>
+   <limitFiled.limitFiled>
+<endif>
 <if(!groups && !aggregators)>
     *
 <endif>
@@ -48,7 +51,7 @@ FROM
     <table.tableName>   <table.tableAlias>
 <if(filters)>
 WHERE
-    <filters:{filter|<if(filter)><filter.whereField> <filter.whereTermAndValue><endif>}; separator="\nAND ">
+    <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
 <endif>
 <if(isGroup && groups)>
 GROUP BY

frontend/src/api/dataset/dataset.js

@@ -173,4 +173,13 @@ export function datasetTaskList(page, size, data, loading) {
   })
 }
 
+export function datasetRowPermissionsList(datasetId, page, size, data, loading) {
+  return request({
+    url: '/dataset/rowpermissions/pageList/' + datasetId + '/' + page + '/' + size,
+    method: 'post',
+    data,
+    loading: loading
+  })
+}
+
 export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree }

frontend/src/components/DeDrag/index.vue

@@ -9,6 +9,7 @@
         [classNameResizable]: resizable,
         [classNameRotating]: rotating,
         [classNameRotatable]: rotatable,
+        [classNameActive]: enabled ,
         ['linkageSetting']:linkageActive,
         ['positionChange']:!(dragging || resizing||rotating)
       },
@@ -22,7 +23,7 @@
     <div
       :class="[
         {
-          [classNameActive]: enabled ,
+          ['de-drag-active-inner']:enabled,
           [classNameMouseOn]: mouseOn || active
         },
         className
@@ -1809,7 +1810,10 @@ export default {
 }
 
 .de-drag-active{
-  outline: 1px solid #70c0ff;
   user-select: none;
 }
+
+.de-drag-active-inner{
+  outline: 1px solid #70c0ff;
+}
 </style>

frontend/src/components/canvas/components/Editor/CloseBar.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="bar-main">
+    <div style="margin-right: -1px;width: 18px">
+      <i class="icon iconfont icon-guanbi" @click.stop="closePreview" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import bus from '@/utils/bus'
+import SettingMenu from '@/components/canvas/components/Editor/SettingMenu'
+import LinkageField from '@/components/canvas/components/Editor/LinkageField'
+
+export default {
+  components: { },
+
+  props: {
+
+  },
+  data() {
+    return {
+
+    }
+  },
+  computed: {
+
+  },
+  mounted() {
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    closePreview() {
+      this.$emit('closePreview')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .bar-main{
+    position: absolute;
+    right: 0px;
+    float:right;
+    z-index: 2;
+    border-radius:2px;
+    padding-left: 5px;
+    padding-right: 2px;
+    cursor:pointer!important;
+    background-color: #0a7be0;
+  }
+  .bar-main i{
+    color: white;
+    float: right;
+    margin-right: 3px;
+  }
+
+</style>

frontend/src/components/canvas/components/Editor/ComponentWrapper.vue

@@ -5,7 +5,8 @@
     @click="handleClick"
     @mousedown="elementMouseDown"
   >
-    <edit-bar v-if="editBarShow" :element="config" @showViewDetails="showViewDetails" />
+    <edit-bar v-if="componentActiveFlag" :element="config" @showViewDetails="showViewDetails" />
+    <close-bar v-if="previewVisible" @closePreview="closePreview" />
     <de-out-widget
       v-if="config.type==='custom'"
       :id="'component' + config.id"
@@ -14,6 +15,7 @@
       :out-style="config.style"
       :element="config"
       :in-screen="inScreen"
+      :h="config.style.height"
     />
     <component
       :is="config.component"
@@ -23,6 +25,7 @@
       :style="getComponentStyleDefault(config.style)"
       :prop-value="config.propValue"
       :is-edit="false"
+      :active="componentActiveFlag"
       :element="config"
       :search-count="searchCount"
       :h="config.style.height"
@@ -39,9 +42,10 @@ import { mapState } from 'vuex'
 import DeOutWidget from '@/components/dataease/DeOutWidget'
 import EditBar from '@/components/canvas/components/Editor/EditBar'
 import MobileCheckBar from '@/components/canvas/components/Editor/MobileCheckBar'
+import CloseBar from '@/components/canvas/components/Editor/CloseBar'
 
 export default {
-  components: { MobileCheckBar, DeOutWidget, EditBar },
+  components: { CloseBar, MobileCheckBar, DeOutWidget, EditBar },
   mixins: [mixins],
   props: {
     config: {
@@ -63,11 +67,20 @@ export default {
       type: Boolean,
       required: false,
       default: true
+    },
+    terminal: {
+      type: String,
+      default: 'pc'
+    }
+  },
+  data() {
+    return {
+      previewVisible: false
     }
   },
   computed: {
-    editBarShow() {
-      return this.curComponent && this.config === this.curComponent
+    componentActiveFlag() {
+      return (this.curComponent && this.config === this.curComponent) && !this.previewVisible
     },
     curGap() {
       return this.config.auxiliaryMatrix ? this.componentGap : 0
@@ -155,7 +168,14 @@ export default {
       this.$store.commit('setCurComponent', { component: this.config, index: this.index })
     },
     showViewDetails() {
-      this.$refs.wrapperChild.openChartDetailsDialog()
+      if (this.terminal === 'pc') {
+        this.$refs.wrapperChild.openChartDetailsDialog()
+      } else {
+        this.previewVisible = true
+      }
+    },
+    closePreview() {
+      this.previewVisible = false
     }
   }
 }

frontend/src/components/canvas/components/Editor/EditBar.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="bar-main">
-    <div v-if="linkageSettingStatus&&element!==curLinkageView&&element.type==='view'" style="margin-right: -1px;width: 18px">
+    <div v-if="linkageAreaShow" style="margin-right: -1px;width: 18px">
       <el-checkbox v-model="linkageInfo.linkageActive" />
       <linkage-field v-if="linkageInfo.linkageActive" :element="element" />
     </div>
-    <div v-else-if="!linkageSettingStatus">
+    <div v-if="normalAreaShow">
       <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;" @amRemoveItem="amRemoveItem" @linkJumpSet="linkJumpSet">
         <span slot="icon" :title="$t('panel.setting')">
           <i class="icon iconfont icon-shezhi" style="margin-top:2px" />
@@ -26,7 +26,6 @@
         <i v-if="curComponent.type==='view'&&existLinkage" class="icon iconfont icon-quxiaoliandong" @click.stop="clearLinkage" />
       </span>
     </div>
-
   </div>
 </template>
 
@@ -54,6 +53,10 @@ export default {
       type: String,
       required: false,
       default: 'preview'
+    },
+    previewVisible: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -70,6 +73,14 @@ export default {
   mounted() {
   },
   computed: {
+    // 联动区域按钮显示
+    linkageAreaShow() {
+      return this.linkageSettingStatus && this.element !== this.curLinkageView && this.element.type === 'view'
+    },
+    // 编辑或预览区域显示
+    normalAreaShow() {
+      return !this.linkageSettingStatus
+    },
     existLinkage() {
       let linkageFiltersCount = 0
       this.componentData.forEach(item => {
@@ -102,6 +113,9 @@ export default {
   beforeDestroy() {
   },
   methods: {
+    closePreview() {
+      this.$emit('closePreview')
+    },
     createTimer() {
       if (!this.timer) {
         this.timer = setInterval(() => {

frontend/src/components/canvas/components/Editor/EditBarView.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class="bar-main">
+    <div v-if="!linkageSettingStatus">
+      <span v-if="isEdit" :title="$t('panel.edit')">
+        <i class="icon iconfont icon-edit" @click.stop="edit" />
+      </span>
+      <span :title="$t('panel.details')">
+        <i class="icon iconfont icon-fangda" @click.stop="showViewDetails" />
+      </span>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import bus from '@/utils/bus'
+import { mapState } from 'vuex'
+export default {
+  props: {
+    viewId: {
+      type: String,
+      required: true
+    },
+    isEdit: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  },
+  data() {
+    return {
+      componentType: null,
+      linkageActiveStatus: false,
+      editFilter: [
+        'view',
+        'custom'
+      ],
+      timer: null
+    }
+  },
+  computed: {
+    ...mapState([
+      'linkageSettingStatus',
+      'componentData',
+      'canvasStyleData'
+    ])
+  },
+  mounted() {
+  },
+  beforeDestroy() {
+  },
+  methods: {
+    edit() {
+      // 编辑时临时保存 当前修改的画布
+      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
+      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
+      this.$store.dispatch('chart/setViewId', null)
+      this.$store.dispatch('chart/setViewId', this.viewId)
+      bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.viewId, 'optType': 'edit' }})
+    },
+    linkageEdit() {
+
+    },
+    amRemoveItem() {
+      this.$emit('amRemoveItem')
+    },
+    showViewDetails() {
+      this.$emit('showViewDetails')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .bar-main{
+    position: absolute;
+    right: 0px;
+    float:right;
+    z-index: 2;
+    border-radius:2px;
+    padding-left: 5px;
+    padding-right: 2px;
+    cursor:pointer!important;
+    background-color: #0a7be0;
+  }
+  .bar-main i{
+    color: white;
+    float: right;
+    margin-right: 3px;
+  }
+
+</style>

frontend/src/components/canvas/components/Editor/LinkageField.vue

@@ -51,7 +51,7 @@
                   <svg-icon v-if="item.deType === 2 || item.value === 3" icon-class="field_value" class="field-icon-value" />
                   <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
                 </span>
-                <span style="float: left; color: #8492a6; font-size: 12px">{{ itemLinkage.targetField }}-{{ item.name }}</span>
+                <span style="float: left; color: #8492a6; font-size: 12px">{{ item.name }}</span>
               </el-option>
             </el-select>
           </div>

frontend/src/components/canvas/components/Editor/Preview.vue

@@ -19,6 +19,7 @@
           :config="item"
           :search-count="searchCount"
           :in-screen="inScreen"
+          :terminal="terminal"
         />
         <!--视图详情-->
         <el-dialog
@@ -36,6 +37,17 @@
           </span>
           <UserViewDialog ref="userViewDialog" :chart="showChartInfo" :chart-table="showChartTableInfo" />
         </el-dialog>
+
+        <!--手机视图详情-->
+        <el-dialog
+          :title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
+          :visible.sync="mobileChartDetailsVisible"
+          :fullscreen="true"
+          class="mobile-dialog-css"
+          :destroy-on-close="true"
+        >
+          <UserViewMobileDialog :chart="showChartInfo" :chart-table="showChartTableInfo" />
+        </el-dialog>
       </div>
     </div>
   </div>
@@ -52,9 +64,10 @@ import eventBus from '@/components/canvas/utils/eventBus'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
 import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
+import UserViewMobileDialog from '@/components/canvas/custom-component/UserViewMobileDialog'
 
 export default {
-  components: { ComponentWrapper, UserViewDialog, CanvasOptBar },
+  components: { UserViewMobileDialog, ComponentWrapper, UserViewDialog, CanvasOptBar },
   model: {
     prop: 'show',
     event: 'change'
@@ -102,6 +115,7 @@ export default {
       mainHeight: '100%',
       searchCount: 0,
       chartDetailsVisible: false,
+      mobileChartDetailsVisible: false,
       showChartInfo: {},
       showChartTableInfo: {},
       // 布局展示 1.pc pc端布局 2.mobile 移动端布局
@@ -248,7 +262,11 @@ export default {
     openChartDetailsDialog(chartInfo) {
       this.showChartInfo = chartInfo.chart
       this.showChartTableInfo = chartInfo.tableChart
-      this.chartDetailsVisible = true
+      if (this.terminal === 'pc') {
+        this.chartDetailsVisible = true
+      } else {
+        this.mobileChartDetailsVisible
+      }
     },
     exportExcel() {
       this.$refs['userViewDialog'].exportExcel()
@@ -308,9 +326,16 @@ export default {
     padding: 10px 20px 20px;
   }
 
+  .mobile-dialog-css > > > .el-dialog__body {
+    padding: 0px;
+  }
   ::-webkit-scrollbar {
     width: 0px!important;
     height: 0px!important;
   }
 
+  ::v-deep .el-tabs__nav{
+   z-index: 0;
+  }
+
 </style>

frontend/src/components/canvas/components/Editor/SettingMenu.vue

@@ -13,7 +13,7 @@
           <el-dropdown-item icon="el-icon-arrow-down" @click.native="downComponent">{{ $t('panel.downComponent') }}</el-dropdown-item>
           <el-dropdown-item v-if="'view'===curComponent.type" icon="el-icon-link" @click.native="linkageSetting">{{ $t('panel.linkage_setting') }}</el-dropdown-item>
           <el-dropdown-item v-if="'de-tabs'===curComponent.type" icon="el-icon-link" @click.native="addTab">{{ $t('panel.add_tab') }}</el-dropdown-item>
-          <el-dropdown-item  v-if="'view'===curComponent.type" icon="el-icon-connection" @click.native="linkJumpSet">跳转设置</el-dropdown-item>
+          <el-dropdown-item v-if="'view'===curComponent.type" icon="el-icon-connection" @click.native="linkJumpSet">跳转设置</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>

frontend/src/components/canvas/components/Editor/index.vue

@@ -80,6 +80,7 @@
         :element="item"
         :out-style="getShapeStyleInt(item.style)"
         :active="item === curComponent"
+        :h="getShapeStyleIntDeDrag(item.style,'height')"
       />
       <component
         :is="item.component"
@@ -1567,13 +1568,6 @@ export default {
    padding:3px;
 }
 
-// 拖拽组件样式
-
-.de-drag-active{
-  outline: 1px solid #70c0ff;
-  user-select: none;
-}
-
 .ref-line {
   position: absolute;
   background-color: #70c0ff;;

frontend/src/components/canvas/custom-component/UserView.vue

@@ -8,6 +8,7 @@
       'rect-shape'
     ]"
   >
+    <EditBarView v-if="editBarViewShowFlag" :is-edit="isEdit" :view-id="element.propValue.viewId" @showViewDetails="openChartDetailsDialog" />
     <div v-if="requestStatus==='error'" class="chart-error-class">
       <div class="chart-error-message-class">
         {{ message }},{{ $t('chart.chart_show_error') }}
@@ -67,10 +68,11 @@ import { getToken, getLinkToken } from '@/utils/auth'
 import DrillPath from '@/views/chart/view/DrillPath'
 import { areaMapping } from '@/api/map/map'
 import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
+import EditBarView from '@/components/canvas/components/Editor/EditBarView'
 
 export default {
   name: 'UserView',
-  components: { ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
+  components: { EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
   props: {
     element: {
       type: Object,
@@ -93,10 +95,19 @@ export default {
       required: false,
       default: false
     },
-    // eslint-disable-next-line vue/require-default-prop
     componentIndex: {
       type: Number,
       required: false
+    },
+    inTab: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    isEdit: {
+      type: Boolean,
+      require: false,
+      default: true
     }
   },
   data() {
@@ -120,6 +131,9 @@ export default {
     }
   },
   computed: {
+    editBarViewShowFlag() {
+      return this.active && this.inTab
+    },
     charViewShowFlag() {
       return this.httpRequest.status && this.chart.type && !this.chart.type.includes('table') && !this.chart.type.includes('text') && this.renderComponent() === 'echarts'
     },
@@ -194,7 +208,8 @@ export default {
     ...mapState([
       'canvasStyleData',
       'nowPanelTrackInfo',
-      'nowPanelJumpInfo'
+      'nowPanelJumpInfo',
+      'publicLinkStatus'
     ])
   },
 
@@ -385,9 +400,23 @@ export default {
         // 内部仪表板跳转
         if (jumpInfo.linkType === 'inner') {
           if (jumpInfo.targetPanelId) {
-            const url = '#/preview/' + jumpInfo.targetPanelId
             localStorage.setItem('jumpInfoParam', JSON.stringify(param))
-            window.open(url, jumpInfo.jumpType)
+            if (this.publicLinkStatus) {
+              // 判断是否有公共链接ID
+              if (jumpInfo.publicJumpId) {
+                const url = '/link/' + jumpInfo.publicJumpId
+                window.open(url, jumpInfo.jumpType)
+              } else {
+                this.$message({
+                  type: 'warn',
+                  message: this.$t('panel.public_link_tips'),
+                  showClose: true
+                })
+              }
+            } else {
+              const url = '#/preview/' + jumpInfo.targetPanelId
+              window.open(url, jumpInfo.jumpType)
+            }
           } else {
             this.$message({
               type: 'warn',
@@ -566,31 +595,31 @@ export default {
     display: block !important;
   }
 
-  .rect-shape > i {
-    right: 5px;
-    color: gray;
-    position: absolute;
-  }
+  /*.rect-shape > i {*/
+  /*  right: 5px;*/
+  /*  color: gray;*/
+  /*  position: absolute;*/
+  /*}*/
 
-  .rect-shape > > > i:hover {
-    color: red;
-  }
+  /*.rect-shape > > > i:hover {*/
+  /*  color: red;*/
+  /*}*/
 
-  .rect-shape:hover > > > .icon-fangda {
-    z-index: 2;
-    display: block;
-  }
+  /*.rect-shape:hover > > > .icon-fangda {*/
+  /*  z-index: 2;*/
+  /*  display: block;*/
+  /*}*/
 
-  .rect-shape > > > .icon-fangda {
-    display: none
-  }
+  /*.rect-shape > > > .icon-fangda {*/
+  /*  display: none*/
+  /*}*/
 
-  .rect-shape:hover > > > .icon-shezhi {
-    z-index: 2;
-    display: block;
-  }
+  /*.rect-shape:hover > > > .icon-shezhi {*/
+  /*  z-index: 2;*/
+  /*  display: block;*/
+  /*}*/
 
-  .rect-shape > > > .icon-shezhi {
-    display: none
-  }
+  /*.rect-shape > > > .icon-shezhi {*/
+  /*  display: none*/
+  /*}*/
 </style>

frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue

@@ -0,0 +1,90 @@
+<template>
+  <de-container>
+    <de-main-container v-if="!chart.type.includes('table')" :style="customStyle" class="full-div">
+      <chart-component v-if="!chart.type.includes('text') && renderComponent() === 'echarts'" class="chart-class" :chart="chart" />
+      <chart-component-g2 v-if="!chart.type.includes('text') && renderComponent() === 'antv'" class="chart-class" :chart="chart" />
+      <label-normal v-if="chart.type.includes('text')" :chart="chart" class="table-class" />
+    </de-main-container>
+    <de-main-container v-else>
+      <table-normal :chart="chartTable" :show-summary="false" class="table-class" />
+    </de-main-container>
+  </de-container>
+</template>
+
+<script>
+
+import ChartComponent from '@/views/chart/components/ChartComponent.vue'
+import TableNormal from '@/views/chart/components/table/TableNormal'
+import LabelNormal from '@/views/chart/components/normal/LabelNormal'
+import { mapState } from 'vuex'
+import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
+import DeMainContainer from '@/components/dataease/DeMainContainer'
+import DeContainer from '@/components/dataease/DeContainer'
+
+export default {
+  name: 'UserViewMobileDialog',
+  components: { DeContainer, DeMainContainer, ChartComponentG2, ChartComponent, TableNormal, LabelNormal },
+  props: {
+    chart: {
+      type: Object,
+      default: null
+    },
+    chartTable: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      refId: null
+    }
+  },
+  computed: {
+    customStyle() {
+      let style = {
+      }
+      if (this.canvasStyleData.openCommonStyle) {
+        if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
+          style = {
+            background: `url(${this.canvasStyleData.panel.imageUrl}) no-repeat`,
+            ...style
+          }
+        } else if (this.canvasStyleData.panel.backgroundType === 'color') {
+          style = {
+            background: this.canvasStyleData.panel.color,
+            ...style
+          }
+        }
+      }
+      if (!style.background) {
+        style.background = '#FFFFFF'
+      }
+      return style
+    },
+    ...mapState([
+      'isClickComponent',
+      'curComponent',
+      'componentData',
+      'canvasStyleData'
+    ])
+  },
+  methods: {
+
+    renderComponent() {
+      return this.chart.render
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .ms-main-container {
+    border: 0px;
+  }
+  .chart-class{
+    height: 100%;
+  }
+  .table-class{
+    height: 100%;
+  }
+</style>

frontend/src/components/canvas/custom-component/component-list.js

@@ -85,7 +85,7 @@ export const assistList = [
     component: 'rect-shape',
     type: 'rect-shape',
     label: '矩形',
-    icon: 'iconfont icon-juxing',
+    icon: 'iconfont icon-juxing1',
     defaultClass: 'text-filter'
   },
   {

frontend/src/components/canvas/utils/utils.js

@@ -51,7 +51,7 @@ export function mobile2MainCanvas(mainSource, mobileSource) {
     top: mobileSource.style.top
   }
   mainSource.mobileStyle.x = mobileSource.x
-  mainSource.mobileStyle.y = mobileSource.x
+  mainSource.mobileStyle.y = mobileSource.y
   mainSource.mobileStyle.sizex = mobileSource.sizex
   mainSource.mobileStyle.sizey = mobileSource.sizey
 }

frontend/src/components/dataease/DeOutWidget.vue

@@ -23,6 +23,7 @@
                 :element="element"
                 :in-draw="inDraw"
                 :in-screen="inScreen"
+                :size="sizeInfo"
               />
             </div>
           </div>
@@ -49,16 +50,37 @@ export default {
       type: Boolean,
       required: false,
       default: true
+    },
+    h: {
+      type: Number,
+      default: 50
     }
   },
   data() {
     return {
+      inputMaxSize: 46,
+      inputLargeSize: 42,
+      inputSmallSize: 38,
+      inputMiniSize: 34,
       options: null,
       showNumber: false,
       mainClass: ''
     }
   },
-
+  computed: {
+    sizeInfo() {
+      let size
+      if (this.h > this.inputMaxSize) {
+      } else if (this.h > this.inputLargeSize) {
+        size = 'medium'
+      } else if (this.h > this.inputSmallSize) {
+        size = 'small'
+      } else {
+        size = 'mini'
+      }
+      return size
+    }
+  },
   mounted() {
     this.watchSize()
   },

frontend/src/components/widget/DeWidget/DeButton.vue

@@ -4,6 +4,7 @@
     v-if="options!== null && options.attrs!==null"
     :type="options.attrs.type"
     :round="options.attrs.round"
+    :size="size"
   >
     {{ options.value }}
   </el-button>
@@ -20,7 +21,8 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -9,8 +9,9 @@
     :end-placeholder="$t(element.options.attrs.endPlaceholder)"
     :placeholder="$t(element.options.attrs.placeholder)"
     :append-to-body="inScreen"
-    style="min-height: 36px;"
     value-format="timestamp"
+    :size="size"
+    :editable="false"
     @change="dateChange"
   />
 </template>
@@ -33,7 +34,8 @@ export default {
       type: Boolean,
       required: false,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

frontend/src/components/widget/DeWidget/DeInputSearch.vue

@@ -8,6 +8,7 @@
     @input="valueChange"
     @keypress.enter.native="search"
     @dblclick="setEdit"
+    :size="size"
   >
 
     <el-button slot="append" icon="el-icon-search" @click="search" />
@@ -26,7 +27,8 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

frontend/src/components/widget/DeWidget/DeQuarter.vue

@@ -2,8 +2,9 @@
   <el-quarter
     v-if="options!== null && options.attrs!==null"
     v-model="options.value"
-
     :placeholder="options.attrs.placeholder"
+    :size="size"
+    :editable="false"
   />
 </template>
 
@@ -18,7 +19,8 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

frontend/src/components/widget/DeWidget/DeSelect.vue

@@ -9,6 +9,7 @@
     :multiple="element.options.attrs.multiple"
     :placeholder="$t(element.options.attrs.placeholder)"
     :popper-append-to-body="inScreen"
+    :size="size"
     @change="changeValue"
     @focus="setOptionWidth"
   >
@@ -42,7 +43,8 @@ export default {
       type: Boolean,
       required: false,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

frontend/src/components/widget/DeWidget/DeTabs.vue

@@ -35,7 +35,7 @@
         </span>
 
         <div v-if="activeTabName === item.name" class="de-tab-content">
-          <user-view v-if="item.content && item.content.propValue && item.content.propValue.viewId" :ref="item.name" :element="item.content" :out-style="outStyle" />
+          <user-view v-if="item.content && item.content.propValue && item.content.propValue.viewId" :ref="item.name" :in-tab="true" :is-edit="isEdit" :active="active" :element="item.content" :out-style="outStyle" />
         </div>
 
       </el-tab-pane>
@@ -94,6 +94,7 @@ import ViewSelect from '@/views/panel/ViewSelect'
 import { uuid } from 'vue-uuid'
 import bus from '@/utils/bus'
 import componentList from '@/components/canvas/custom-component/component-list'
+import { mapState } from 'vuex'
 
 export default {
   name: 'DeTabls',
@@ -107,6 +108,10 @@ export default {
       type: Boolean,
       default: true
     },
+    active: {
+      type: Boolean,
+      default: false
+    },
     outStyle: {
       type: Object,
       required: false,
@@ -129,11 +134,24 @@ export default {
       tabList: []
     }
   },
+  watch: {
+    curComponent: {
+      handler(newVal, oldVla) {
+        console.log(newVal)
+      },
+      deep: true
+    }
+  },
   created() {
     bus.$on('add-new-tab', this.addNewTab)
     this.tabList = this.element.options && this.element.options.tabList
     this.activeTabName = this.tabList[0].name
   },
+  computed: {
+    ...mapState([
+      'curComponent'
+    ])
+  },
   methods: {
     beforeHandleCommond(item, param) {
       return {

frontend/src/components/widget/DeWidget/DeTreeSelect.vue

@@ -1,6 +1,6 @@
 <template>
 
-  <el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
+  <el-select :size="size" v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
     <el-option
       v-for="item in options.attrs.datas"
       :key="item[options.attrs.key]"
@@ -28,7 +28,8 @@ export default {
       type: Boolean,
       required: false,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

frontend/src/lang/en.js

@@ -992,7 +992,9 @@ export default {
     day_mom: 'Day mom',
     data_sub: 'Sub',
     data_percent: 'Percent',
-    compare_calc_expression: 'Expression'
+    compare_calc_expression: 'Expression',
+    and: 'And',
+    or: 'Or'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
@@ -1173,6 +1175,16 @@ export default {
     confirm_sync_field_tips: 'Sync field maybe change edit field，please confirm',
     sync_success: 'Success',
     sync_success_1: 'Success，please sync data again',
+    row_permission: {
+      type: 'Type',
+      name: 'Name',
+      condition: 'Conditions',
+      value: 'Value',
+      add: 'Add row permissions',
+      edit: 'Edit row permissions',
+      please_select_field: 'Please select a field'
+    },
+    row_permissions: 'Row Permissions',
     union_data: 'Union Dataset',
     add_union_table: 'Add Union Dataset',
     edit_union: 'Edit Union Dataset',
@@ -1448,7 +1460,8 @@ export default {
     panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000',
     timeout_refresh: 'Timeout，Will Refresh...',
     mobile_layout: 'Mobile Layout',
-    component_hidden: 'Component Hidden'
+    component_hidden: 'Component Hidden',
+    public_link_tips: 'New Is Public Link,The Target Panel Have Not Set Public Link,Can Not Jump'
   },
   plugin: {
     local_install: 'Local installation',

frontend/src/lang/tw.js

@@ -992,7 +992,9 @@ export default {
     day_mom: '日環比',
     data_sub: '對比差值',
     data_percent: '差值百分比',
-    compare_calc_expression: '計算公式'
+    compare_calc_expression: '計算公式',
+    and: '與',
+    or: '或'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
@@ -1173,6 +1175,16 @@ export default {
     confirm_sync_field_tips: '同步字段可能會導致已編輯字段發生變更，請確認',
     sync_success: '同步成功',
     sync_success_1: '同步成功，請對當前數據集重新執行數據同步操作',
+    row_permission: {
+      type: '類型',
+      name: '名稱',
+      condition: '條件',
+      value: '值',
+      add: '添加行權限',
+      edit: '編輯行權限',
+      please_select_field: '請選擇字段'
+    },
+    row_permissions: '行權限',
     union_data: '關聯數據集',
     add_union_table: '添加關聯數據集',
     edit_union: '編輯關聯數據集',
@@ -1450,7 +1462,8 @@ export default {
     panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量，取值範圍1~10000',
     timeout_refresh: '请求超时，稍后刷新...',
     mobile_layout: '移动端布局',
-    component_hidden: '隐藏的组件'
+    component_hidden: '隐藏的组件',
+    public_link_tips: '当前是公共链接模式，目标仪表板未设置公共链接，无法跳转'
   },
   plugin: {
     local_install: '本地安裝',

frontend/src/lang/zh.js

@@ -995,7 +995,9 @@ export default {
     day_mom: '日环比',
     data_sub: '对比差值',
     data_percent: '差值百分比',
-    compare_calc_expression: '计算公式'
+    compare_calc_expression: '计算公式',
+    and: '与',
+    or: '或'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
@@ -1176,6 +1178,16 @@ export default {
     confirm_sync_field_tips: '同步字段可能会导致已编辑字段发生变更，请确认',
     sync_success: '同步成功',
     sync_success_1: '同步成功，请对当前数据集重新执行数据同步操作',
+    row_permission: {
+      type: '类型',
+      name: '名称',
+      condition: '条件',
+      value: '值',
+      add: '添加行权限',
+      edit: '编辑行权限',
+      please_select_field: '请选择字段'
+    },
+    row_permissions: '行权限',
     union_data: '关联数据集',
     add_union_table: '添加关联数据集',
     edit_union: '编辑关联数据集',
@@ -1459,7 +1471,8 @@ export default {
     panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量，取值范围1~10000',
     timeout_refresh: '请求超时，稍后刷新...',
     mobile_layout: '移动端布局',
-    component_hidden: '隐藏的组件'
+    component_hidden: '隐藏的组件',
+    public_link_tips: '当前是公共链接模式，目标仪表板未设置公共链接，无法跳转'
   },
   plugin: {
     local_install: '本地安装',

frontend/src/store/index.js

@@ -79,6 +79,8 @@ const data = {
     componentGap: 5,
     // 移动端布局状态
     mobileLayoutStatus: false,
+    // 公共链接状态(当前是否是公共链接打开)
+    publicLinkStatus: false,
     pcMatrixCount: {
       x: 36,
       y: 18
@@ -326,6 +328,9 @@ const data = {
     setMobileLayoutStatus(state, status) {
       state.mobileLayoutStatus = status
     },
+    setPublicLinkStatus(state, status) {
+      state.publicLinkStatus = status
+    },
     // 启用移动端布局
     openMobileLayout(state) {
       state.componentDataCache = JSON.stringify(state.componentData)

frontend/src/styles/deicon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2459092 */
-  src: url('iconfont.woff2?t=1636516993563') format('woff2'),
-       url('iconfont.woff?t=1636516993563') format('woff'),
-       url('iconfont.ttf?t=1636516993563') format('truetype');
+  src: url('iconfont.woff2?t=1639622225820') format('woff2'),
+       url('iconfont.woff?t=1639622225820') format('woff'),
+       url('iconfont.ttf?t=1639622225820') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-guanbi:before {
+  content: "\e60d";
+}
+
+.icon-juxing1:before {
+  content: "\e67e";
+}
+
 .icon-yidongduan:before {
   content: "\e653";
 }
@@ -37,10 +45,6 @@
   content: "\e91b";
 }
 
-.icon-tabs:before {
-  content: "\e9a8";
-}
-
 .icon-shijian:before {
   content: "\e665";
 }
@@ -81,6 +85,10 @@
   content: "\e8e6";
 }
 
+.icon-tabs:before {
+  content: "\e62a";
+}
+
 .icon-xiyu:before {
   content: "\e619";
 }

frontend/src/styles/deicon/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "1367318",
+      "name": "关闭",
+      "font_class": "guanbi",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "23446403",
+      "name": "矩形",
+      "font_class": "juxing1",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
     {
       "icon_id": "11799014",
       "name": "移动端",
@@ -47,13 +61,6 @@
       "unicode": "e91b",
       "unicode_decimal": 59675
     },
-    {
-      "icon_id": "11982148",
-      "name": "tabs",
-      "font_class": "tabs",
-      "unicode": "e9a8",
-      "unicode_decimal": 59816
-    },
     {
       "icon_id": "658039",
       "name": "时间",
@@ -124,6 +131,13 @@
       "unicode": "e8e6",
       "unicode_decimal": 59622
     },
+    {
+      "icon_id": "15196968",
+      "name": "44.tabs",
+      "font_class": "tabs",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
     {
       "icon_id": "23570269",
       "name": "洗浴",

frontend/src/views/chart/components/drag-item/QuotaExtItem.vue

@@ -14,7 +14,7 @@
       </span>
       <span class="item-span-style" :title="item.name">{{ item.name }}</span>
       <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
-        {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
+        {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
       </span>
     </el-tag>
     <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
@@ -33,7 +33,7 @@
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
           <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
-            {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
+            {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
           </span>
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
         </el-tag>

frontend/src/views/chart/components/drag-item/QuotaItem.vue

@@ -14,7 +14,7 @@
       </span>
       <span class="item-span-style" :title="item.name">{{ item.name }}</span>
       <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
-        {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
+        {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
       </span>
     </el-tag>
     <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
@@ -33,7 +33,7 @@
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
           <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
-            {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
+            {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
           </span>
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
         </el-tag>

frontend/src/views/chart/components/filter/QuotaFilterEditor.vue

@@ -1,6 +1,18 @@
 <template>
   <el-col>
-    <el-button icon="el-icon-plus" circle size="mini" style="margin-bottom: 10px;" @click="addFilter" />
+    <div style="display: inline-block;">
+      <el-button icon="el-icon-plus" circle size="mini" style="margin-bottom: 10px;" @click="addFilter" />
+      <el-radio-group
+        v-model="logic"
+        size="mini"
+        style="margin-left: 10px;"
+        @change="logicChange"
+      >
+        <el-radio-button label="and">{{ $t('chart.and') }}</el-radio-button>
+        <el-radio-button label="or">{{ $t('chart.or') }}</el-radio-button>
+      </el-radio-group>
+    </div>
+
     <div style="max-height: 50vh;overflow-y: auto;">
       <el-row v-for="(f,index) in item.filter" :key="index" class="filter-item">
         <el-col :span="4">
@@ -54,16 +66,6 @@ export default {
           label: this.$t('chart.filter_not_eq')
         }]
       },
-      // {
-      //   label: '',
-      //   options: [{
-      //     value: 'like',
-      //     label: this.$t('chart.filter_like')
-      //   }, {
-      //     value: 'not like',
-      //     label: this.$t('chart.filter_not_like')
-      //   }]
-      // },
       {
         label: '',
         options: [{
@@ -83,12 +85,17 @@ export default {
           value: 'ge',
           label: this.$t('chart.filter_ge')
         }]
-      }]
+      }],
+      logic: ''
     }
   },
   mounted() {
+    this.init()
   },
   methods: {
+    init() {
+      this.logic = this.item.logic
+    },
     addFilter() {
       this.item.filter.push({
         term: 'eq',
@@ -97,6 +104,9 @@ export default {
     },
     removeFilter(index) {
       this.item.filter.splice(index, 1)
+    },
+    logicChange(val) {
+      this.item.logic = val
     }
   }
 }

frontend/src/views/chart/components/filter/ResultFilterEditor.vue

@@ -1,6 +1,18 @@
 <template>
   <el-col>
-    <el-button icon="el-icon-plus" circle size="mini" style="margin-bottom: 10px;" @click="addFilter" />
+    <div style="display: inline-block;">
+      <el-button icon="el-icon-plus" circle size="mini" style="margin-bottom: 10px;" @click="addFilter" />
+      <el-radio-group
+        v-model="logic"
+        size="mini"
+        style="margin-left: 10px;"
+        @change="logicChange"
+      >
+        <el-radio-button label="and">{{ $t('chart.and') }}</el-radio-button>
+        <el-radio-button label="or">{{ $t('chart.or') }}</el-radio-button>
+      </el-radio-group>
+    </div>
+
     <div style="max-height: 50vh;overflow-y: auto;">
       <el-row v-for="(f,index) in item.filter" :key="index" class="filter-item">
         <el-col :span="4">
@@ -156,7 +168,8 @@ export default {
           }]
         }
       ],
-      options: []
+      options: [],
+      logic: ''
     }
   },
   watch: {
@@ -166,6 +179,7 @@ export default {
   },
   mounted() {
     this.initOptions()
+    this.init()
   },
   methods: {
     initOptions() {
@@ -179,6 +193,9 @@ export default {
         }
       }
     },
+    init() {
+      this.logic = this.item.logic
+    },
     addFilter() {
       this.item.filter.push({
         fieldId: this.item.id,
@@ -188,6 +205,9 @@ export default {
     },
     removeFilter(index) {
       this.item.filter.splice(index, 1)
+    },
+    logicChange(val) {
+      this.item.logic = val
     }
   }
 }

frontend/src/views/chart/view/ChartEdit.vue

@@ -804,6 +804,7 @@
 
     <!--指标过滤器-->
     <el-dialog
+      v-if="quotaFilterEdit"
       v-dialogDrag
       :title="$t('chart.add_filter')"
       :visible="quotaFilterEdit"
@@ -818,6 +819,7 @@
       </div>
     </el-dialog>
     <el-dialog
+      v-if="dimensionFilterEdit"
       v-dialogDrag
       :title="$t('chart.add_filter')"
       :visible="dimensionFilterEdit"
@@ -832,6 +834,7 @@
       </div>
     </el-dialog>
     <el-dialog
+      v-if="resultFilterEdit"
       v-dialogDrag
       :title="$t('chart.add_filter')"
       :visible="resultFilterEdit"
@@ -1612,6 +1615,9 @@ export default {
 
     showQuotaEditFilter(item) {
       this.quotaItem = JSON.parse(JSON.stringify(item))
+      if (!this.quotaItem.logic) {
+        this.quotaItem.logic = 'and'
+      }
       this.quotaFilterEdit = true
     },
     closeQuotaFilter() {
@@ -1631,8 +1637,10 @@ export default {
       }
       if (this.quotaItem.filterType === 'quota') {
         this.view.yaxis[this.quotaItem.index].filter = this.quotaItem.filter
+        this.view.yaxis[this.quotaItem.index].logic = this.quotaItem.logic
       } else if (this.quotaItem.filterType === 'quotaExt') {
         this.view.yaxisExt[this.quotaItem.index].filter = this.quotaItem.filter
+        this.view.yaxisExt[this.quotaItem.index].logic = this.quotaItem.logic
       }
       this.calcData(true)
       this.closeQuotaFilter()
@@ -1645,6 +1653,9 @@ export default {
     showEditFilter(item) {
       this.filterItem = JSON.parse(JSON.stringify(item))
       this.chartForFilter = JSON.parse(JSON.stringify(this.view))
+      if (!this.filterItem.logic) {
+        this.filterItem.logic = 'and'
+      }
       this.resultFilterEdit = true
     },
     closeResultFilter() {
@@ -1663,6 +1674,7 @@ export default {
         }
       }
       this.view.customFilter[this.filterItem.index].filter = this.filterItem.filter
+      this.view.customFilter[this.filterItem.index].logic = this.filterItem.logic
       this.calcData(true)
       this.closeResultFilter()
     },

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

@@ -76,7 +76,7 @@ import FieldEdit from './FieldEdit'
 
 export default {
   name: 'ViewTable',
-  components: { FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview },
+  components: {FieldEdit, UnionView, DatasetChartDetail, UpdateInfo, TabDataPreview },
   props: {
     param: {
       type: Object,

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

@@ -0,0 +1,226 @@
+<template>
+  <de-container style="height: auto">
+    <de-aside-container style="height: auto">
+      <el-button v-show="!showTargetSearchInput" class="de-icon" icon="el-icon-search" circle size="mini" @click="showTargetSearchWidget" />
+      <div v-show="showTargetSearchInput" class="de-input">
+        <el-input v-model="targetFilterText" class="main-area-input">
+          <el-button slot="append" icon="el-icon-close" @click="closeTargetSearchWidget" />
+        </el-input>
+      </div>
+      <el-tabs v-model="targetActiveName" :class="{'de-search-header': showTargetSearchInput}" @tab-click="handleClick">
+        <el-tab-pane v-for="(targetInfo, index) in targetInfoArray" :key="index" :lazy="true" :label="targetInfo.tabName" :name="targetInfo.authType">
+          <lazy-tree
+            v-if="targetActiveName===targetInfo.authType"
+            :active-name="targetActiveName"
+            :filter-text="targetFilterText"
+            :data-info="targetInfo"
+            highlight-current
+            @nodeClick="authNodeClick"
+            @execute-axios="executeAxios"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </de-aside-container>
+    <de-main-container class="de-main-container-auth">
+      <el-button v-show="!showSourceSearchInput" class="de-icon" icon="el-icon-search" circle size="mini" @click="showSourceSearchWidget" />
+      <div v-show="showSourceSearchInput" class="de-input">
+        <el-input v-model="sourceFilterText" class="main-area-input">
+          <el-button slot="append" icon="el-icon-close" @click="closeSourceSearchWidget" />
+        </el-input>
+      </div>
+      <el-tabs v-model="sourceActiveName" :class="{'de-search-header': showSourceSearchInput}" @tab-click="handleClick">
+        <el-tab-pane v-for="(sourceInfo, index) in sourceInfoTabs" :key="index" :lazy="true" :label="sourceInfo.tabName" :name="sourceInfo.authType">
+          <lazy-tree
+            v-if="authCondition"
+            :active-name="sourceActiveName"
+            :filter-text="sourceFilterText"
+            :data-info="sourceInfo"
+            show-extent
+            :auth-condition="authCondition"
+            @execute-axios="executeAxios"
+            :attach-active-name="targetActiveName"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </de-main-container>
+  </de-container>
+
+</template>
+
+<script>
+import DeContainer from '@/components/dataease/DeContainer'
+import DeAsideContainer from '@/components/dataease/DeAsideContainer'
+import DeMainContainer from '@/components/dataease/DeMainContainer'
+import LazyTree from './components/LazyTree'
+
+export default {
+  name: 'Authority',
+  components: { LazyTree, DeMainContainer, DeAsideContainer, DeContainer },
+  props: {
+    resourceId: {
+      type: String,
+      default: null
+    }
+  },
+  data () {
+    return {
+      targetInfoArray:
+        [
+          {
+            tabName: this.$t('auth.dept'),
+            head: this.$t('auth.deptHead'),
+            direction: 'target',
+            authType: 'dept'
+          },
+          {
+            tabName: this.$t('auth.role'),
+            head: this.$t('auth.roleHead'),
+            direction: 'target',
+            authType: 'role'
+          },
+          {
+            tabName: this.$t('auth.user'),
+            head: this.$t('auth.userHead'),
+            direction: 'target',
+            authType: 'user'
+          }],
+      sourceInfoArray:
+        [
+          {
+            tabName: this.$t('auth.linkAuth'),
+            head: this.$t('auth.linkAuthHead'),
+            direction: 'source',
+            authType: 'link',
+            authTargets: 'dept,role,user'
+          },
+          {
+            tabName: this.$t('auth.datasetAuth'),
+            head: this.$t('auth.datasetAuthHead'),
+            direction: 'source',
+            authType: 'dataset',
+            authTargets: 'dept,role,user'
+          },
+          {
+            tabName: this.$t('auth.chartAuth'),
+            head: this.$t('auth.chartAuthHead'),
+            direction: 'source',
+            authType: 'chart',
+            authTargets: 'dept,role,user'
+          },
+          {
+            tabName: this.$t('auth.panelAuth'),
+            head: this.$t('auth.panelAuthHead'),
+            direction: 'source',
+            authType: 'panel',
+            authTargets: 'dept,role,user'
+          },
+          {
+            tabName: this.$t('auth.menuAuth'),
+            head: this.$t('auth.menuAuthHead'),
+            direction: 'source',
+            authType: 'menu',
+            authTargets: 'dept,role,user'
+          }
+        ],
+      targetActiveName: null,
+      sourceActiveName: null,
+      showSourceSearchInput: false,
+      showTargetSearchInput: false,
+      sourceFilterText: '',
+      targetFilterText: '',
+      timeMachine: null,
+      authCondition: null
+    }
+  },
+  computed: {
+    sourceInfoTabs () {
+      const tabs = []
+      this.sourceInfoArray.forEach(item => {
+        if (item.authTargets.indexOf(this.targetActiveName) > -1) {
+          tabs.push(item)
+        }
+      })
+      return tabs
+    }
+  },
+  created () {
+    this.targetActiveName = this.targetInfoArray[0].authType
+    this.sourceActiveName = this.sourceInfoArray[0].authType
+  },
+
+  methods: {
+    executeAxios (param) {
+      this.$emit('execute-axios', param)
+    },
+    handleClick (tab, event) {
+    },
+    showSourceSearchWidget () {
+      this.showSourceSearchInput = true
+    },
+    closeSourceSearchWidget () {
+      this.sourceFilterText = ''
+      this.showSourceSearchInput = false
+    },
+    showTargetSearchWidget () {
+      this.showTargetSearchInput = true
+    },
+    closeTargetSearchWidget () {
+      this.targetFilterText = ''
+      this.showTargetSearchInput = false
+    },
+    save () {
+      this.$refs[this.activeName].save()
+      this.$emit('close-grant', 0)
+    },
+    cancel () {
+      this.$refs[this.activeName].cancel()
+      this.$emit('close-grant', 0)
+    },
+    authNodeClick (val) {
+      console.log('authNodeClick')
+      this.authCondition = val
+    },
+    clickAuth (auth) {
+      console.log('clickAuth')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .de-tab {
+    border:1px solid #E6E6E6;
+    min-height:200px !important;
+    max-height:300px !important;
+    overflow:auto;
+  }
+  .de-icon {
+    position: absolute;
+    right: 10px;
+    top: 15px;
+    z-index: 99;
+  }
+  .el-input-group__append{
+    background-color: #ffffff;
+  }
+  .el-input__inner{
+    border-right: none;
+  }
+
+  .auth-root-class {
+    margin: 15px 0px 5px;
+    text-align: right;
+  }
+  .de-main-container-auth{
+    border: 1px solid #E6E6E6;
+    height: auto;
+  }
+
+  .blackTheme .de-main-container-auth {
+      border-color: #495865;
+  }
+
+  // ::-webkit-scrollbar {
+
+  // }
+</style>

frontend/src/views/dataset/data/components/LazyTree.vue

@@ -0,0 +1,373 @@
+<template xmlns:el-col="http://www.w3.org/1999/html">
+  <el-col v-loading="loading" class="tree-main">
+    <el-row v-if="showExtent" class="tree-head">
+      <span style="float: left;padding-left: 10px">{{ dataInfo.head }}</span>
+      <span v-for="auth in defaultAuthDetails" :key="auth.privilegeName" class="auth-span">
+        {{ auth.privilegeName }}
+      </span>
+    </el-row>
+    <el-row style="margin-top: 5px">
+      <el-tree
+        :props="defaultProps"
+        :load="loadNodes"
+        :data="treeData"
+        :node-key="defaultProps.id"
+        :highlight-current="highlightCurrent"
+        :default-expanded-keys="expandedKey"
+        lazy
+        @node-click="nodeClick"
+      >
+        <span slot-scope="{ node, data }" class="custom-tree-node">
+          <span>
+            <span style="margin-left: 6px" v-html="data.name" />
+          </span>
+          <span v-if="showExtent" @click.stop>
+            <div v-if="authDetails[data.id]">
+              <span v-for="auth in authDetails[data.id]" :key="auth.privilegeType" class="auth-span">
+                <!-- 1-{{ auth.privilegeType }}-{{ auth.privilegeValue }}-->
+                <a href="javascript:;" @click="clickAuth(data.id,auth)">
+                  <svg-icon style="width: 25px;height: 25px" :icon-class="auth.privilegeValue===1?'lock_open':'lock_closed'" />
+                </a>
+              </span>
+            </div>
+            <div v-else>
+              <span v-for="auth in defaultAuthDetails" :key="auth.privilegeType" class="auth-span">
+                <!--2-{{ auth.privilegeType }}-{{ auth.privilegeValue }}-->
+                <a href="javascript:;" @click="clickAuth(data.id,auth)">
+                  <svg-icon style="width: 25px;height: 25px" :icon-class="auth.privilegeValue===1?'lock_open':'lock_closed'" />
+                </a>
+              </span>
+            </div></span>
+        </span>
+      </el-tree>
+    </el-row>
+  </el-col>
+</template>
+
+<script>
+// import { authChange, authDetails, authDetailsModel, authModel } from '@/api/system/sysAuth'
+// import { execute } from '@/de-base/api/de-api'
+export default {
+  name: 'LazyTree',
+  components: { },
+  props: {
+    filterText: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    authCondition: {
+      type: Object,
+      required: false
+    },
+    dataInfo: {
+      type: Object,
+      required: true
+    },
+    activeName: {
+      type: String,
+      required: true
+    },
+    attachActiveName: String,
+    defaultProps: {
+      type: Object,
+      required: false,
+      default: function () {
+        return {
+          children: 'children',
+          label: 'name',
+          id: 'id',
+          parentId: 'pid',
+          isLeaf: 'leaf'
+        }
+      }
+    },
+    showExtent: Boolean,
+    highlightCurrent: Boolean
+  },
+  data () {
+    return {
+      loading: false,
+      treeData: [],
+      changeIndex: 0,
+      timeMachine: null,
+      expandedKey: [], // 展开节点 搜索时默认展开父级节点
+      defaultCondition: { // pid 是0的时候 查询的是顶级的节点
+        pid: '0'
+      },
+      authDetails: {},
+      defaultAuthDetails: [],
+      searchStatus: false, // 当前是否在搜索状态 （搜索状态 展开不加载子节点）
+      // 当前已经加载的节点ID 备用（当前把当前authTarget的所有授权加载进来）
+      loadedNodeIds: new Set()
+    }
+  },
+  computed: {
+  },
+  watch: {
+    filterText (val) {
+      this.expandedKey = []
+      if (val && val.length > 0) {
+        this.searchStatus = true
+      }
+      // 当组件名和 activeName 相等时 才进行查询
+      if (this.dataInfo.authType === this.activeName) {
+        this.destroyTimeMachine()
+        this.changeIndex++
+        this.filterNode(this.changeIndex)
+      }
+    },
+    authCondition: {
+      handler (newVal, oldVla) {
+        this.loadAuth()
+      },
+      deep: true
+    },
+    activeName: {
+      handler (newVal, oldVla) {
+        this.loadAuth()
+      },
+      deep: true
+    },
+    attachActiveName: {
+      handler (newVal, oldVla) {
+        this.authDetails = {}
+      },
+      deep: true
+    }
+  },
+  created () {
+    // 初始化授权模板
+    if (this.showExtent) {
+      this.executeAxios('/plugin/auth/authDetailsModel/' + this.dataInfo.authType, 'get', {}, res => {
+        this.defaultAuthDetails = res.data
+      })
+      //   authDetailsModel(this.dataInfo.authType).then(res => {
+      //     this.defaultAuthDetails = res.data
+      //   })
+      this.loadAuth()
+    }
+  },
+  methods: {
+    executeAxios (url, type, data, callBack) {
+      const param = {
+        url: url,
+        type: type,
+        data: data,
+        callBack: callBack
+      }
+      this.$emit('execute-axios', param)
+      // if (process.env.NODE_ENV === 'development') {
+      //   execute(param).then(res => {
+      //     if (param.callBack) {
+      //       param.callBack(res)
+      //     }
+      //   }).catch(e => {
+      //     if (param.error) {
+      //       param.error(e)
+      //     }
+      //   })
+      // }
+    },
+    loadAuth () {
+      if (this.authCondition && this.showExtent) {
+        let authQueryCondition = {}
+        if (this.dataInfo.direction === 'source') {
+          // 当前为授权数据 获取当前authTarget 的授权信息 authSource
+          authQueryCondition = {
+            authTarget: this.authCondition.id,
+            authTargetType: this.authCondition.type,
+            authSourceType: this.dataInfo.authType
+          }
+        } else {
+          authQueryCondition = {
+            authSource: this.authCondition.id,
+            authSourceType: this.authCondition.type
+          }
+        }
+        this.executeAxios('/plugin/auth/authDetails', 'post', authQueryCondition, res => {
+          this.authDetails = res.data
+        })
+        // authDetails(authQueryCondition).then(res => {
+        //   this.authDetails = res.data
+        // })
+      }
+    },
+    loadNodes (node, resolve) {
+      if (!this.searchStatus) {
+        if (node.level === 0) {
+          const queryCondition = {
+            modelType: this.dataInfo.authType,
+            ...this.defaultCondition
+          }
+          this.executeAxios('/plugin/auth/authModels', 'post', queryCondition, res => {
+            const data = res.data
+            resolve(data)
+          })
+        //   authModel(queryCondition).then(res => {
+        //     const data = res.data
+        //     resolve(data)
+        //   })
+        } else {
+          const queryCondition = {
+            modelType: this.dataInfo.authType
+          }
+          queryCondition[this.defaultProps.parentId] = node.data[this.defaultProps.id]
+          this.executeAxios('/plugin/auth/authModels', 'post', queryCondition, res => {
+            const data = res.data
+            resolve(data)
+          })
+        //   authModel(queryCondition).then(res => {
+        //     const data = res.data
+        //     resolve(data)
+        //   })
+        }
+      } else {
+        resolve(node.data.children)
+      }
+    },
+    filterNode (index) {
+      this.timeMachine = setTimeout(() => {
+        if (index === this.changeIndex) {
+          const queryCondition = {
+            withExtend: 'parent',
+            modelType: this.dataInfo.authType
+          }
+          queryCondition[this.defaultProps.label] = this.filterText
+          this.executeAxios('/plugin/auth/authModels', 'post', queryCondition, res => {
+            // 高亮显示
+            this.highlights(res.data)
+            this.treeData = this.buildTree(res.data)
+            // 恢复searchStatus 状态 可以允许继续展开父级
+            this.$nextTick(() => (this.searchStatus = false))
+          })
+        //   authModel(queryCondition).then(res => {
+        //     // 高亮显示
+        //     this.highlights(res.data)
+        //     this.treeData = this.buildTree(res.data)
+        //     // 恢复searchStatus 状态 可以允许继续展开父级
+        //     this.$nextTick(() => (this.searchStatus = false))
+        //   })
+        }
+        this.destroyTimeMachine()
+      }, 1500)
+    },
+    nodeClick (data, node) {
+      this.$emit('nodeClick', { id: data.id, type: this.dataInfo.authType })
+    },
+    destroyTimeMachine () {
+      this.timeMachine && clearTimeout(this.timeMachine)
+      this.timeMachine = null
+    },
+    buildTree (arrs) {
+      const idMapping = arrs.reduce((acc, el, i) => {
+        acc[el[this.defaultProps.id]] = i
+        return acc
+      }, {})
+      const roots = []
+      arrs.forEach(el => {
+        // 判断根节点 ###
+        if (el[this.defaultProps.parentId] === null || el[this.defaultProps.parentId] === 0 || el[this.defaultProps.parentId] === '0') {
+          roots.push(el)
+          return
+        }
+        // 用映射表找到父元素
+        const parentEl = arrs[idMapping[el[this.defaultProps.parentId]]]
+        // 把当前元素添加到父元素的`children`数组中
+        parentEl.children = [...(parentEl.children || []), el]
+
+        // 设置展开节点 如果没有子节点则不进行展开
+        if (parentEl.children.length > 0) {
+          this.expandedKey.push(parentEl[this.defaultProps.id])
+        }
+      })
+      return roots
+    },
+    // 权限修改
+    clickAuth (dataId, auth) {
+      let authChangeCondition = {}
+      if (this.dataInfo.direction === 'source') { // 当前为授权数据
+        authChangeCondition = {
+          authSource: dataId,
+          authSourceType: this.dataInfo.authType,
+          authTarget: this.authCondition.id,
+          authTargetType: this.authCondition.type,
+          authDetail: auth
+
+        }
+      } else {
+        authChangeCondition = {
+          authTarget: dataId,
+          authTargetType: this.dataInfo.authType,
+          authSource: this.authCondition.id,
+          authSourceType: this.authCondition.type,
+          authDetail: auth
+        }
+      }
+      this.loading = true
+      this.executeAxios('/plugin/auth/authChange', 'post', authChangeCondition, res => {
+        // 重新加载权限
+        this.loadAuth()
+        this.loading = false
+      })
+    },
+    // 高亮显示搜索内容
+    highlights (data) {
+      if (data && this.filterText && this.filterText.length > 0) {
+        const replaceReg = new RegExp(this.filterText, 'g')// 匹配关键字正则
+        const replaceString = '<span style="color: #faaa39">' + this.filterText + '</span>' // 高亮替换v-html值
+        data.forEach(item => {
+          item.name = item.name.replace(replaceReg, replaceString) // 开始替换
+        })
+      }
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-left: 8px;
+  }
+  .tree-main{
+    height:  calc(100vh - 210px);
+    border: 1px solid #e6e6e6;
+    overflow-y: auto;
+  }
+  .blackTheme .tree-main {
+    border-color: var(--TableBorderColor) !important;
+}
+  /* .tree-head{
+    height: 30px;
+    line-height: 30px;
+    border-bottom: 1px solid #e6e6e6;
+    background-color: #f7f8fa;
+    font-size: 12px;
+    color: #3d4d66 ;
+  } */
+
+  .tree-head{
+    height: 30px;
+    line-height: 30px;
+    border-bottom: 1px solid var(--TableBorderColor, #e6e6e6);
+    background-color: var(--SiderBG, #f7f8fa);
+    font-size: 12px;
+    color: var(--TableColor, #3d4d66) ;
+  }
+
+  .auth-span{
+    float: right;
+    width:50px;
+    margin-right: 30px
+  }
+  .highlights-text {
+    color: #faaa39 !important;
+  }
+
+</style>

frontend/src/views/link/index.vue

@@ -32,6 +32,7 @@ export default {
   methods: {
 
     loadInit() {
+      this.$store.commit('setPublicLinkStatus', true)
       debugger
       // this.link = getQueryVariable(this.PARAMKEY)
       this.link = this.$route.query.link

frontend/src/views/link/view/index.vue

@@ -9,7 +9,7 @@ import { loadResource } from '@/api/link'
 import { uuid } from 'vue-uuid'
 import Preview from '@/components/canvas/components/Editor/Preview'
 import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
-import { queryPanelJumpInfo } from '@/api/panel/linkJump'
+import { queryPanelJumpInfo, queryTargetPanelJumpInfo } from '@/api/panel/linkJump'
 
 export default {
   name: 'LinkView',
@@ -32,6 +32,10 @@ export default {
   methods: {
     setPanelInfo() {
       loadResource(this.resourceId).then(res => {
+        this.$store.dispatch('panel/setPanelInfo', {
+          id: res.data.id,
+          name: res.data.name
+        })
         // 刷新联动信息
         getPanelAllLinkageInfo(this.resourceId).then(rsp => {
           this.$store.commit('setNowPanelTrackInfo', rsp.data)
@@ -43,7 +47,27 @@ export default {
         queryPanelJumpInfo(this.resourceId).then(rsp => {
           this.$store.commit('setNowPanelJumpInfo', rsp.data)
         })
-        this.show = true
+        // 如果含有跳转参数 进行触发
+        const tempParam = localStorage.getItem('jumpInfoParam')
+        if (tempParam) {
+          localStorage.removeItem('jumpInfoParam')
+          const jumpParam = JSON.parse(tempParam)
+          const jumpRequestParam = {
+            sourcePanelId: jumpParam.sourcePanelId,
+            sourceViewId: jumpParam.sourceViewId,
+            sourceFieldId: jumpParam.sourceFieldId,
+            targetPanelId: this.resourceId
+          }
+          this.show = false
+          // 刷新跳转目标仪表板联动信息
+          queryTargetPanelJumpInfo(jumpRequestParam).then(rsp => {
+            this.show = true
+            this.$store.commit('setNowTargetPanelJumpInfo', rsp.data)
+            this.$store.commit('addViewTrackFilter', jumpParam)
+          })
+        } else {
+          this.show = true
+        }
       })
     },
     resetID(data) {

frontend/src/views/panel/LinkJumpSet/index.vue

@@ -82,7 +82,7 @@
                 <el-row v-for="(targetViewInfo,index) in linkJumpInfo.targetViewInfoList" :key="index">
                   <el-col :span="11">
                     <div class="select-filed">
-                      <el-select v-model="targetViewInfo.targetViewId" style="width: 100%" size="mini" :placeholder="$t('panel.please_select')" @change="viewInfoOnChange(targetViewInfo)">
+                      <el-select v-model="targetViewInfo.targetViewId" style="width: 100%" size="mini" :placeholder="$t('fu.search_bar.please_select')" @change="viewInfoOnChange(targetViewInfo)">
                         <el-option
                           v-for="item in currentLinkPanelViewArray"
                           :key="item.id"
@@ -99,7 +99,7 @@
                   </el-col>
                   <el-col :span="11">
                     <div class="select-filed">
-                      <el-select v-model="targetViewInfo.targetFieldId" style="width: 100%" size="mini" :placeholder="$t('panel.please_select')">
+                      <el-select v-model="targetViewInfo.targetFieldId" style="width: 100%" size="mini" :placeholder="$t('fu.search_bar.please_select')">
                         <el-option
                           v-for="viewField in viewIdFieldArrayMap[targetViewInfo.targetViewId]"
                           :key="viewField.id"

frontend/src/views/panel/edit/ComponentWaitItem.vue

@@ -11,6 +11,7 @@
       :style="getComponentStyleDefault(config.style)"
       :out-style="outStyle"
       :element="config"
+      :in-screen="true"
     />
     <component
       :is="config.component"
@@ -30,10 +31,11 @@
 import { mapState } from 'vuex'
 import MobileCheckBar from '@/components/canvas/components/Editor/MobileCheckBar'
 import { getStyle } from '@/components/canvas/utils/style'
+import DeOutWidget from '@/components/dataease/DeOutWidget'
 
 export default {
   name: 'ComponentWaitItem',
-  components: { MobileCheckBar },
+  components: { DeOutWidget, MobileCheckBar },
   props: {
     config: {
       type: Object,
@@ -87,6 +89,7 @@ export default {
 
 <style scoped>
   .component-custom {
+    position: relative!important;
     outline: none;
     width: 100% !important;
     height: 100%;