Skip to content

Echarts updates #436

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

Merged
merged 11 commits into from
Oct 24, 2023
Merged

Echarts updates #436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dcffd4d
Merge pull request #432 from lowcoder-org/dev
FalkWolsky Oct 22, 2023
12970d0
fix: echarts json rerendering on data change
raheeliftikhar5 Oct 10, 2023
db250dd
feat: github action to publish lowcoder-comps
raheeliftikhar5 Oct 10, 2023
720bc64
fix: publish-comps action fix
raheeliftikhar5 Oct 10, 2023
3034390
fix: publish-comps action fix
raheeliftikhar5 Oct 10, 2023
24eab6e
fix: unit tests fix
raheeliftikhar5 Oct 11, 2023
4daa462
fix: publish lowcoder-comps fix
raheeliftikhar5 Oct 11, 2023
5e853ef
fix: publish lowcoder-comps fix
raheeliftikhar5 Oct 11, 2023
001343b
fix: publish lowcoder-comps fix
raheeliftikhar5 Oct 11, 2023
6ce3ec4
fix: api key issue + exposing map instance
raheeliftikhar5 Oct 24, 2023
a9122be
Merge branch 'dev' into echarts-json-rerender-fix
FalkWolsky Oct 24, 2023
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
Prev Previous commit
Next Next commit
fix: echarts json rerendering on data change
  • Loading branch information
@raheeliftikhar5
raheeliftikhar5 committed Oct 24, 2023
commit 12970d092960b14cf3cd6d066d533a239482711a
1 change: 1 addition & 0 deletions client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
opts={{ locale: getEchartsLocale() }}
option={option}
theme={mode !== 'map' ? themeConfig : undefined}
mode={mode}
/>
)}
</ReactResizeDetector>
Expand Down
5 changes: 5 additions & 0 deletions client/packages/lowcoder-comps/src/comps/chartComp/reactEcharts/core.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ export default class EChartsReactCore extends PureComponent<EChartsReactProps> {
return;
}

if(this.props.mode === "json") {
this.updateEChartsOption();
return;
}

// when these props are not isEqual, update echarts
const pickKeys = ["option", "notMerge", "lazyUpdate", "showLoading", "loadingOption"];
if (!isEqual(_.pick(this.props, pickKeys), _.pick(prevProps, pickKeys))) {
Expand Down
4 changes: 4 additions & 0 deletions client/packages/lowcoder-comps/src/comps/chartComp/reactEcharts/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,8 @@ export type EChartsReactProps = {
* should update echarts options
*/
readonly shouldSetOption?: (prevProps: EChartsReactProps, props: EChartsReactProps) => boolean;
/**
* echarts mode: ui | json | map
*/
readonly mode?: 'ui' | 'json' | 'map'
};