You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/09/30 11:33:02 UTC
[incubator-echarts] branch next updated (3f616bb -> a97faf2)
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a change to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from 3f616bb fix(tooltip): fix label won't trigger tooltip bug.
add 6026bd3 Merge pull request #2 from apache/master
add e15eaf0 Merge pull request #3 from apache/master
add 09aaafe Merge pull request #4 from apache/master
add 82bb413 Merge pull request #5 from apache/master
add c3dc1cb feat(package.json): add husky pre-commit task to keep the code style consistent
add 79919e7 Merge pull request #12526 from wf123537200/add-husky
add 5c245bc Merge pull request #6 from apache/master
add 0a757f2 fix(tooltip): added dispose method for rich tooltip, close apache#12607.
add 1b02954 Merge pull request #12608 from plainheart/fix-12607
add baa6ea6 fix(bmap): tweak BMapView.js, no need to import `clone` from zrender and it can be fetched from echarts object. (#12568)
add 4e5c6f7 saveAsImage function, use document.defaultView instead of window (#12643)
add 7b5c5e2 fix(markArea): hide labels when markArea is not inside grid #12591
add 2dac208 test(markArea): add test case for #12591
add f62503d fix(markArea): call axis.containData #12591
add 31aaec0 docs: fix the spell error
add 36754fc Merge pull request #12674 from clChenLiang/master
add 695375d fix(line): fix `symbolRotate` for `markLine` does not work. close apache#12388.
add f949aeb fix(line): rotate by default if `symbolRotate` in `markLine` is not specified or NaN.
add d4fb12a test(markLine): remove useless variables.
add 7c3f189 Merge pull request #12392 from plainheart/fix-12388
add bb1d16e Merge pull request #12707 from apache/release
add 184d935 fix(polor): polar bar negative clipping #12109 (#12418)
add 9b793bc fix(markPoint): symbolRotate for markPoint does not work.
add 19711a2 Merge pull request #12737 from plainheart/fix-12731
add 9a9d829 fix(sunburst): enables label formatter in levels #12223
add 15ee064 refactor(tree): remove level in tree data #12223
add 0a98ffb fix(treemap): remove levelItemStyles #12223
add dc3f7bd fix: fix treemap levels color does not work, which was brought by 55bd42dca1b7bb240895ea44396160acaa77694d in 4.8.0. Fix #12747.
add 32a2c0c Merge pull request #12742 from apache/fix-12223
add cb9f6dc Merge pull request #7 from apache/master
add 5ed2c9b Merge branch 'master' of https://github.com/apache/incubator-echarts
add 0cb49f7 fix(bmap): remove Object.keys belongs to ES5.
add 32961f6 Merge pull request #12780 from plainheart/fix-es5-in-bmap-extension
add 40a6279 fix(radar): symbolRotate does not work for radar series.
add 3bb072c Merge pull request #12695 from plainheart/fix-radar-symbolRotate
add ad25fe5 Update comments to not use defualt
add 5c1a5fb Merge pull request #12828 from xmatthias/replace_defualt_comments
add a060cef Merge branch 'master' of https://github.com/apache/incubator-echarts into fix-geo-label-formatter
add 17689f1 fix(geo): label formatter in geo works incorrectly, tweaks apache#10666 & apache#8612.
add 1c39dbe fix(geo): use var but not literal.
add 940b872 fix(geo): added default value for label status.
add 300f75d Merge pull request #12762 from plainheart/fix-geo-label-formatter
add d11b53e fix(tree): the symbols of image type do not display at the first rendering. close apache#12279.
add df815b3 fix(tree): optimize code.
add 6176bd2 fix(tree): tweak access way to the type of symbolEl.
add 48d54d8 fix(tree): fix invalid opacity configuration for symbolPath.
add 8631f27 Merge pull request #12367 from plainheart/fix-12279
add e73aab0 fix(title): incorrect redirect when sublink is clicked.
add 6f78c0d Merge pull request #12842 from apache/fix-12841
add a9653ea ci: run on pr opened or synchronized
add 4a84425 fix: #12812
add 1b0e756 docs(tooltip): fix the spell error
add 1f31de3 Merge pull request #12834 from liulinboyi/fix-12812
add 1f90f1e feat(graph): graph support multiple edges, for #6811
add b2856b2 feat(graph): graph support mutil edge, for #6811
add d9c5d2f fix(tree): code rebuild follow the review suggest
add 32a7062 fix(tree): code rebuild follow the review suggest #2
add 754bf60 fix(tree): code rebuild follow the review suggest #2
add 68eff58 fix(tree): code rebuild follow the review suggest #3
add eadceff fix(tree): code rebuild follow the review suggest #3
add a02f3f2 fix(tree): code rebuild follow the review suggest #4
add 601aa05 fix(tree): code rebuild follow the review suggest #5, add even test
add fd25c1a fix(tree): code rebuild follow the review suggest #6
add baae12e Merge pull request #12590 from wf123537200/feat-6811
add ba82a40 tweak(graph): tweak apache#12590.
add 4ffd864 Merge pull request #12891 from plainheart/tweak-12590
add 45e74ea Update TreeView.js
add 491d30b Merge pull request #12915 from liunana1230/patch-1
add 1368d2c feat(bmap): add `mapOptions` for bmap extension.
add 0c8abb4 Merge branch 'master' of https://github.com/apache/incubator-echarts into feat-add-initial-option-for-bmap
add 8b2ac9d test(extension/bmap): added test case bmap-mapOptions.html.
add 00f2c32 Merge pull request #12868 from plainheart/feat-add-initial-option-for-bmap
add b4b4b8b feat(bot): added .gitattributes file to exclude files needed to ignore for pull-request-size bot.
add 08f2033 fix: fix email link in README.
add 75b6506 fix(dataSample): negative size
add c1e3a78 Merge pull request #12997 from SnailSword/master
add f3aec1e fix(timeline): fix a bug which may bring a crash of browser when using dataURI as icon.
add b9fc3f9 Merge pull request #13015 from apache/fix-timeline-control
add c79a835 Fix #12259. Update the calculation of width/height for axis label after rotate
add 1369d23 Revert changes in dist back
add 29ac8be Add test case for issue #12259
add 0278323 Combine test case of issue #12259 fix to existing cases in axisLabel.html
add 38bd9eb Merge pull request #12556 from quillblue/master
add 57914fb fix(bmap): bmap event `moveend` is always triggered when dragging or zoomend. (#12558)
add 42ba17f fix(lines): lines series shouldn't disappear after `setOption({})`, fix apache#12836.
add 419336e Merge pull request #12850 from plainheart/fix-lines-mergeOption-12836
add 56e783a Fix dataview show NaN when user use dataset
add 3654984 Add test case
add 0f67623 Tweak by CR
add 23596ac Merge pull request #11849 from susiwen8/#7533
add 628a2cc fix(pie): pie series render incorrectly after editing its data in DataView. close apache#12560.
add 9b3631b fix(dataview): tweak `tryMergeDataOption`.
add 2e8764a Merge branch 'master' of https://github.com/apache/incubator-echarts into fix-12560
add 7ad72a1 Merge branch 'master' of https://github.com/apache/incubator-echarts into fix-12560
add c5fa681 fix(DataView): tweak the logic of `tryMergeDataOption`.
add c03283e fix(DataView): tweak the logic of `tryMergeDataOption`.
add 0d471fa Merge pull request #12561 from plainheart/fix-12560
add d42f5cf feat(dataZoom): custom brush style in toolbox.feature.dataZoom. close: #8964
add f571331 fix(dataZoom): use itemStyle mixin to map style properties.
add 2e8961b Merge pull request #12550 from zhiyuc123/customBrushStyle
add 5a94212 fix(tooltip): richText for series-specific formatters #12232
add e5123a2 fix(tooltip): fix map and marker
add 0cf0b50 style(tooltip): remove comments
add be6ad17 Merge pull request #12664 from apache/fix-12232
add 2fc1a85 Merge branch 'master' into fix-12591
add 8d3291e Merge pull request #12669 from apache/fix-12591
add e5975d0 fix(themeRiver): use layer key map rather then largestLayer #11948
add f4a8bfb chore: performance
add 65d726e fix: add hasOwnProperty for robustness.
add ab3d9e4 Merge pull request #12022 from Zaynex/fix-themeriver
add 58aca40 feat(funnel): support orient horizontal
add 6ffebb6 Merge remote-tracking branch 'origin/master' into feat-funnel-orient
add bfaf1dd feat(funnel): optimize orient api and label position values
add a12b9c7 Merge remote-tracking branch 'origin/master' into feat-funnel-orient
add 483c0cd feat(funnel): change horizontal default label position
add 450ee94 Merge pull request #12754 from regrex/feat-funnel-orient
add eb396f2 doc: update readme
add f375328 Merge pull request #13078 from apache/master
add 089a362 fix(graph): fix null pointer error in graph simple layout
add bd6c0f3 Merge pull request #13079 from apache/fix-graph-simple-layout-error
add 6a9e723 fix: In Line.js (used by graph and markLine), when rotation is not specified by users, the "auto rotation" rule should not be broken when rendered at the second time (like when drag graph or move dataZoom). (Brought by 7c3f1896fa1fa93fc7d019f40fd4584024ca32eb #12392 )
add 2cbf459 Merge pull request #13080 from apache/fix/line-symbol-rotation
add fd7bb7a fix 13009
add 1da2b2d change arrow function to normal function
add 7c7a206 Merge pull request #13084 from easonyq/master
add c16913c remove unnecessary var declaration
add 59f9861 Merge pull request #13085 from easonyq/fix-13009
add 5b8839b fix(timeline): fix icon style not work bug brought in #13015
add 106b948 Merge pull request #13087 from apache/fix/timeline-icon-style
add 7d0d325 style: remove unexpected es6 code
add 68e965f Merge pull request #13088 from apache/fix/remove-es6-code
add e5c8871 chore: release 4.9.0
add 90243fc Merge pull request #13092 from apache/release-dev
add 9cd2b08 Merge pull request #13226 from apache/release
add 0a4cd62 fix: partially resolves #13164
add a8b5464 Merge pull request #13283 from CarterLi/master
add 8665834 github: Add tags based on this tutorial: https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features#git.asf.yamlfeatures-Repositorymetadata and this JIRA: https://issues.apache.org/jira/browse/INFRA-20886
add 47752d5 github: add description to GitHub homepage.
add c77c0bd init lgtm
add fd8417b Merge pull request #13369 from junmer/feat-lgtm
add 2f32ac6 Merge branch 'master' into next-merge-master
add dcd9863 fix(themeRiver): fix typo in merge.
add bacbe0a fix(lines): fix typo in merging
add 48fa5c9 test: rename test cases with typo on name
add 93a7188 fix(line): fix symbol on step line not follow the animation bug.
add fb1196d fix incorrect const.
new a97faf2 Merge pull request #13379 from apache/next-merge-master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 13 +
.gitattributes | 3 +
.huskyrc | 5 +
.lgtm.yml | 12 +
README.md | 8 +-
package.json | 1 +
src/chart/bar/BarView.ts | 92 ++++--
src/chart/funnel/FunnelSeries.ts | 10 +-
src/chart/funnel/funnelLayout.ts | 233 ++++++++++---
src/chart/graph/GraphSeries.ts | 11 +-
src/chart/graph/circularLayoutHelper.ts | 10 +-
src/chart/graph/edgeVisual.ts | 8 -
src/chart/graph/forceLayout.ts | 8 +-
src/chart/graph/simpleLayout.ts | 2 +-
src/chart/graph/simpleLayoutHelper.ts | 17 +-
src/chart/helper/Line.ts | 41 ++-
src/chart/helper/multipleGraphEdgeHelper.ts | 230 +++++++++++++
src/chart/line/LineView.ts | 20 +-
src/chart/lines/LinesSeries.ts | 5 +-
src/chart/radar/RadarView.ts | 4 +-
src/chart/sunburst/SunburstSeries.ts | 24 +-
src/chart/themeRiver/ThemeRiverSeries.ts | 67 ++--
src/chart/tree/TreeSeries.ts | 2 +-
src/chart/treemap/TreemapSeries.ts | 16 +-
src/chart/treemap/treemapLayout.ts | 4 +-
src/chart/treemap/treemapVisual.ts | 31 +-
src/component/axisPointer/axisTrigger.ts | 2 +-
src/component/legend/ScrollableLegendView.ts | 2 +-
src/component/marker/MarkAreaView.ts | 73 ++++-
src/component/marker/MarkLineView.ts | 3 +
src/component/marker/MarkPointView.ts | 7 +-
src/component/timeline/SliderTimelineView.ts | 17 +-
src/component/toolbox/feature/DataView.ts | 32 +-
src/component/toolbox/feature/DataZoom.ts | 18 +-
src/component/toolbox/feature/SaveAsImage.ts | 3 +-
src/component/visualMap/VisualMapModel.ts | 2 +-
src/coord/axisDefault.ts | 2 +-
src/coord/axisHelper.ts | 6 +-
src/coord/geo/GeoModel.ts | 1 -
src/data/Graph.ts | 4 -
src/data/List.ts | 2 +-
src/data/Tree.ts | 29 +-
src/echarts.ts | 2 +-
src/layout/barPolar.ts | 6 +-
src/stream/Scheduler.ts | 2 +-
src/visual/commonVisualTypes.ts | 2 +
test/axisLabel.html | 11 +-
test/bar-polar-stack.html | 218 ++++++++++++
test/{bmap.html => bmap-mapOptions.html} | 154 +--------
test/{bmap.html => bmap2.html} | 204 ++++--------
test/data/aqi/aqi-beijing.json | 1 +
test/dataZoom-toolbox.html | 8 +-
test/dataset-charts.html | 36 +-
test/funnel.html | 11 +-
test/geo-labelFormatter.html | 364 +++++++++++++++++++++
test/graph-multiple-edges.html | 357 ++++++++++++++++++++
test/{bar-log.html => lines-mergeOption.html} | 54 ++-
test/markArea.html | 21 +-
test/markLine-symbolRotate.html | 187 +++++++++++
test/markPoint.html | 11 +-
test/pie-dataView.html | 122 +++++++
test/radar.html | 9 +-
test/sunburst-visualMap.html | 24 +-
test/themeRiver3.html | 154 +++++++++
test/timeline-dynamic-series.html | 10 +-
test/tooltip-rich.html | 14 +-
test/tooltip-textStyle.html | 455 ++++++++++++++++++++++++++
test/tooltip-windowResize.html | 383 ++++++++++++++++++++++
test/tree-image2.html | 98 ++++++
test/treemap-simple2.html | 137 ++++++++
70 files changed, 3528 insertions(+), 607 deletions(-)
create mode 100644 .asf.yaml
create mode 100644 .gitattributes
create mode 100644 .huskyrc
create mode 100644 .lgtm.yml
create mode 100644 src/chart/helper/multipleGraphEdgeHelper.ts
copy test/{bmap.html => bmap-mapOptions.html} (76%)
copy test/{bmap.html => bmap2.html} (77%)
create mode 100644 test/data/aqi/aqi-beijing.json
create mode 100644 test/geo-labelFormatter.html
create mode 100644 test/graph-multiple-edges.html
copy test/{bar-log.html => lines-mergeOption.html} (57%)
create mode 100644 test/markLine-symbolRotate.html
create mode 100644 test/pie-dataView.html
create mode 100644 test/themeRiver3.html
create mode 100644 test/tooltip-textStyle.html
create mode 100644 test/tooltip-windowResize.html
create mode 100644 test/tree-image2.html
create mode 100644 test/treemap-simple2.html
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/01: Merge pull request #13379 from
apache/next-merge-master
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit a97faf2b7bb6de6a4e14d658da853ed9466b6500
Merge: 3f616bb fb1196d
Author: Yi Shen <bm...@gmail.com>
AuthorDate: Wed Sep 30 19:32:43 2020 +0800
Merge pull request #13379 from apache/next-merge-master
Merge from master to next
.asf.yaml | 13 +
.gitattributes | 3 +
.huskyrc | 5 +
.lgtm.yml | 12 +
README.md | 8 +-
package.json | 1 +
src/chart/bar/BarView.ts | 92 +++--
src/chart/funnel/FunnelSeries.ts | 10 +-
src/chart/funnel/funnelLayout.ts | 233 ++++++++---
src/chart/graph/GraphSeries.ts | 11 +-
src/chart/graph/circularLayoutHelper.ts | 10 +-
src/chart/graph/edgeVisual.ts | 8 -
src/chart/graph/forceLayout.ts | 8 +-
src/chart/graph/simpleLayout.ts | 2 +-
src/chart/graph/simpleLayoutHelper.ts | 17 +-
src/chart/helper/Line.ts | 41 +-
src/chart/helper/multipleGraphEdgeHelper.ts | 230 +++++++++++
src/chart/line/LineView.ts | 20 +-
src/chart/lines/LinesSeries.ts | 5 +-
src/chart/radar/RadarView.ts | 4 +-
src/chart/sunburst/SunburstSeries.ts | 24 +-
src/chart/themeRiver/ThemeRiverSeries.ts | 67 ++-
src/chart/tree/TreeSeries.ts | 2 +-
src/chart/treemap/TreemapSeries.ts | 16 +-
src/chart/treemap/treemapLayout.ts | 4 +-
src/chart/treemap/treemapVisual.ts | 31 +-
src/component/axisPointer/axisTrigger.ts | 2 +-
src/component/legend/ScrollableLegendView.ts | 2 +-
src/component/marker/MarkAreaView.ts | 73 +++-
src/component/marker/MarkLineView.ts | 3 +
src/component/marker/MarkPointView.ts | 7 +-
src/component/timeline/SliderTimelineView.ts | 17 +-
src/component/toolbox/feature/DataView.ts | 32 +-
src/component/toolbox/feature/DataZoom.ts | 18 +-
src/component/toolbox/feature/SaveAsImage.ts | 3 +-
src/component/visualMap/VisualMapModel.ts | 2 +-
src/coord/axisDefault.ts | 2 +-
src/coord/axisHelper.ts | 6 +-
src/coord/geo/GeoModel.ts | 1 -
src/data/Graph.ts | 4 -
src/data/List.ts | 2 +-
src/data/Tree.ts | 29 +-
src/echarts.ts | 2 +-
src/layout/barPolar.ts | 6 +-
src/stream/Scheduler.ts | 2 +-
src/visual/commonVisualTypes.ts | 2 +
test/axisLabel.html | 11 +-
test/bar-polar-stack.html | 218 ++++++++++
test/bmap-mapOptions.html | 530 ++++++++++++++++++++++++
test/bmap2.html | 592 +++++++++++++++++++++++++++
test/data/aqi/aqi-beijing.json | 1 +
test/dataZoom-toolbox.html | 8 +-
test/dataset-charts.html | 36 +-
test/funnel.html | 11 +-
test/geo-labelFormatter.html | 364 ++++++++++++++++
test/graph-multiple-edges.html | 357 ++++++++++++++++
test/lines-mergeOption.html | 103 +++++
test/markArea.html | 21 +-
test/markLine-symbolRotate.html | 187 +++++++++
test/markPoint.html | 11 +-
test/pie-dataView.html | 122 ++++++
test/radar.html | 9 +-
test/sunburst-visualMap.html | 24 +-
test/themeRiver3.html | 154 +++++++
test/timeline-dynamic-series.html | 10 +-
test/tooltip-rich.html | 14 +-
test/tooltip-textStyle.html | 455 ++++++++++++++++++++
test/tooltip-windowResize.html | 383 +++++++++++++++++
test/tree-image2.html | 98 +++++
test/treemap-simple2.html | 137 +++++++
70 files changed, 4640 insertions(+), 308 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org