feat(图表-指标卡): 支持显示同环比数据

core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/IndicatorHandler.java

@@ -1,12 +1,62 @@
 package io.dataease.chart.charts.impl.numeric;
 
+import io.dataease.chart.utils.ChartDataBuild;
+import io.dataease.engine.sql.SQLProvider;
+import io.dataease.engine.trans.Dimension2SQLObj;
+import io.dataease.engine.trans.Quota2SQLObj;
+import io.dataease.engine.utils.Utils;
+import io.dataease.extensions.datasource.dto.DatasourceRequest;
+import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO;
+import io.dataease.extensions.datasource.model.SQLMeta;
+import io.dataease.extensions.datasource.provider.Provider;
+import io.dataease.extensions.view.dto.*;
+import io.dataease.extensions.view.util.FieldUtil;
 import lombok.Getter;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 @Component
 public class IndicatorHandler extends NumericalChartHandler {
     @Getter
     private String render = "custom";
     @Getter
     private String type = "indicator";
+
+    @Override
+    public <T extends ChartCalcDataResult> T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map<String, Object> sqlMap, SQLMeta sqlMeta, Provider provider) {
+        var dsMap = (Map<Long, DatasourceSchemaDTO>) sqlMap.get("dsMap");
+        List<String> dsList = new ArrayList<>();
+        for (Map.Entry<Long, DatasourceSchemaDTO> next : dsMap.entrySet()) {
+            dsList.add(next.getValue().getType());
+        }
+        boolean needOrder = Utils.isNeedOrder(dsList);
+        boolean crossDs = Utils.isCrossDs(dsMap);
+        DatasourceRequest datasourceRequest = new DatasourceRequest();
+        datasourceRequest.setDsList(dsMap);
+        var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis);
+        var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis);
+        var allFields = (List<ChartViewFieldDTO>) filterResult.getContext().get("allFields");
+        Dimension2SQLObj.dimension2sqlObj(sqlMeta, xAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams());
+        Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, FieldUtil.transFields(allFields), crossDs, dsMap, Utils.getParams(FieldUtil.transFields(allFields)), view.getCalParams());
+        String querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
+        querySql = provider.rebuildSQL(querySql, sqlMeta, crossDs, dsMap);
+        datasourceRequest.setQuery(querySql);
+        logger.debug("indicator chart sql: " + querySql);
+        List<String[]> data = (List<String[]>) provider.fetchResultField(datasourceRequest).get("data");
+        boolean isdrill = filterResult
+                .getFilterList()
+                .stream()
+                .anyMatch(ele -> ele.getFilterType() == 1);
+        quickCalc(xAxis, yAxis, data);
+        Map<String, Object> result = ChartDataBuild.transNormalChartData(xAxis, yAxis, view, data, isdrill);
+        T calcResult = (T) new ChartCalcDataResult();
+        calcResult.setData(result);
+        calcResult.setContext(filterResult.getContext());
+        calcResult.setQuerySql(querySql);
+        calcResult.setOriginData(data);
+        return calcResult;
+    }
 }

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

@@ -118,7 +118,6 @@ const isEnableCompare = () => {
   // 暂时只支持类别轴/维度的时间类型字段
   if (
     t1.length > 0 &&
-    chart.value.type !== 'indicator' &&
     chart.value.type !== 'label' &&
     chart.value.type !== 'gauge' &&
     chart.value.type !== 'liquid'

core/core-frontend/src/views/chart/components/js/panel/charts/others/indicator.ts

@@ -51,12 +51,16 @@ export class IndicatorChartView extends AbstractChartView {
     ],
     'function-cfg': ['emptyDataStrategy']
   }
-  axis: AxisType[] = ['yAxis', 'filter']
+  axis: AxisType[] = ['xAxis', 'yAxis', 'filter']
   axisConfig: AxisConfig = {
+    xAxis: {
+      name: `日期 / ${t('chart.dimension')}`,
+      limit: 1,
+      type: 'd'
+    },
     yAxis: {
       name: `${t('chart.quota')}`,
-      limit: 1,
-      type: 'q'
+      limit: 1
     }
   }
   constructor() {