Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump echarts to 5.3.0 #18162

Merged
merged 2 commits into from
Jan 27, 2022
Merged

chore: bump echarts to 5.3.0 #18162

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
08a49b2
chore: bump echarts to 5.3.0
villebro Jan 25, 2022
6167dad
change to official 5.3.0 and reintroduce bold effect
villebro Jan 27, 2022
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
32 changes: 16 additions & 16 deletions superset-frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion superset-frontend/plugins/plugin-chart-echarts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"dependencies": {
"d3-array": "^1.2.0",
"echarts": "^5.2.2",
"echarts": "^5.3.0",
"lodash": "^4.17.15",
"moment": "^2.26.0"
},
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/controlPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ function createCustomizeSection(
[1, t('Secondary')],
],
default: yAxisIndex,
clearable: false,
renderTrigger: true,
description: t('Primary or secondary y-axis'),
},
Expand Down
3 changes: 3 additions & 0 deletions superset-frontend/plugins/plugin-chart-echarts/src/MixedTimeseries/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ export default function transformProps(
}, {}) as Record<string, DataRecordValue[]>;

const { setDataMask = () => {} } = hooks;
const alignTicks = yAxisIndex !== yAxisIndexB;

const echartOptions: EChartsCoreOption = {
useUTC: true,
Expand Down Expand Up @@ -296,6 +297,7 @@ export default function transformProps(
name: yAxisTitle,
nameGap: yAxisTitleMargin,
nameLocation: yAxisTitlePosition === 'Left' ? 'middle' : 'end',
alignTicks,
},
{
...defaultYAxis,
Expand All @@ -308,6 +310,7 @@ export default function transformProps(
axisLabel: { formatter: formatterSecondary },
scale: truncateYAxis,
name: yAxisTitleSecondary,
alignTicks,
},
],
tooltip: {
Expand Down
10 changes: 9 additions & 1 deletion superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,15 @@ export function transformSeries(
opacity: opacity * areaOpacity,
}
: undefined,
emphasis,
emphasis: {
// bold on hover as required since 5.3.0 to retain backwards feature parity:
// https://apache.github.io/echarts-handbook/en/basics/release-note/5-3-0/#removing-the-default-bolding-emphasis-effect-in-the-line-chart
// TODO: should consider only adding emphasis to currently hovered series
lineStyle: {
width: 'bolder',
},
...emphasis,
},
showSymbol,
symbolSize: markerSize,
label: {
Expand Down