refactor: splitRangerDateFilters

Author: xieliuduo

frontend/src/app/pages/DashBoardPage/utils/index.ts

@@ -35,7 +35,7 @@ import { ChartDetailConfigDTO } from 'app/types/ChartConfigDTO';
 import { ChartDataRequestFilter } from 'app/types/ChartDataRequest';
 import ChartDataView from 'app/types/ChartDataView';
 import { convertToChartConfigDTO } from 'app/utils/ChartDtoHelper';
-import { getTime } from 'app/utils/time';
+import { getTime, splitRangerDateFilters } from 'app/utils/time';
 import { FilterSqlOperator, TIME_FORMATTER } from 'globalConstants';
 import i18next from 'i18next';
 import moment from 'moment';
@@ -428,6 +428,9 @@ export const getChartWidgetRequestParams = (obj: {
 
   // filter 去重
   requestParams.filters = getDistinctFiltersByColumn(requestParams.filters);
+  // splitRangerDateFilters
+  requestParams.filters = splitRangerDateFilters(requestParams.filters);
+
   // 变量
   if (variableParams) {
     requestParams.params = variableParams;

frontend/src/app/utils/time.ts

@@ -16,7 +16,13 @@
  * limitations under the License.
  */
 
-import { RECOMMEND_TIME, TIME_FORMATTER } from 'globalConstants';
+import { DataViewFieldType } from 'app/constants';
+import { ChartDataRequestFilter } from 'app/types/ChartDataRequest';
+import {
+  FilterSqlOperator,
+  RECOMMEND_TIME,
+  TIME_FORMATTER,
+} from 'globalConstants';
 import moment, { Moment, unitOfTime } from 'moment';
 
 export function getTimeRange(
@@ -75,3 +81,36 @@ export function recommendTimeRangeConverter(relativeTimeRange) {
   }
   return timeRange;
 }
+
+export const splitRangerDateFilters = (filters: ChartDataRequestFilter[]) => {
+  if (!Array.isArray(filters)) return filters;
+  const newFilter = [] as ChartDataRequestFilter[];
+  filters.forEach(filter => {
+    let isTargetFilter = false;
+    if (
+      filter.sqlOperator === FilterSqlOperator.Between &&
+      filter.values?.[0].valueType === DataViewFieldType.DATE
+    ) {
+      isTargetFilter = true;
+    }
+    if (!isTargetFilter) {
+      newFilter.push(filter);
+      return;
+    }
+    // split date range filters
+    if (filter.values?.[0] && filter.values?.[1]) {
+      const start: ChartDataRequestFilter = {
+        ...filter,
+        sqlOperator: FilterSqlOperator.GreaterThanOrEqual,
+        values: [filter.values?.[0]],
+      };
+      const end: ChartDataRequestFilter = {
+        ...filter,
+        sqlOperator: FilterSqlOperator.LessThan,
+        values: [filter.values?.[1]],
+      };
+      newFilter.push(start, end);
+    }
+  });
+  return newFilter;
+};