pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 55e01a678b into f5843fe588

This commit is contained in:
Yongjie Zhao 2024-05-05 02:18:33 -03:00 committed by GitHub
parent f5843fe588 55e01a678b
commit 2850c72859
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
superset-frontend/plugins/plugin-chart-table/src/buildQuery.ts
View File

@ -28,6 +28,10 @@ import {
} from '@superset-ui/core';
import { PostProcessingRule } from '@superset-ui/core/src/query/types/PostProcessing';
import { BuildQuery } from '@superset-ui/core/src/chart/registries/ChartBuildQueryRegistrySingleton';
import {
isTimeComparison,
timeCompareOperator,
} from '@superset-ui/chart-controls';
import { TableChartFormData } from './types';
import { updateExternalFormData } from './DataTable/utils/externalAPIs';
@ -130,12 +134,16 @@ const buildQuery: BuildQuery<TableChartFormData> = (
(ownState.currentPage ?? 0) * (ownState.pageSize ?? 0);
}
postProcessing.push(timeCompareOperator(formData, baseQueryObject));
let queryObject = {
...baseQueryObject,
columns,
orderby,
metrics,
post_processing: postProcessing,
time_offsets: isTimeComparison(formData, baseQueryObject)
? formData.time_compare
: [],
...moreProps,
};

2
superset-frontend/plugins/plugin-chart-table/src/controlPanel.tsx
View File

@ -44,6 +44,7 @@ import {
ColumnMeta,
defineSavedMetrics,
getStandardizedControls,
sections,
} from '@superset-ui/chart-controls';
import { PAGE_SIZE_OPTIONS } from './consts';
@ -145,6 +146,7 @@ const percentMetricsControl: typeof sharedControls.metrics = {
const config: ControlPanelConfig = {
controlPanelSections: [
sections.advancedAnalyticsControls,
{
label: t('Query'),
expanded: true,