Merge pull request #1252 from xieliuduo/dev30-hotFix-filter

hotfix: boardFilter = chartfilter add boardControlFilter

Author: scottsut

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

@@ -426,8 +426,6 @@ export const getChartWidgetRequestParams = (obj: {
     requestParams.filters = requestParams.filters.concat(linkFilters);
   }
 
-  // filter 去重
-  requestParams.filters = getDistinctFiltersByColumn(requestParams.filters);
   // splitRangerDateFilters
   requestParams.filters = splitRangerDateFilters(requestParams.filters);
 

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

@@ -82,6 +82,7 @@ export const getControlOptionQueryParams = (obj: {
     params: undefined,
   });
   const requestParams: ChartDataRequest = {
+    ...viewConfigs,
     aggregators: [],
     filters: filterParams,
     groups: [],
@@ -94,7 +95,6 @@ export const getControlOptionQueryParams = (obj: {
     orders: [],
     keywords: ['DISTINCT'],
     viewId: obj.view.id,
-    ...viewConfigs,
   };
   if (variableParams) {
     requestParams.params = variableParams;