fix: custom SQL in the XAxis (#21847)

This commit is contained in:
Yongjie Zhao
2022-10-19 11:40:52 +08:00
committed by GitHub
parent b77335494a
commit 0a4ecca9f2
13 changed files with 50 additions and 23 deletions

View File

@@ -23,8 +23,8 @@ import {
PostProcessingPivot,
QueryFormData,
QueryObject,
getXAxis,
isXAxisSet,
getXAxisColumn,
} from '@superset-ui/core';
import {
pivotOperator,
@@ -54,7 +54,9 @@ export default function buildQuery(formData: QueryFormData) {
const queryObject = {
...baseQueryObject,
columns: [
...(isXAxisSet(formData) ? ensureIsArray(getXAxis(formData)) : []),
...(isXAxisSet(formData)
? ensureIsArray(getXAxisColumn(formData))
: []),
...ensureIsArray(fd.groupby),
],
series_columns: fd.groupby,