Merge pull request #1228 from xieliuduo/dev36-datefilter-forChart

refactor: splitRangerDateFilters in  ChartDataRequestBuilder

Author: scottsut

frontend/src/app/models/ChartDataRequestBuilder.ts

@@ -42,6 +42,7 @@ import {
   formatTime,
   getTime,
   recommendTimeRangeConverter,
+  splitRangerDateFilters,
 } from 'app/utils/time';
 import { FilterSqlOperator, TIME_FORMATTER } from 'globalConstants';
 import { isEmptyArray, IsKeyIn, UniqWith } from 'utils/object';
@@ -263,8 +264,7 @@ export class ChartDataRequestBuilder {
         },
       ];
     };
-
-    return fields
+    const filters = fields
       .map(field => {
         if (
           field.filter?.condition?.operator === FilterSqlOperator.In ||
@@ -285,6 +285,7 @@ export class ChartDataRequestBuilder {
         };
       })
       .filter(Boolean) as ChartDataRequestFilter[];
+    return splitRangerDateFilters(filters);
   };
 
   private normalizeDrillFilters(): ChartDataRequestFilter[] {
@@ -425,6 +426,7 @@ export class ChartDataRequestBuilder {
 
   public build(): ChartDataRequest {
     return {
+      ...this.buildViewConfigs(),
       viewId: this.dataView?.id,
       aggregators: this.buildAggregators(),
       groups: this.buildGroups(),
@@ -434,7 +436,6 @@ export class ChartDataRequestBuilder {
       functionColumns: this.buildFunctionColumns(),
       columns: this.buildSelectColumns(),
       script: this.script,
-      ...this.buildViewConfigs(),
     };
   }
 }