-
Notifications
You must be signed in to change notification settings - Fork 141
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.
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
【完善】ECharts-JSX 重写地图图表 #101
Open
ziwu7
wants to merge
6
commits into
wuhan2020:dev
Choose a base branch
from
ziwu7:dev
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
483e409
ECharts-JSX 重写地图图表
ziwu7 6694a50
Merge pull request #9 from ziwu7/1209
ziwu7 d0ff320
【完善】ECharts-JSX 重写地图图表,已修正。
ziwu7 88a9d29
【完善】ECharts-JSX 重写地图图表,已完成修正。
ziwu7 1d01856
【完善】ECharts-JSX 重写地图图表,已修正代码
ziwu7 8311df8
Merge pull request #10 from ziwu7/1209
ziwu7 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -1,3 +1,6 @@ | ||||||||||||||||||||||||||||||||||||||||||||||
import 'echarts-jsx/dist/renderers/SVG'; | ||||||||||||||||||||||||||||||||||||||||||||||
import 'echarts-jsx/dist/components/geo'; | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
import { DataObject } from 'dom-renderer'; | ||||||||||||||||||||||||||||||||||||||||||||||
import { EChartsOption, EChartsType, init, registerMap } from 'echarts'; | ||||||||||||||||||||||||||||||||||||||||||||||
import { observable } from 'mobx'; | ||||||||||||||||||||||||||||||||||||||||||||||
|
@@ -117,14 +120,21 @@ export class EChartsMap | |||||||||||||||||||||||||||||||||||||||||||||
properties.name = long2short(properties.name); | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
registerMap(mapName, data); | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
chart.setOption(chartOptions); | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
this.renderChart(chartOptions); | ||||||||||||||||||||||||||||||||||||||||||||||
this.adjustLabel(); | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
chart.hideLoading(); | ||||||||||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
renderChart(chartOptions: EChartsOption) { | ||||||||||||||||||||||||||||||||||||||||||||||
return ( | ||||||||||||||||||||||||||||||||||||||||||||||
<ec-svg-renderer > | ||||||||||||||||||||||||||||||||||||||||||||||
<ec-geo | ||||||||||||||||||||||||||||||||||||||||||||||
map={this.mapName} | ||||||||||||||||||||||||||||||||||||||||||||||
data={chartOptions.options[0].series[0]?.data} | ||||||||||||||||||||||||||||||||||||||||||||||
/> | ||||||||||||||||||||||||||||||||||||||||||||||
</ec-svg-renderer> | ||||||||||||||||||||||||||||||||||||||||||||||
); | ||||||||||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||
updateChartData = (newData: Province[]) => | ||||||||||||||||||||||||||||||||||||||||||||||
this.chart.setOption({ | ||||||||||||||||||||||||||||||||||||||||||||||
series: [ | ||||||||||||||||||||||||||||||||||||||||||||||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
JSX 渲染方法应由组件引擎调用,而不是组件作者直接调用。