Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
23ae97b
feat(graph): simple layout graph support dragging
kongmoumou Jul 29, 2021
78b2475
test(graph): add simple graph draggable test case
kongmoumou Jul 29, 2021
1d962f6
feat(graph): update circular layout helper function
kongmoumou Jul 31, 2021
ae38c73
feat(graph): support draggable for all graph layout ('none' | 'circul…
kongmoumou Jul 31, 2021
ebae264
test(graph): add graph draggable test case
kongmoumou Jul 31, 2021
8144dcc
Revert "test(graph): add simple graph draggable test case"
kongmoumou Jul 31, 2021
5f8f0c6
fix(graph): node el check for circular layout
kongmoumou Aug 5, 2021
db01e51
fix(graph): remove GraphNode `_fixed` field
kongmoumou Aug 6, 2021
2b1595d
fix(graph): use zrender/vector calculate node layout
kongmoumou Aug 6, 2021
7891815
Merge remote-tracking branch 'upstream/next' into feat-simple-graph-d…
kongmoumou Sep 5, 2021
472e72b
fix: not trigger roam on el's child
kongmoumou Sep 28, 2021
657f379
fix: fix code
kongmoumou Sep 29, 2021
aeb66aa
fix: remove useless code
kongmoumou Sep 29, 2021
45a1ebd
fix: store fixed state in layout object
kongmoumou Sep 29, 2021
155364a
fix: use mouse position calculate circular layout
kongmoumou Sep 29, 2021
ff68ced
Merge pull request #15428 from kongmoumou/feat-simple-graph-draggable
100pah Feb 28, 2022
5dd49b4
Merge pull request #16683 from apache/master
pissang Mar 16, 2022
dd950c7
feat(LineDraw):series-lines support the effect animation go back
wangguisong Apr 26, 2022
38bcddc
Merge branch 'master' into merge-master-to-next
pissang Apr 26, 2022
a7ff84a
Merge pull request #16944 from apache/merge-master-to-next
pissang Apr 26, 2022
4493fce
Merge pull request #16945 from apache/master
pissang Apr 26, 2022
0478f51
rename the option from goback to roundTrip
wangguisong Apr 26, 2022
0fa933d
Merge pull request #16943 from wangguisong/feat-goback
pissang Apr 27, 2022
6de533a
feat: ignore target size for large charts
Ovilia May 24, 2022
02beb9a
feat: make target size an option
Ovilia May 24, 2022
4b2bd9c
feat: rename test file
Ovilia May 24, 2022
c11463a
feat: rename variables
Ovilia May 26, 2022
c1b6775
feat(pie): support specifying coordinate system for pie series.
plainheart May 28, 2022
a630782
feat(bmap): support `convertToPixel` & `convertFromPixel` API.
plainheart May 28, 2022
032e738
fix(typo): Trasition -> Transition
kxxoling Jun 9, 2022
1047e89
Merge pull request #17193 from kxxoling/fix-typo
Ovilia Jun 13, 2022
905b324
chore: update pr template to improve doc control
Ovilia Jun 13, 2022
5d813dd
Merge pull request #17201 from apache/fix-pr
Ovilia Jun 13, 2022
11a9247
Merge pull request #17213 from apache/release
Ovilia Jun 14, 2022
821b24a
fix:improve interface SunburstSeriesOption and TreemapSeriesOption
Jun 15, 2022
18c3337
Merge pull request #17218 from dmzc/5.3.2
Ovilia Jun 16, 2022
f21ec1d
fix: sliderZoom in candlestick dataset error
jiawulin001 Jun 17, 2022
ae66fe6
feat(i18n): add Ukrainian translation. close #17243
Amice13 Jun 18, 2022
f4e7864
Merge pull request #17244 from Amice13/fix-17243
plainheart Jun 19, 2022
aeca584
chore: fix publish ci on fork
pissang Jun 19, 2022
f950fac
chore: check owner on specific workflows
pissang Jun 19, 2022
0f9f16c
Merge pull request #17245 from apache/fix-publish-ci-on-fork
plainheart Jun 20, 2022
6212121
fix(line): set default z/zlevel for temporary symbol to avoid warnings.
plainheart Jun 20, 2022
26fbb75
Merge pull request #17247 from apache/fix/tmp-symbol-z
plainheart Jun 20, 2022
bafb0f9
feat(treemap.breadcrumb): add `emphasis` state (#17242)
susiwen8 Jun 21, 2022
731362b
chore(workflow): close stale issues as not planned rather than comple…
plainheart Jul 4, 2022
89d57f2
Merge pull request #17304 from apache/stale-close-reason
plainheart Jul 4, 2022
70b10e1
fix(custom): fix potential NPE when applying leave transition.
plainheart Jul 4, 2022
64a86ba
Merge pull request #17308 from apache/fix-custom
Ovilia Jul 4, 2022
8951f41
chore: upgrade stale action to v5
plainheart Jul 5, 2022
2d7d59c
Merge pull request #17317 from apache/fix-stale-bot
plainheart Jul 5, 2022
c885e65
fix(log): fix log axis breaks a single data whose log value is negati…
Ovilia Jul 5, 2022
4bf7f4d
fix(log): cache base variable
Ovilia Jul 6, 2022
11f488c
fix(axis): fix axis symbol is not reverted when axis is reverse.
plainheart Jul 7, 2022
ef3e28f
feat(gauge): axisLabel support rotate like sunburst. close 15944
May 5, 2022
2f13981
Merge pull request #17329 from apache/fix/axis-line-symbol
plainheart Jul 10, 2022
1317743
fix(visualMap): fix the indicator doesn't show when hovering on map l…
plainheart Jul 11, 2022
71bdec6
chore: fix some typos
plainheart Jul 11, 2022
2f29323
fix(visualMap): fix wrong type of ecData.
plainheart Jul 11, 2022
bc4ee6c
fix(custom): fix elements may not be removed after updates #17333
Ovilia Jul 11, 2022
add1145
Merge pull request #17346 from apache/fix/visualMap-label-indicator
plainheart Jul 12, 2022
22c8218
fix(custom): apply leave transition and add more comments
Ovilia Jul 12, 2022
ee3b835
test(custom): add a test case with {} that should preserve child
Ovilia Jul 12, 2022
fc43e0a
test(custom): add a test case
Ovilia Jul 13, 2022
343b13a
test: add coarse-pointer in test env
Ovilia Jul 14, 2022
44e650e
fix(custom): fix the case for element after the null child
Ovilia Jul 14, 2022
d08a58f
style: spelling mistakes
ZXYT Jul 15, 2022
c7a8547
style: spelling mistakes
ZXYT Jul 15, 2022
6a261fb
style: spelling mistakes
ZXYT Jul 15, 2022
1822053
fix(type): add missing type `number` to `emphasis.scale` of scatter/l…
plainheart Jul 18, 2022
6e3efd8
style: fix typo of `RoamPayload`.
plainheart Jul 18, 2022
690ad3d
refactor(util): import `encodeHTML` function from `zrender`.
plainheart Jul 19, 2022
65d867e
Merge pull request #17390 from apache/fix/symbol-scale-types
plainheart Jul 19, 2022
3f1ecf9
Merge pull request #17403 from apache/master
plainheart Jul 19, 2022
28baad8
chore(deps-dev): bump terser from 5.3.8 to 5.14.2
dependabot[bot] Jul 20, 2022
7d7150b
chore: update zrender to the latest nightly version.
plainheart Jul 20, 2022
b73b3e5
Merge pull request #17406 from apache/fix-import
plainheart Jul 20, 2022
d5ee24d
fix(pie): fix `labelLine` may not be hidden when `minShowLabelRadian`…
plainheart Jul 21, 2022
a214eda
单轴反向失效问题修复
Jul 21, 2022
8cdcc7d
Merge pull request #17411 from wind108369/bugfix-single-inverse
plainheart Jul 22, 2022
178ec6f
Merge pull request #17407 from apache/dependabot/npm_and_yarn/terser-…
Ovilia Jul 22, 2022
800fcca
Merge pull request #17383 from ZXYT/style-spelling-mistakes
Ovilia Jul 22, 2022
67afcbd
Merge pull request #17412 from apache/fix-pie-labelLine
Ovilia Jul 22, 2022
8fc48c7
fix(custom): ignore element when renderItem returns a group with null…
Ovilia Jul 25, 2022
09e0c80
test(custom): update test case for custom update
Ovilia Jul 25, 2022
d9d00b8
Merge branch 'master' into fix-17333
Ovilia Jul 25, 2022
749b64e
fix(bar-race): provide subPixelOptimize option to solve #14679
Ovilia Jul 26, 2022
52d89e7
test(bar-race): update test
Ovilia Jul 26, 2022
c76c297
fix(symbol): fix `emphasis.scale` can't be reset and specified value …
plainheart Jul 28, 2022
bffad00
test(symbol): add test case for `emphasis.scale`
plainheart Jul 28, 2022
4ed6629
test(vrt): fix changing value of select via js doesn't trigger `chang…
plainheart Jul 28, 2022
8294147
fix(symbol): remove unused import.
plainheart Jul 28, 2022
c584377
Merge pull request #17349 from apache/fix-17333
Ovilia Jul 29, 2022
8e4b5f0
Merge pull request #17442 from apache/fix/symbol-emphasis-scale
plainheart Jul 30, 2022
715e1da
fix(custom): set ignore only if old child exists (#17450)
Ovilia Aug 1, 2022
5470eff
feat(axis): set subPixelOptimize to be false during animation
Ovilia Aug 1, 2022
59e180e
chore: fix wrong imports from `echarts.all`
plainheart Aug 1, 2022
e3c8e3c
chore: fix wrong imports from `echarts.all`
plainheart Aug 1, 2022
074aa81
Merge pull request #17452 from apache/fix-import
Ovilia Aug 2, 2022
979654c
fix(axis): remove unnecessary files
Ovilia Aug 4, 2022
3a6c097
优化饼图性能
Jun 23, 2022
466d08f
fix(axis): when update for the first time, make sure done is called
Ovilia Aug 4, 2022
77ee2a1
test(pie): tweak pie-percent case - add time log, percentPrecision & …
plainheart Aug 4, 2022
d2746af
test(pie): fix test case pie3.html
plainheart Aug 4, 2022
c076a0c
Merge pull request #17275 from wind108369/improve-pie-performance
Ovilia Aug 4, 2022
08eb9a8
fix(theme): fix the abandoned normal level in the theme file. close #…
Liangism Aug 8, 2022
c1c9faf
fix(coarse-pointer): use retrieve
Ovilia Aug 8, 2022
1e7f3b8
fix(theme): move the label block to the outside.
Liangism Aug 9, 2022
abd40cc
Merge pull request #17482 from Liangism/fix-17473
plainheart Aug 9, 2022
a29d37c
Merge pull request #16985 from MeetzhDing/fix-15944
Ovilia Aug 9, 2022
63e05ae
Merge pull request #17237 from jiawulin001/issue#17228
Ovilia Aug 9, 2022
62ebcb9
Merge pull request #17322 from apache/fix-13154
plainheart Aug 9, 2022
9bcded1
Merge pull request #17132 from apache/feat/pie-coordinate-system
plainheart Aug 14, 2022
1a15754
fix(subpixel): set animation with subpixel optimization
Ovilia Aug 15, 2022
f957036
Merge branch 'master' into fix-subpixel
Ovilia Aug 15, 2022
3c4179c
fix(subpixel): remove function
Ovilia Aug 16, 2022
118de18
fix(subpixel): refactor
Ovilia Aug 16, 2022
c277d39
fix(subpixel): refactor subPixelOptimizeLine
Ovilia Aug 16, 2022
3e48e9f
fix(subpixel): remove an unexpected change
Ovilia Aug 17, 2022
f2e8379
Merge pull request #17426 from apache/fix-subpixel
Ovilia Aug 18, 2022
acb54f8
feat(coarse-pointer): fix test
Ovilia Aug 21, 2022
5c3025d
feat(coarse-pointer): fix test
Ovilia Aug 22, 2022
71ba23e
chore: merge next
Ovilia Aug 22, 2022
d0b2045
fix: merge conflict
Ovilia Aug 22, 2022
d897fa2
Merge pull request #17102 from apache/feat-coarse-pointer
Ovilia Aug 22, 2022
99335da
Merge branch 'next'
100pah Aug 22, 2022
3c27102
Merge pull request #17538 from apache/master-tmp
100pah Aug 22, 2022
41676b3
chore(deps): bump engine.io and socket.io
dependabot[bot] Aug 22, 2022
db866d8
Merge pull request #17539 from apache/dependabot/npm_and_yarn/engine.…
Ovilia Aug 22, 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
15 changes: 12 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,28 @@ This pull request is in the type of:



### After: How is it fixed in this PR?
### After: How does it behave after the fixing?

<!-- THE RESULT AFTER FIXING AND A SIMPLE EXPLANATION ABOUT HOW IT IS FIXED. -->

<!-- ADD SCREENSHOT HERE IF APPLICABLE. -->



## Document Info

One of the following should be checked.

- [ ] This PR doesn't relate to document changes
- [ ] The document should be updated later
- [ ] The document changes have been made in apache/echarts-doc#xxx



## Misc

<!-- ADD RELATED ISSUE ID WHEN APPLICABLE -->
### ZRender Changes

- [ ] The API has been changed (apache/echarts-doc#xxx).
- [ ] This PR depends on ZRender changes (ecomfe/zrender#xxx).

### Related test cases or examples to use the new APIs
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly-next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'apache' }}

strategy:
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'apache' }}

strategy:
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/source-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
jobs:
materials:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'apache' }}

strategy:
matrix:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ on:
jobs:
stale:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'apache' }}
steps:
- name: Close Stale Issues
uses: actions/stale@v4
uses: actions/stale@v5
with:
days-before-stale: 730
days-before-close: 7
stale-issue-label: stale
stale-pr-label: stale
stale-issue-message: 'This issue has been automatically marked as stale because it did not have recent activity. It will be closed in 7 days if no further activity occurs. If you wish not to mark it as stale, please leave a comment in this issue.'
close-issue-message: 'This issue has been automatically closed because it did not have recent activity. If this remains to be a problem with the latest version of Apache ECharts, please open a new issue and link this to it. Thanks!'
close-issue-reason: 'not_planned'
stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed in 7 days if no further activity occurs. If you wish not to mark it as stale, please leave a comment in this PR. We are sorry for this but 2 years is a long time and the code base has been changed a lot. Thanks for your contribution anyway.'
close-pr-message: 'This PR has been automatically closed because it has not had recent activity. Sorry for that and we are looking forward to your next contribution.'
exempt-issue-labels: 'FAQ,priority: high'
Expand Down
14 changes: 14 additions & 0 deletions extension-src/bmap/BMapCoordSys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ function BMapCoordSys(bmap, api) {
this._projection = new BMap.MercatorProjection();
}

BMapCoordSys.prototype.type = 'bmap';

BMapCoordSys.prototype.dimensions = ['lng', 'lat'];

BMapCoordSys.prototype.setZoom = function (zoom) {
Expand Down Expand Up @@ -107,6 +109,15 @@ BMapCoordSys.prototype.prepareCustoms = function () {
};
};

BMapCoordSys.prototype.convertToPixel = function (ecModel, finder, value) {
// here we ignore finder as only one bmap component is allowed
return this.dataToPoint(value);
};

BMapCoordSys.prototype.convertFromPixel = function (ecModel, finder, value) {
return this.pointToData(value);
};

function dataToCoordSize(dataSize, dataItem) {
dataItem = dataItem || [0, 0];
return zrUtil.map([0, 1], function (dimIdx) {
Expand Down Expand Up @@ -229,6 +240,9 @@ BMapCoordSys.create = function (ecModel, api) {
seriesModel.coordinateSystem = bmapCoordSys;
}
});

// return created coordinate systems
return bmapCoordSys && [bmapCoordSys];
};

export default BMapCoordSys;
Loading