feat(X-Pack): 新增视图插件机制

core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java

@@ -1,12 +1,8 @@
 package io.dataease.chart.manage;
 
-import io.dataease.api.chart.dto.*;
+import io.dataease.api.chart.dto.ColumnPermissionItem;
-import io.dataease.api.chart.filter.FilterTreeObj;
+import io.dataease.api.chart.dto.PageInfo;
-import io.dataease.api.chart.request.ChartDrillRequest;
-import io.dataease.api.chart.request.ChartExtRequest;
-import io.dataease.api.dataset.dto.SqlVariableDetails;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
-import io.dataease.api.dataset.union.model.SQLMeta;
 import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO;
 import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
 import io.dataease.chart.constant.ChartConstants;
@@ -20,13 +16,17 @@ import io.dataease.dataset.manage.PermissionManage;
 import io.dataease.dataset.utils.SqlUtils;
 import io.dataease.datasource.provider.CalciteProvider;
 import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.sql.SQLProvider;
 import io.dataease.engine.trans.*;
 import io.dataease.engine.utils.SQLUtils;
 import io.dataease.engine.utils.Utils;
 import io.dataease.exception.DEException;
+import io.dataease.extensions.view.dto.*;
+import io.dataease.extensions.view.factory.PluginsChartFactory;
+import io.dataease.extensions.view.filter.FilterTreeObj;
+import io.dataease.extensions.view.model.SQLMeta;
+import io.dataease.extensions.view.template.PluginsChartTemplate;
 import io.dataease.i18n.Translator;
 import io.dataease.result.ResultCode;
 import io.dataease.system.manage.CorePermissionManage;
@@ -162,73 +162,98 @@ public class ChartDataManage {
     }
 
     public ChartViewDTO calcData(ChartViewDTO view, ChartExtRequest chartExtRequest, List<ChartViewFieldDTO> allFields, List<ChartViewFieldDTO> viewFields) throws Exception {
-
+        List<ChartViewFieldDTO> xAxisBase = null;
-        List<ChartViewFieldDTO> xAxisBase = new ArrayList<>(view.getXAxis());
+        List<ChartViewFieldDTO> xAxis = null;
-        List<ChartViewFieldDTO> xAxis = new ArrayList<>(view.getXAxis());
+        List<ChartViewFieldDTO> xAxisExt = null;
-        List<ChartViewFieldDTO> xAxisExt = new ArrayList<>(view.getXAxisExt());
+        List<ChartViewFieldDTO> yAxis = null;
-        if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot")
+        List<ChartViewFieldDTO> extStack = null;
-                || StringUtils.containsIgnoreCase(view.getType(), "group")
+        List<ChartViewFieldDTO> extBubble = null;
-                || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType()))
+        List<ChartViewFieldDTO> drill = null;
-                || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")
+        PluginsChartTemplate instance = null;
-                || StringUtils.equalsIgnoreCase(view.getType(), "sankey")
-                || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")
-        ) {
-            xAxis.addAll(xAxisExt);
-        }
-        List<ChartViewFieldDTO> yAxis = new ArrayList<>(view.getYAxis());
-        if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")
-                || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar")
-                || StringUtils.equalsIgnoreCase(view.getType(), "quadrant")
-                || StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) {
-            List<ChartViewFieldDTO> yAxisExt = new ArrayList<>(view.getYAxisExt());
-            yAxis.addAll(yAxisExt);
-        }
-        if (StringUtils.equalsIgnoreCase(view.getRender(), "antv") && StringUtils.equalsAnyIgnoreCase(view.getType(), "gauge", "liquid")) {
-            List<ChartViewFieldDTO> sizeField = getSizeField(view);
-            yAxis.addAll(sizeField);
-        }
         boolean skipBarRange = false;
         boolean barRangeDate = false;
-        if (StringUtils.equalsIgnoreCase(view.getType(), "bar-range")) { //针对区间条形图进行处理
+        if (ObjectUtils.isNotEmpty(view.getIsPlugin()) && view.getIsPlugin()) {
-            yAxis.clear();
+            instance = PluginsChartFactory.getInstance(view.getRender(), view.getType());
-            if (CollectionUtils.isNotEmpty(view.getYAxis()) && CollectionUtils.isNotEmpty(view.getYAxisExt())) {
+            String key = view.getRender() + "_" + view.getType();
-                ChartViewFieldDTO axis1 = view.getYAxis().get(0);
+            if (ObjectUtils.isEmpty(instance)) DEException.throwException(String.format("此视图插件【%s】不存在！", key));
-                ChartViewFieldDTO axis2 = view.getYAxisExt().get(0);
+            Map<String, List<ChartViewFieldDTO>> axisMap = instance.formatChartAxis(view);
+            xAxisBase = axisMap.get("axisMap");
+            xAxis = axisMap.get("xAxis");
+            xAxisExt = axisMap.get("xAxisExt");
+            yAxis = axisMap.get("yAxis");
+            extStack = axisMap.get("extStack");
+            extBubble = axisMap.get("extBubble");
+            drill = axisMap.get("drill");
+            viewFields = axisMap.get("viewFields");
+        } else {
+            xAxisBase = new ArrayList<>(view.getXAxis());
+            xAxis = new ArrayList<>(view.getXAxis());
+            xAxisExt = new ArrayList<>(view.getXAxisExt());
+            if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot")
+                    || StringUtils.containsIgnoreCase(view.getType(), "group")
+                    || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType()))
+                    || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")
+                    || StringUtils.equalsIgnoreCase(view.getType(), "sankey")
+                    || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")
+            ) {
+                xAxis.addAll(xAxisExt);
+            }
+            yAxis = new ArrayList<>(view.getYAxis());
+            if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")
+                    || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar")
+                    || StringUtils.equalsIgnoreCase(view.getType(), "quadrant")
+                    || StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) {
+                List<ChartViewFieldDTO> yAxisExt = new ArrayList<>(view.getYAxisExt());
+                yAxis.addAll(yAxisExt);
+            }
+            if (StringUtils.equalsIgnoreCase(view.getRender(), "antv") && StringUtils.equalsAnyIgnoreCase(view.getType(), "gauge", "liquid")) {
+                List<ChartViewFieldDTO> sizeField = getSizeField(view);
+                yAxis.addAll(sizeField);
+            }
 
-                if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "q") && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "q")) {
+            if (StringUtils.equalsIgnoreCase(view.getType(), "bar-range")) { //针对区间条形图进行处理
-                    yAxis.add(axis1);
+                yAxis.clear();
-                    yAxis.add(axis2);
+                if (CollectionUtils.isNotEmpty(view.getYAxis()) && CollectionUtils.isNotEmpty(view.getYAxisExt())) {
-                } else if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "d") && axis1.getDeType() == 1 && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "d") && axis2.getDeType() == 1) {
+                    ChartViewFieldDTO axis1 = view.getYAxis().get(0);
-                    barRangeDate = true;
+                    ChartViewFieldDTO axis2 = view.getYAxisExt().get(0);
-                    if (BooleanUtils.isTrue(view.getAggregate())) {
+
-                        axis1.setSummary("min");
+                    if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "q") && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "q")) {
-                        axis2.setSummary("max");
                         yAxis.add(axis1);
                         yAxis.add(axis2);
+                    } else if (StringUtils.equalsIgnoreCase(axis1.getGroupType(), "d") && axis1.getDeType() == 1 && StringUtils.equalsIgnoreCase(axis2.getGroupType(), "d") && axis2.getDeType() == 1) {
+                        barRangeDate = true;
+                        if (BooleanUtils.isTrue(view.getAggregate())) {
+                            axis1.setSummary("min");
+                            axis2.setSummary("max");
+                            yAxis.add(axis1);
+                            yAxis.add(axis2);
+                        } else {
+                            xAxis.add(axis1);
+                            xAxis.add(axis2);
+                        }
                     } else {
-                        xAxis.add(axis1);
+                        skipBarRange = true;
-                        xAxis.add(axis2);
                     }
                 } else {
                     skipBarRange = true;
                 }
-            } else {
-                skipBarRange = true;
             }
-        }
 
-        List<ChartViewFieldDTO> extStack = new ArrayList<>(view.getExtStack());
+            extStack = new ArrayList<>(view.getExtStack());
-        List<ChartViewFieldDTO> extBubble = new ArrayList<>(view.getExtBubble());
+            extBubble = new ArrayList<>(view.getExtBubble());
-        if (ObjectUtils.isNotEmpty(view.getExtLabel()) && enableExtData(view.getType())) {
+            if (ObjectUtils.isNotEmpty(view.getExtLabel()) && enableExtData(view.getType())) {
-            List<ChartViewFieldDTO> extLabel = new ArrayList<>(view.getExtLabel());
+                List<ChartViewFieldDTO> extLabel = new ArrayList<>(view.getExtLabel());
-            yAxis.addAll(extLabel);
+                yAxis.addAll(extLabel);
-        }
+            }
-        if (ObjectUtils.isNotEmpty(view.getExtTooltip()) && enableExtData(view.getType())) {
+            if (ObjectUtils.isNotEmpty(view.getExtTooltip()) && enableExtData(view.getType())) {
-            List<ChartViewFieldDTO> extTooltip = new ArrayList<>(view.getExtTooltip());
+                List<ChartViewFieldDTO> extTooltip = new ArrayList<>(view.getExtTooltip());
-            yAxis.addAll(extTooltip);
+                yAxis.addAll(extTooltip);
+            }
+            drill = new ArrayList<>(view.getDrillFields());
         }
         FilterTreeObj fieldCustomFilter = view.getCustomFilter();
-        List<ChartViewFieldDTO> drill = new ArrayList<>(view.getDrillFields());
+
+        // 以上是formatAxis内容
 
         DatasetGroupInfoDTO table = datasetGroupManage.getDatasetGroupInfoDTO(view.getTableId(), null);
         if (table == null) {
@@ -291,42 +316,43 @@ public class ChartDataManage {
             chartExtRequest.setPageSize(null);
         }
 
-        switch (view.getType()) {
+        if (ObjectUtils.isEmpty(instance))
-            case "label":
+            switch (view.getType()) {
-                xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                case "label":
-                xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                yAxis = new ArrayList<>();
+                    xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(xAxis)) {
+                    yAxis = new ArrayList<>();
-                    return emptyChartViewDTO(view);
+                    if (ObjectUtils.isEmpty(xAxis)) {
-                }
+                        return emptyChartViewDTO(view);
-                break;
+                    }
-            case "indicator":
+                    break;
-            case "gauge":
+                case "indicator":
-            case "liquid":
+                case "gauge":
-                xAxis = new ArrayList<>();
+                case "liquid":
-                yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxis = new ArrayList<>();
-                if (ObjectUtils.isEmpty(yAxis)) {
+                    yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                    return emptyChartViewDTO(view);
+                    if (ObjectUtils.isEmpty(yAxis)) {
-                }
+                        return emptyChartViewDTO(view);
-                break;
+                    }
-            case "table-info":
+                    break;
-                yAxis = new ArrayList<>();
+                case "table-info":
-                xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    yAxis = new ArrayList<>();
-                xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                if (ObjectUtils.isEmpty(xAxis)) {
+                    xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                    return emptyChartViewDTO(view);
+                    if (ObjectUtils.isEmpty(xAxis)) {
-                }
+                        return emptyChartViewDTO(view);
-                break;
+                    }
-            case "table-normal":
+                    break;
-                xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                case "table-normal":
-                xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                yAxis = yAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                break;
+                    yAxis = yAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-            default:
+                    break;
-                xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                default:
-                xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-                yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+                    xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
-        }
+                    yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList());
+            }
 
         // 过滤来自仪表板的条件
         List<ChartExtFilterDTO> extFilterList = new ArrayList<>();
@@ -585,6 +611,10 @@ public class ChartDataManage {
             CustomWhere2Str.customWhere2sqlObj(sqlMeta, fieldCustomFilter, transFields(allFields), crossDs, dsMap);
             ExtWhere2Str.extWhere2sqlOjb(sqlMeta, extFilterList, transFields(allFields), crossDs, dsMap);
             WhereTree2Str.transFilterTrees(sqlMeta, rowPermissionsTree, transFields(allFields), crossDs, dsMap);
+            Map<Long, String> dsTypeMap = dsMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getType()));
+            if (ObjectUtils.isNotEmpty(instance)) {
+                return instance.calcResult(sqlMeta, xAxis, yAxis, transFields(allFields), crossDs, dsTypeMap);
+            }
 
             if (StringUtils.equalsAnyIgnoreCase(view.getType(), "indicator", "gauge", "liquid")) {
                 Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap);

core/core-backend/src/main/java/io/dataease/chart/manage/ChartFilterTreeService.java

@@ -1,10 +1,10 @@
 package io.dataease.chart.manage;
 
-import io.dataease.api.chart.filter.FilterTreeItem;
+import io.dataease.extensions.view.filter.FilterTreeItem;
-import io.dataease.api.chart.filter.FilterTreeObj;
+import io.dataease.extensions.view.filter.FilterTreeObj;
 import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField;
 import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.utils.SQLUtils;
 import io.dataease.utils.BeanUtils;
 import jakarta.annotation.Resource;

core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java

@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dataease.api.chart.dto.*;
-import io.dataease.api.chart.filter.FilterTreeObj;
+import io.dataease.extensions.view.dto.*;
+import io.dataease.extensions.view.filter.FilterTreeObj;
 import io.dataease.api.chart.vo.ViewSelectorVO;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.chart.dao.auto.entity.CoreChartView;
 import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper;
 import io.dataease.chart.dao.ext.mapper.ExtChartViewMapper;
@@ -14,7 +15,6 @@ import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField;
 import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
 import io.dataease.dataset.manage.PermissionManage;
 import io.dataease.dataset.utils.TableUtils;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.func.FunctionConstant;
 import io.dataease.engine.utils.Utils;

core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewOldDataMergeService.java

@@ -2,10 +2,10 @@ package io.dataease.chart.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
-import io.dataease.api.chart.dto.ChartCustomFilterItemDTO;
+import io.dataease.extensions.view.dto.ChartCustomFilterItemDTO;
-import io.dataease.api.chart.dto.ChartFieldCustomFilterDTO;
+import io.dataease.extensions.view.dto.ChartFieldCustomFilterDTO;
-import io.dataease.api.chart.filter.FilterTreeItem;
+import io.dataease.extensions.view.filter.FilterTreeItem;
-import io.dataease.api.chart.filter.FilterTreeObj;
+import io.dataease.extensions.view.filter.FilterTreeObj;
 import io.dataease.chart.dao.auto.entity.CoreChartView;
 import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper;
 import io.dataease.utils.JsonUtil;

core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java

@@ -1,7 +1,7 @@
 package io.dataease.chart.server;
 
 import io.dataease.api.chart.ChartDataApi;
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.dataease.api.chart.dto.ViewDetailField;
 import io.dataease.api.chart.request.ChartExcelRequest;
 import io.dataease.api.chart.request.ChartExcelRequestInner;

core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java

@@ -1,8 +1,8 @@
 package io.dataease.chart.server;
 
 import io.dataease.api.chart.ChartViewApi;
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
-import io.dataease.api.chart.dto.ChartViewFieldDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
 import io.dataease.api.chart.vo.ViewSelectorVO;
 import io.dataease.chart.manage.ChartViewManege;
 import io.dataease.exception.DEException;

core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java

@@ -1,6 +1,9 @@
 package io.dataease.chart.utils;
 
 import io.dataease.api.chart.dto.*;
+import io.dataease.extensions.view.dto.ChartDimensionDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
 import io.dataease.i18n.Lang;
 import io.dataease.i18n.Translator;
 import io.dataease.utils.IDUtils;

core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java

@@ -1,7 +1,7 @@
 package io.dataease.commons.utils;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import io.dataease.api.dataset.dto.SqlVariableDetails;
+import io.dataease.extensions.view.dto.SqlVariableDetails;
 import io.dataease.api.ds.vo.DatasourceConfiguration;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
 import io.dataease.exception.DEException;

core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java

@@ -1,13 +1,13 @@
 package io.dataease.dataset.manage;
 
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
+import io.dataease.extensions.view.dto.ChartExtFilterDTO;
 import io.dataease.api.chart.dto.ColumnPermissionItem;
 import io.dataease.api.chart.dto.DeSortField;
-import io.dataease.api.chart.request.ChartExtRequest;
+import io.dataease.extensions.view.dto.ChartExtRequest;
 import io.dataease.api.dataset.dto.*;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.api.dataset.union.DatasetTableInfoDTO;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
 import io.dataease.api.ds.vo.TableField;
 import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
 import io.dataease.auth.bo.TokenUserBO;
@@ -25,7 +25,7 @@ import io.dataease.datasource.manage.EngineManage;
 import io.dataease.datasource.provider.CalciteProvider;
 import io.dataease.datasource.request.DatasourceRequest;
 import io.dataease.datasource.utils.DatasourceUtils;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.constant.SqlPlaceholderConstants;
@@ -34,6 +34,7 @@ import io.dataease.engine.trans.*;
 import io.dataease.engine.utils.SQLUtils;
 import io.dataease.engine.utils.Utils;
 import io.dataease.exception.DEException;
+import io.dataease.extensions.view.dto.SqlVariableDetails;
 import io.dataease.i18n.Translator;
 import io.dataease.utils.AuthUtils;
 import io.dataease.utils.BeanUtils;

core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetGroupManage.java

@@ -3,7 +3,7 @@ package io.dataease.dataset.manage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.dataease.api.dataset.dto.DatasetTableDTO;
-import io.dataease.api.dataset.dto.SqlVariableDetails;
+import io.dataease.extensions.view.dto.SqlVariableDetails;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.api.dataset.union.UnionDTO;
 import io.dataease.api.dataset.vo.DataSetBarVO;
@@ -20,7 +20,7 @@ import io.dataease.dataset.utils.FieldUtils;
 import io.dataease.dataset.utils.TableUtils;
 import io.dataease.datasource.dao.auto.entity.CoreDatasource;
 import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.exception.DEException;
 import io.dataease.i18n.Translator;

core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java

@@ -1,11 +1,11 @@
 package io.dataease.dataset.manage;
 
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
+import io.dataease.extensions.view.dto.ChartExtFilterDTO;
-import io.dataease.api.chart.request.ChartExtRequest;
+import io.dataease.extensions.view.dto.ChartExtRequest;
 import io.dataease.api.dataset.dto.DatasetTableDTO;
-import io.dataease.api.dataset.dto.SqlVariableDetails;
+import io.dataease.extensions.view.dto.SqlVariableDetails;
 import io.dataease.api.dataset.union.*;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.api.ds.vo.DatasourceConfiguration;
 import io.dataease.api.permissions.auth.dto.BusiPerCheckDTO;
 import io.dataease.commons.utils.SqlparserUtils;
@@ -18,7 +18,7 @@ import io.dataease.dataset.utils.TableUtils;
 import io.dataease.datasource.dao.auto.entity.CoreDatasource;
 import io.dataease.datasource.dao.auto.mapper.CoreDatasourceMapper;
 import io.dataease.datasource.manage.EngineManage;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.exception.DEException;

core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetTableFieldManage.java

@@ -2,13 +2,13 @@ package io.dataease.dataset.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.dataease.api.chart.dto.ColumnPermissionItem;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dao.auto.entity.CoreDatasetTableField;
 import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupMapper;
 import io.dataease.dataset.dao.auto.mapper.CoreDatasetTableFieldMapper;
 import io.dataease.dataset.utils.TableUtils;
 import io.dataease.datasource.provider.CalciteProvider;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.func.FunctionConstant;
 import io.dataease.engine.utils.Utils;

core/core-backend/src/main/java/io/dataease/dataset/manage/PermissionManage.java

@@ -11,7 +11,9 @@ import io.dataease.api.permissions.user.vo.UserFormVO;
 import io.dataease.api.permissions.variable.dto.SysVariableValueDto;
 import io.dataease.api.permissions.variable.dto.SysVariableValueItem;
 import io.dataease.constant.ColumnPermissionConstants;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeItem;
+import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.utils.AuthUtils;
 import io.dataease.utils.JsonUtil;
 import jakarta.annotation.Resource;

core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java

@@ -6,7 +6,7 @@ import io.dataease.api.dataset.dto.EnumValueRequest;
 import io.dataease.api.dataset.dto.PreviewSqlDTO;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.dataset.manage.DatasetDataManage;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.utils.LogUtil;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestMapping;

core/core-backend/src/main/java/io/dataease/dataset/server/DatasetFieldServer.java

@@ -6,7 +6,7 @@ import io.dataease.api.dataset.engine.SQLFunctionDTO;
 import io.dataease.api.dataset.engine.SQLFunctionsEnum;
 import io.dataease.dataset.manage.DatasetDataManage;
 import io.dataease.dataset.manage.DatasetTableFieldManage;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

core/core-backend/src/main/java/io/dataease/dataset/server/DatasetTreeServer.java

@@ -3,7 +3,7 @@ package io.dataease.dataset.server;
 import io.dataease.api.dataset.DatasetTreeApi;
 import io.dataease.api.dataset.dto.DatasetNodeDTO;
 import io.dataease.api.dataset.dto.DatasetTableDTO;
-import io.dataease.api.dataset.dto.SqlVariableDetails;
+import io.dataease.extensions.view.dto.SqlVariableDetails;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.api.dataset.vo.DataSetBarVO;
 import io.dataease.constant.LogOT;

core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java

@@ -1,7 +1,7 @@
 package io.dataease.dataset.utils;
 
 import com.google.common.collect.ImmutableList;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
 import io.dataease.api.ds.vo.DatasourceConfiguration;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
 import io.dataease.engine.constant.SqlPlaceholderConstants;

core/core-backend/src/main/java/io/dataease/dataset/utils/TableUtils.java

@@ -1,6 +1,6 @@
 package io.dataease.dataset.utils;
 
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.api.ds.vo.DatasourceConfiguration;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
 import io.dataease.utils.Md5Utils;

core/core-backend/src/main/java/io/dataease/datasource/dao/ext/mapper/DataSourceExtMapper.java

@@ -3,7 +3,6 @@ package io.dataease.datasource.dao.ext.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.dataease.datasource.dao.ext.po.Ctimestamp;
 import io.dataease.datasource.dao.ext.po.DataSourceNodePO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import org.apache.ibatis.annotations.*;
 
 @Mapper

core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java

@@ -1,8 +1,8 @@
 package io.dataease.engine.sql;
 
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.engine.constant.SQLConstants;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java

@@ -1,11 +1,11 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.chart.filter.FilterTreeItem;
+import io.dataease.extensions.view.filter.FilterTreeItem;
-import io.dataease.api.chart.filter.FilterTreeObj;
+import io.dataease.extensions.view.filter.FilterTreeObj;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.constant.SqlPlaceholderConstants;
 import io.dataease.engine.utils.Utils;

core/core-backend/src/main/java/io/dataease/engine/trans/Dimension2SQLObj.java

@@ -1,10 +1,10 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.chart.dto.ChartViewFieldDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.DeTypeConstants;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
@@ -21,7 +21,8 @@ import java.util.*;
  */
 public class Dimension2SQLObj {
 
-    public static void dimension2sqlObj(SQLMeta meta, List<ChartViewFieldDTO> fields, List<DatasetTableFieldDTO> originFields, boolean isCross, Map<Long, DatasourceSchemaDTO> dsMap) {
+    public static void dimension2sqlObj(SQLMeta meta, List<ChartViewFieldDTO> fields, List<DatasetTableFieldDTO> originFields,
+                                        boolean isCross, Map<Long, DatasourceSchemaDTO> dsMap) {
         SQLObj tableObj = meta.getTable();
         if (ObjectUtils.isEmpty(tableObj)) {
             return;

core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java

@@ -1,10 +1,10 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
+import io.dataease.extensions.view.dto.ChartExtFilterDTO;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.constant.SqlPlaceholderConstants;
 import io.dataease.engine.utils.Utils;

core/core-backend/src/main/java/io/dataease/engine/trans/Field2SQLObj.java

@@ -1,9 +1,9 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.DeTypeConstants;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;

core/core-backend/src/main/java/io/dataease/engine/trans/Order2SQLObj.java

@@ -1,10 +1,10 @@
 package io.dataease.engine.trans;
 
 import io.dataease.api.chart.dto.DeSortField;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.DeTypeConstants;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;

core/core-backend/src/main/java/io/dataease/engine/trans/Quota2SQLObj.java

@@ -1,10 +1,10 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.chart.dto.ChartViewFieldDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.DeTypeConstants;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;

core/core-backend/src/main/java/io/dataease/engine/trans/Table2SQLObj.java

@@ -1,7 +1,7 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.constant.SqlPlaceholderConstants;
 

core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java

@@ -1,12 +1,12 @@
 package io.dataease.engine.trans;
 
-import io.dataease.api.dataset.union.model.SQLMeta;
+import io.dataease.extensions.view.model.SQLMeta;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
-import io.dataease.api.permissions.dataset.dto.DatasetRowPermissionsTreeItem;
+import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeItem;
-import io.dataease.api.permissions.dataset.dto.DatasetRowPermissionsTreeObj;
+import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.constant.SqlPlaceholderConstants;

core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java

@@ -1,9 +1,9 @@
 package io.dataease.engine.utils;
 
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import io.dataease.api.ds.vo.DatasourceConfiguration;
 import io.dataease.dataset.dto.DatasourceSchemaDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.engine.constant.ExtFieldConstant;
 import io.dataease.engine.constant.SQLConstants;
 import io.dataease.engine.constant.SqlPlaceholderConstants;
@@ -40,6 +40,22 @@ public class Utils {
         return null;
     }
 
+    public static String calcSimpleFieldRegex(String originField, SQLObj tableObj, List<DatasetTableFieldDTO> originFields,
+                                        boolean isCross, Map<Long, String> dsTypeMap) {
+        try {
+            int i = 0;
+            DatasourceConfiguration.DatasourceType datasourceType = null;
+            if (dsTypeMap != null && dsTypeMap.entrySet().iterator().hasNext()) {
+                Map.Entry<Long, String> next = dsTypeMap.entrySet().iterator().next();
+                datasourceType = DatasourceConfiguration.DatasourceType.valueOf(next.getValue());
+            }
+            return buildCalcField(originField, tableObj, originFields, i, isCross, datasourceType);
+        } catch (Exception e) {
+            DEException.throwException(Translator.get("i18n_field_circular_ref"));
+        }
+        return null;
+    }
+
     public static String buildCalcField(String originField, SQLObj tableObj, List<DatasetTableFieldDTO> originFields, int i, boolean isCross, DatasourceConfiguration.DatasourceType datasourceType) throws Exception {
         try {
             i++;

core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkageMapper.java

@@ -2,7 +2,7 @@ package io.dataease.visualization.dao.ext.mapper;
 
 import io.dataease.api.visualization.dto.LinkageInfoDTO;
 import io.dataease.api.visualization.dto.VisualizationLinkageDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.dataease.visualization.dao.auto.entity.VisualizationLinkage;
 import io.dataease.visualization.dao.auto.entity.VisualizationLinkageField;
 import org.apache.ibatis.annotations.Mapper;

core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationExportManage.java

@@ -1,10 +1,10 @@
 package io.dataease.visualization.manage;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
+import io.dataease.extensions.view.dto.ChartExtFilterDTO;
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
-import io.dataease.api.chart.dto.ChartViewFieldDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
-import io.dataease.api.chart.request.ChartExtRequest;
+import io.dataease.extensions.view.dto.ChartExtRequest;
 import io.dataease.api.visualization.vo.DataVisualizationVO;
 import io.dataease.chart.manage.ChartDataManage;
 import io.dataease.chart.manage.ChartViewManege;

core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationTemplateExtendDataManage.java

@@ -1,7 +1,7 @@
 package io.dataease.visualization.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.dataease.exception.DEException;
 import io.dataease.template.dao.auto.entity.VisualizationTemplateExtendData;
 import io.dataease.template.dao.auto.mapper.VisualizationTemplateExtendDataMapper;
@@ -11,8 +11,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Map;
-
 
 
 /**

core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java

@@ -2,7 +2,7 @@ package io.dataease.visualization.server;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.dataease.api.template.dto.TemplateManageFileDTO;
 import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
 import io.dataease.api.visualization.DataVisualizationApi;

core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java

@@ -1,7 +1,5 @@
 package io.dataease.visualization.server;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
 import io.dataease.api.visualization.VisualizationLinkJumpApi;
 import io.dataease.api.visualization.dto.VisualizationComponentDTO;
 import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO;
@@ -11,8 +9,7 @@ import io.dataease.api.visualization.response.VisualizationLinkJumpBaseResponse;
 import io.dataease.api.visualization.vo.VisualizationViewTableVO;
 import io.dataease.chart.dao.auto.entity.CoreChartView;
 import io.dataease.chart.dao.auto.mapper.CoreChartViewMapper;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
-import io.dataease.license.config.XpackInteract;
 import io.dataease.utils.AuthUtils;
 import io.dataease.utils.BeanUtils;
 import io.dataease.utils.IDUtils;

core/core-backend/src/main/java/io/dataease/visualization/template/FilterBuildTemplate.java

@@ -1,6 +1,6 @@
 package io.dataease.visualization.template;
 
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
+import io.dataease.extensions.view.dto.ChartExtFilterDTO;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;

core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml

@@ -379,7 +379,7 @@
         <result column="table_id" property="tableId"/>
         <result column="type" property="type"/>
         <result column="render" property="render"/>
-        <collection property="tableFields" ofType="io.dataease.dto.dataset.DatasetTableFieldDTO">
+        <collection property="tableFields" ofType="io.dataease.extensions.view.dto.DatasetTableFieldDTO">
             <result column="field_id" jdbcType="VARCHAR" property="id"/>
             <result column="origin_name" jdbcType="VARCHAR" property="originName"/>
             <result column="field_name" jdbcType="VARCHAR" property="name"/>

core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml

@@ -53,7 +53,7 @@
         <result column="type" jdbcType="VARCHAR" property="type"/>
         <result column="dv_id" jdbcType="BIGINT" property="dvId"/>
         <collection property="tableFields"
-                    ofType="io.dataease.dto.dataset.DatasetTableFieldDTO">
+                    ofType="io.dataease.extensions.view.dto.DatasetTableFieldDTO">
             <result column="field_id" jdbcType="BIGINT" property="id"/>
             <result column="origin_name" jdbcType="VARCHAR" property="originName"/>
             <result column="field_name" jdbcType="VARCHAR" property="name"/>

core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.dataease.visualization.dao.ext.mapper.ExtVisualizationLinkageMapper">
 
-    <resultMap id="TableFieldMap" type="io.dataease.dto.dataset.DatasetTableFieldDTO">
+    <resultMap id="TableFieldMap" type="io.dataease.extensions.view.dto.DatasetTableFieldDTO">
         <result column="id" jdbcType="BIGINT" property="id"/>
         <result column="table_id" jdbcType="BIGINT" property="datasetTableId"/>
         <result column="origin_name" jdbcType="VARCHAR" property="originName"/>
@@ -17,7 +17,7 @@
         <result column="targetViewName" jdbcType="VARCHAR" property="targetViewName"/>
         <result column="sourceViewId" jdbcType="BIGINT" property="sourceViewId"/>
         <result column="linkageActive" property="linkageActive"/>
-        <collection property="targetViewFields" ofType="io.dataease.dto.dataset.DatasetTableFieldDTO" column="table_id"
+        <collection property="targetViewFields" ofType="io.dataease.extensions.view.dto.DatasetTableFieldDTO" column="table_id"
                     select="queryTableField">
         </collection>
         <collection property="linkageFields" ofType="io.dataease.api.visualization.vo.VisualizationLinkageFieldVO">

de-xpack

@@ -1 +1 @@
-Subproject commit 4e4115d9803717a06f114ef047183ab447f68470
+Subproject commit c36d845145b1dd398da4451e03e28329bd3d8a82

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

@@ -1,8 +1,8 @@
 package io.dataease.api.chart;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import io.dataease.api.chart.dto.ChartViewDTO;
 import io.dataease.api.chart.request.ChartExcelRequest;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.io.IOException;
 import java.util.List;
 
 /**

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

@@ -1,9 +1,9 @@
 package io.dataease.api.chart;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import io.dataease.api.chart.dto.ChartViewDTO;
-import io.dataease.api.chart.dto.ChartViewFieldDTO;
 import io.dataease.api.chart.vo.ViewSelectorVO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;

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

@@ -1,5 +1,6 @@
 package io.dataease.api.chart.dto;
 
+import io.dataease.extensions.view.dto.ChartDimensionDTO;
 import lombok.Data;
 
 import java.math.BigDecimal;

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

@@ -1,5 +1,6 @@
 package io.dataease.api.chart.dto;
 
+import io.dataease.extensions.view.dto.ChartDimensionDTO;
 import lombok.Data;
 
 import java.math.BigDecimal;

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

@@ -1,6 +1,6 @@
 package io.dataease.api.chart.dto;
 
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 @Data

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

@@ -1,5 +1,6 @@
 package io.dataease.api.chart.dto;
 
+import io.dataease.extensions.view.dto.ChartDimensionDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/api/api-base/src/main/java/io/dataease/api/chart/request/ChartExcelRequest.java

@@ -1,6 +1,6 @@
 package io.dataease.api.chart.request;
 
-import io.dataease.api.chart.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import lombok.Data;
 
 import java.io.Serial;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java

@@ -5,7 +5,7 @@ import io.dataease.api.dataset.dto.DatasetTableDTO;
 import io.dataease.api.dataset.dto.EnumValueRequest;
 import io.dataease.api.dataset.dto.PreviewSqlDTO;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.PostMapping;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTableApi.java

@@ -3,7 +3,7 @@ package io.dataease.api.dataset;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.api.dataset.dto.MultFieldValuesRequest;
 import io.dataease.api.dataset.engine.SQLFunctionDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetTreeApi.java

@@ -3,11 +3,11 @@ package io.dataease.api.dataset;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.api.dataset.dto.DatasetNodeDTO;
 import io.dataease.api.dataset.dto.DatasetTableDTO;
-import io.dataease.api.dataset.dto.SqlVariableDetails;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.api.dataset.vo.DataSetBarVO;
 import io.dataease.auth.DeApiPath;
 import io.dataease.auth.DePermit;
+import io.dataease.extensions.view.dto.SqlVariableDetails;
 import io.dataease.model.BusiNodeRequest;
 import io.dataease.model.BusiNodeVO;
 import io.swagger.v3.oas.annotations.Operation;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/DatasetTableDTO.java

@@ -2,7 +2,7 @@ package io.dataease.api.dataset.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/dto/EnumValueRequest.java

@@ -1,6 +1,6 @@
 package io.dataease.api.dataset.dto;
 
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
+import io.dataease.extensions.view.dto.ChartExtFilterDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/DatasetGroupInfoDTO.java

@@ -2,7 +2,7 @@ package io.dataease.api.dataset.union;
 
 import io.dataease.api.chart.dto.DeSortField;
 import io.dataease.api.dataset.dto.DatasetNodeDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionDTO.java

@@ -1,7 +1,7 @@
 package io.dataease.api.dataset.union;
 
 import io.dataease.api.dataset.dto.DatasetTableDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionItemDTO.java

@@ -1,6 +1,6 @@
 package io.dataease.api.dataset.union;
 
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/api/api-base/src/main/java/io/dataease/api/dataset/union/UnionParamDTO.java

@@ -1,7 +1,7 @@
 package io.dataease.api.dataset.union;
 
 import io.dataease.api.dataset.dto.DatasetTableDTO;
-import io.dataease.api.dataset.union.model.SQLObj;
+import io.dataease.extensions.view.model.SQLObj;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/api/api-base/src/main/java/io/dataease/api/visualization/VisualizationLinkJumpApi.java

@@ -5,8 +5,7 @@ import io.dataease.api.visualization.dto.VisualizationComponentDTO;
 import io.dataease.api.visualization.dto.VisualizationLinkJumpDTO;
 import io.dataease.api.visualization.request.VisualizationLinkJumpBaseRequest;
 import io.dataease.api.visualization.response.VisualizationLinkJumpBaseResponse;
-import io.dataease.api.visualization.vo.VisualizationViewTableVO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;

sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkageDTO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.dataease.api.visualization.vo.VisualizationLinkageFieldVO;
 import io.dataease.api.visualization.vo.VisualizationLinkageVO;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.util.ArrayList;

sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationViewTableDTO.java

@@ -1,7 +1,8 @@
 package io.dataease.api.visualization.dto;
 
-import io.dataease.api.chart.dto.ChartViewDTO;
+
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/DataVisualizationVO.java

@@ -2,14 +2,13 @@ package io.dataease.api.visualization.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.api.chart.dto.ChartViewDTO;
 import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
+import io.dataease.extensions.view.dto.ChartViewDTO;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Data
@@ -159,7 +158,7 @@ public class DataVisualizationVO implements Serializable {
     private VisualizationWatermarkVO watermarkInfo;
 
 
-    public DataVisualizationVO(Long id, String name, String type,Integer version, String canvasStyleData, String componentData, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
+    public DataVisualizationVO(Long id, String name, String type, Integer version, String canvasStyleData, String componentData, Map<Long, ChartViewDTO> canvasViewInfo, Map<Long, VisualizationTemplateExtendDataDTO> extendDataInfo) {
         this.id = id;
         this.name = name;
         this.type = type;

sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationViewTableVO.java

@@ -2,7 +2,7 @@ package io.dataease.api.visualization.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/dataset/dto/DataSetRowPermissionsTreeDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.dataease.api.permissions.role.vo.RoleVO;
 import io.dataease.api.permissions.user.vo.UserFormVO;
+import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj;
 import lombok.Getter;
 import lombok.Setter;
 

sdk/common/pom.xml

@@ -124,6 +124,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>io.dataease</groupId>
+            <artifactId>extensions-view</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 
 </project>

sdk/extensions/extensions-view/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.dataease</groupId>
+        <artifactId>extensions</artifactId>
+        <version>${dataease.version}</version>
+    </parent>
+
+    <artifactId>extensions-view</artifactId>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartCustomFilterItemDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDimensionDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartDrillRequest.java

@@ -1,6 +1,5 @@
-package io.dataease.api.chart.request;
+package io.dataease.extensions.view.dto;
 
-import io.dataease.api.chart.dto.ChartDimensionDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java

@@ -1,7 +1,6 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
+
 
-import io.dataease.api.dataset.dto.SqlVariableDetails;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtRequest.java

@@ -1,7 +1,6 @@
-package io.dataease.api.chart.request;
+package io.dataease.extensions.view.dto;
+
 
-import io.dataease.api.chart.dto.ChartExtFilterDTO;
-import io.dataease.api.chart.dto.PermissionProxy;
 import lombok.Data;
 
 import java.util.List;
@@ -29,7 +28,7 @@ public class ChartExtRequest {
 
     private Long user = null;
 
-    private PermissionProxy proxy;
+    // private PermissionProxy proxy;
 
     private Long goPage;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareCustomDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import lombok.Data;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCompareDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartFieldCustomFilterDTO.java

@@ -1,6 +1,5 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.util.List;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistCfgDTO.java

@@ -1,9 +1,10 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import lombok.Data;
 
 import java.util.List;
 
+
 @Data
 public class ChartSeniorAssistCfgDTO {
     private boolean enable;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartSeniorAssistDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java

@@ -1,9 +1,9 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.api.chart.filter.FilterTreeObj;
+import io.dataease.extensions.view.filter.FilterTreeObj;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewDTO.java

@@ -1,8 +1,7 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.api.chart.request.ChartExtRequest;
 import lombok.Data;
 
 import java.util.List;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldBaseDTO.java

@@ -1,6 +1,5 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import lombok.Data;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewFieldFilterDTO.java

@@ -1,8 +1,6 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.io.Serializable;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeItem.java

@@ -1,9 +1,8 @@
-package io.dataease.api.permissions.dataset.dto;
+package io.dataease.extensions.view.dto;
 
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetRowPermissionsTreeObj.java

@@ -1,4 +1,4 @@
-package io.dataease.api.permissions.dataset.dto;
+package io.dataease.extensions.view.dto;
 
 
 import lombok.Data;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DatasetTableFieldDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.dto.dataset;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/FormatterCfgDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.dto;
+package io.dataease.extensions.view.dto;
 
 import lombok.Data;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/SqlVariableDetails.java

@@ -1,4 +1,4 @@
-package io.dataease.api.dataset.dto;
+package io.dataease.extensions.view.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/factory/PluginsChartFactory.java

@@ -0,0 +1,22 @@
+package io.dataease.extensions.view.factory;
+
+import io.dataease.extensions.view.template.PluginsChartTemplate;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class PluginsChartFactory {
+
+    private static final Map<String, PluginsChartTemplate> templateMap = new ConcurrentHashMap<>();
+
+    public static PluginsChartTemplate getInstance(String render, String type) {
+        String key = render + "_" + type;
+        return templateMap.get(key);
+    }
+
+    public static void loadTemplate(String render, String type, PluginsChartTemplate template) {
+        String key = render + "_" + type;
+        if (templateMap.containsKey(key)) return;
+        templateMap.put(key, template);
+    }
+}

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeItem.java

@@ -1,8 +1,8 @@
-package io.dataease.api.chart.filter;
+package io.dataease.extensions.view.filter;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
 import java.io.Serializable;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/filter/FilterTreeObj.java

@@ -1,4 +1,4 @@
-package io.dataease.api.chart.filter;
+package io.dataease.extensions.view.filter;
 
 import lombok.Data;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLMeta.java

@@ -1,4 +1,4 @@
-package io.dataease.api.dataset.union.model;
+package io.dataease.extensions.view.model;
 
 import lombok.Data;
 

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/model/SQLObj.java

@@ -1,4 +1,4 @@
-package io.dataease.api.dataset.union.model;
+package io.dataease.extensions.view.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/template/PluginsChartTemplate.java

@@ -0,0 +1,40 @@
+package io.dataease.extensions.view.template;
+
+import io.dataease.extensions.view.dto.ChartViewDTO;
+import io.dataease.extensions.view.dto.ChartViewFieldDTO;
+import io.dataease.extensions.view.dto.DatasetTableFieldDTO;
+import io.dataease.extensions.view.model.SQLMeta;
+
+import java.util.List;
+import java.util.Map;
+
+public abstract class PluginsChartTemplate {
+
+    public abstract Map<String, List<ChartViewFieldDTO>> formatChartAxis(ChartViewDTO view);
+
+    /*public Map<String, List<ChartViewFieldDTO>> formatChartAxis(ChartViewDTO view) {
+        Map<String, List<ChartViewFieldDTO>> result = new HashMap<>();
+
+        List<ChartViewFieldDTO> xAxisBase = new ArrayList<>(view.getXAxis());
+        result.put("xAxisBase", xAxisBase);
+        List<ChartViewFieldDTO> xAxis = new ArrayList<>(view.getXAxis());
+        result.put("xAxis", xAxis);
+        List<ChartViewFieldDTO> xAxisExt = new ArrayList<>(view.getXAxisExt());
+        result.put("xAxisExt", xAxisExt);
+        List<ChartViewFieldDTO> yAxis = new ArrayList<>(view.getYAxis());
+        result.put("yAxis", yAxis);
+        List<ChartViewFieldDTO> extStack = new ArrayList<>(view.getExtStack());
+        result.put("extStack", extStack);
+        List<ChartViewFieldDTO> extBubble = new ArrayList<>(view.getExtBubble());
+        result.put("extBubble", extBubble);
+        List<ChartViewFieldDTO> drill = new ArrayList<>(view.getDrillFields());
+        result.put("drill", drill);
+        List<ChartViewFieldDTO> viewFields = new ArrayList<>(view.getViewFields());
+        result.put("viewFields", viewFields);
+        return result;
+    }*/
+
+    public abstract ChartViewDTO calcResult(SQLMeta sqlMeta, List<ChartViewFieldDTO> xaxis, List<ChartViewFieldDTO> yaxis,
+                                            List<DatasetTableFieldDTO> allFields, boolean crossDs, Map<Long, String> dsTypeMap);
+
+}

sdk/extensions/pom.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.dataease</groupId>
+        <artifactId>sdk</artifactId>
+        <version>${dataease.version}</version>
+    </parent>
+
+    <packaging>pom</packaging>
+    <modules>
+        <module>extensions-view</module>
+    </modules>
+
+    <artifactId>extensions</artifactId>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

sdk/pom.xml

@@ -16,6 +16,7 @@
         <module>common</module>
         <module>api</module>
         <module>distributed</module>
+        <module>extensions</module>
     </modules>
 
 </project>