diff --git a/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue b/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue index b35d3a9611..d109841ca5 100644 --- a/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/clustered-column-chart/ClusteredColumnChart.vue @@ -257,8 +257,8 @@ const drawChart = (rawData: WidgetLoadResponse|null) => { const _seriesData: any[] = []; let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || []; if (state.isPivotDataTable) { - const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME]; - _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)); + const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME]; + _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || []; } _dataFields.forEach((field) => { const _unit: string|undefined = state.unitMap[field]; diff --git a/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue b/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue index e8e135e5c2..0bf72a8249 100644 --- a/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/color-coded-table-heatmap/ColorCodedTableHeatmap.vue @@ -89,7 +89,7 @@ const state = reactive({ yAxisData: computed(() => { if (!state.data?.results?.length) return []; if (state.isPivotDataTable) { - const _excludeFields = [...Object.keys(state.data?.labels_info), SUB_TOTAL_NAME]; + const _excludeFields = [...Object.keys(state.data?.labels_info ?? {}), SUB_TOTAL_NAME]; return state.data.order?.filter((v) => !_excludeFields.includes(v)) || []; } return widgetOptionsState.dataFieldInfo?.data as string[] || []; diff --git a/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue b/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue index 9f97808370..62d541db95 100644 --- a/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue +++ b/apps/web/src/common/modules/widgets/_widgets/heatmap/Heatmap.vue @@ -85,7 +85,7 @@ const state = reactive({ yAxisData: computed(() => { if (!state.data?.results?.length) return []; if (state.isPivotDataTable) { - const _excludeFields = [...Object.keys(state.data?.labels_info), SUB_TOTAL_NAME]; + const _excludeFields = [...Object.keys(state.data?.labels_info ?? {}), SUB_TOTAL_NAME]; return state.data.order?.filter((v) => !_excludeFields.includes(v)) || []; } return (widgetOptionsState.dataFieldInfo?.data ?? []) as string[]; diff --git a/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue b/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue index 42434e2509..e88ac0707d 100644 --- a/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/line-chart/LineChart.vue @@ -239,8 +239,8 @@ const drawChart = (rawData: WidgetLoadResponse|null) => { const _defaultValue = widgetOptionsState.missingValueInfo?.type === 'lineToZero' ? 0 : undefined; let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || []; if (state.isPivotDataTable) { - const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME]; - _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)); + const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME]; + _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || []; } _dataFields.forEach((_dataField) => { const _unit: string|undefined = state.unitMap[_dataField]; diff --git a/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue b/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue index 3fcc7161db..66ea3da707 100644 --- a/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/stacked-column-chart/StackedColumnChart.vue @@ -232,8 +232,8 @@ const drawChart = (rawData?: WidgetLoadResponse|null) => { const _seriesData: any[] = []; let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || []; if (state.isPivotDataTable) { - const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME]; - _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)); + const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME]; + _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || []; } _dataFields.forEach((_dataField) => { const _unit: string|undefined = state.unitMap[_dataField]; diff --git a/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue b/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue index 5e316bbb06..29006751e0 100644 --- a/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue +++ b/apps/web/src/common/modules/widgets/_widgets/stacked-horizontal-bar-chart/StackedHorizontalBarChart.vue @@ -224,9 +224,10 @@ const drawChart = (rawData?: WidgetLoadResponse|null) => { const _seriesData: any[] = []; let _dataFields: string[] = widgetOptionsState.dataFieldInfo?.data as string[] || []; + if (state.isPivotDataTable) { - const _excludeFields = [...Object.keys(rawData?.labels_info), SUB_TOTAL_NAME]; - _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)); + const _excludeFields = [...Object.keys(rawData?.labels_info ?? {}), SUB_TOTAL_NAME]; + _dataFields = rawData?.order?.filter((v) => !_excludeFields.includes(v)) || []; } _dataFields.forEach((_dataField) => { const _unit: string|undefined = state.unitMap[_dataField];