Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

fix(plugin-chart-echarts): funnel chart improvements #1110

Merged
merged 2 commits into from
May 15, 2021
Merged

fix(plugin-chart-echarts): funnel chart improvements #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21eb36c
feat(plugin-chart-echarts): opt funnel
xiezhongfu May 14, 2021
a5b362c
fix(plugin-chart-echarts): fix method shorthand (object shorthand)
xiezhongfu May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 15 additions & 59 deletions plugins/plugin-chart-echarts/src/Funnel/controlPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,18 @@ import React from 'react';
import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core';
import {
ControlPanelConfig,
ControlPanelsContainerProps,
D3_FORMAT_OPTIONS,
sections,
sharedControls,
ControlStateMapping,
} from '@superset-ui/chart-controls';
import { DEFAULT_FORM_DATA, EchartsFunnelLabelTypeType } from './types';
import { legendSection } from '../controls';

const {
sort,
orient,
labelLine,
labelType,
numberFormat,
showLabels,
emitFilter,
} = DEFAULT_FORM_DATA;
const { labelType, numberFormat, showLabels, emitFilter } = DEFAULT_FORM_DATA;

const funnelLegendSection = [...legendSection];
funnelLegendSection.splice(2, 1);

const config: ControlPanelConfig = {
controlPanelSections: [
Expand Down Expand Up @@ -89,7 +84,7 @@ const config: ControlPanelConfig = {
},
]
: [],
...legendSection,
...funnelLegendSection,
// eslint-disable-next-line react/jsx-key
[<h1 className="section-header">{t('Labels')}</h1>],
[
Expand Down Expand Up @@ -140,57 +135,18 @@ const config: ControlPanelConfig = {
},
},
],
[
{
name: 'label_line',
config: {
type: 'CheckboxControl',
label: t('Label Line'),
default: labelLine,
renderTrigger: true,
description: t('Draw line from Funnel to label when labels outside?'),
visibility: ({ controls }: ControlPanelsContainerProps) =>
Boolean(controls?.show_labels?.value),
},
},
],
// eslint-disable-next-line react/jsx-key
[<h1 className="section-header">{t('Funnel shape')}</h1>],
[
{
name: 'sort',
config: {
type: 'SelectControl',
label: t('sort'),
default: sort,
renderTrigger: true,
choices: [
[null, 'Default'],
['ascending', 'Ascending'],
['descending', 'Descending'],
],
description: t('Sort data'),
},
},
{
name: 'orient',
config: {
type: 'SelectControl',
label: t('orient'),
default: orient,
renderTrigger: true,
choices: [
[null, 'Default'],
['vertical', 'Vertical'],
['horizontal', 'Horizontal'],
],
description: t('Funnel chart orientation. The options are vertical, horizontal'),
},
},
],
],
},
],
onInit(state: ControlStateMapping) {
return {
...state,
row_limit: {
...state.row_limit,
value: state.row_limit.default,
},
};
},
};

export default config;
1 change: 1 addition & 0 deletions plugins/plugin-chart-echarts/src/Funnel/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ export default function transformProps(
label: {
...defaultLabel,
position: labelLine ? 'outer' : 'inner',
textBorderColor: 'transparent',
},
emphasis: {
label: {
Expand Down