This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch ssr
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 7dd9b37868f94566e353669794f4cc63e83ab210
Merge: 01df82a9e fd9e62d7f
Author: Ovilia <zwl.s...@gmail.com>
AuthorDate: Thu Nov 16 14:43:26 2023 +0800
chore: merge
.github/workflows/ci.yml | 44 +-
.github/workflows/pr-preview.yml | 76 +
.github/workflows/teardown-pr-preview.yml | 30 +
.husky/pre-commit | 0
dist/echarts.common.js | 6064 ++++++-------
dist/echarts.common.js.map | 2 +-
dist/echarts.common.min.js | 4 +-
dist/echarts.esm.js | 9191 ++++++++++----------
dist/echarts.esm.js.map | 2 +-
dist/echarts.esm.min.js | 4 +-
dist/echarts.js | 9191 ++++++++++----------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 4 +-
dist/echarts.simple.js | 4686 +++++-----
dist/echarts.simple.js.map | 2 +-
dist/echarts.simple.min.js | 4 +-
dist/extension/bmap.js.map | 2 +-
dist/extension/dataTool.js.map | 2 +-
i18n/langDE-obj.js | 2 +-
i18n/langDE.js | 2 +-
package-lock.json | 810 +-
package.json | 2 +-
src/chart/graph/GraphSeries.ts | 2 +-
src/chart/helper/createClipPathFromCoordSys.ts | 10 +-
src/chart/line/LineView.ts | 5 +-
src/chart/pie/PieSeries.ts | 5 +
src/chart/pie/pieLayout.ts | 92 +-
src/chart/sankey/SankeyView.ts | 70 +-
src/chart/scatter/ScatterView.ts | 9 +-
src/chart/sunburst/SunburstPiece.ts | 48 +-
src/component/axis/AngleAxisView.ts | 13 +-
src/component/axis/RadiusAxisView.ts | 12 +-
src/component/toolbox/ToolboxView.ts | 10 +-
src/component/toolbox/featureManager.ts | 4 +
src/component/tooltip/TooltipHTMLContent.ts | 67 +-
src/component/tooltip/TooltipModel.ts | 12 +-
src/component/tooltip/TooltipView.ts | 6 +-
src/component/tooltip/seriesFormatTooltip.ts | 8 +-
src/component/tooltip/tooltipMarkup.ts | 25 +-
src/component/visualMap/ContinuousView.ts | 23 +-
src/coord/CoordinateSystem.ts | 2 +-
src/coord/cartesian/Cartesian2D.ts | 12 +-
src/coord/polar/AxisModel.ts | 1 +
src/coord/polar/polarCreator.ts | 3 +-
src/core/echarts.ts | 25 +-
src/core/locale.ts | 2 +-
src/data/Source.ts | 2 +-
src/export/core.ts | 43 +-
src/i18n/langAR.ts | 147 +
src/i18n/langCS.ts | 4 +-
src/i18n/langDE.ts | 4 +-
src/i18n/langEN.ts | 4 +-
src/i18n/langES.ts | 60 +
src/i18n/langFI.ts | 60 +
src/i18n/langFR.ts | 4 +-
src/i18n/langHU.ts | 4 +-
src/i18n/langIT.ts | 4 +-
src/i18n/langJA.ts | 4 +-
src/i18n/langKO.ts | 4 +-
src/i18n/langNL.ts | 144 +
src/i18n/langPL.ts | 4 +-
src/i18n/langPT-br.ts | 4 +-
src/i18n/langRO.ts | 4 +-
src/i18n/langRU.ts | 4 +-
src/i18n/langSI.ts | 4 +-
src/i18n/langTH.ts | 60 +
src/i18n/langTR.ts | 4 +-
src/i18n/langUK.ts | 4 +-
src/i18n/langVI.ts | 4 +-
src/i18n/langZH.ts | 4 +-
src/label/LabelManager.ts | 3 +
src/label/labelGuideHelper.ts | 4 +-
src/model/mixin/dataFormat.ts | 2 +
src/util/format.ts | 8 +-
src/util/graphic.ts | 2 +-
src/util/types.ts | 5 +-
src/visual/aria.ts | 3 +-
test/clip-line-cap.html | 93 +
test/clip.html | 8 +-
test/clip2.html | 157 +
test/dataset-source-two-typed-array.html | 271 +
test/line-endLabel.html | 44 +-
test/pie-endAngle.html | 90 +
test/pie-pad-angle.html | 133 +
test/polar-end-angle.html | 85 +
test/roseType-labeline.html | 120 +
test/runTest/actions/__meta__.json | 9 +-
test/runTest/actions/clip2.json | 1 +
test/runTest/actions/pie-endAngle.json | 1 +
test/runTest/actions/roseType-labeline.json | 1 +
.../runTest/actions/sankey-emphasis-lineStyle.json | 1 +
test/runTest/actions/sunburst-label-rotate.json | 1 +
test/runTest/actions/tooltip-opacity.json | 1 +
.../actions/visualMap-multi-continuous.json | 1 +
test/sankey-emphasis-lineStyle.html | 98 +
test/sunburst-label-align.html | 1197 +++
test/sunburst-label-rotate.html | 110 +
test/sunburst-label.html | 7 +-
test/toolbox-textStyle.html | 122 +-
test/tooltip-appendTo.html | 550 ++
test/tooltip-opacity.html | 144 +
test/tooltip-valueFormatter.html | 39 +-
test/visualMap-multi-continuous.html | 319 +
103 files changed, 19749 insertions(+), 15057 deletions(-)
diff --cc src/core/echarts.ts
index 75bd56561,7757dd22f..aaf538c72
--- a/src/core/echarts.ts
+++ b/src/core/echarts.ts
@@@ -418,25 -419,14 +419,23 @@@ class ECharts extends Eventful<ECEventD
env.hasGlobalWindow ? window : global
) as any;
- defaultRenderer = root.__ECHARTS__DEFAULT__RENDERER__ ||
defaultRenderer;
-
- defaultCoarsePointer =
retrieve2(root.__ECHARTS__DEFAULT__COARSE_POINTER, defaultCoarsePointer);
+ if (root) {
+ defaultRenderer =
retrieve2(root.__ECHARTS__DEFAULT__RENDERER__, defaultRenderer);
+ defaultCoarsePointer =
retrieve2(root.__ECHARTS__DEFAULT__COARSE_POINTER, defaultCoarsePointer);
+ defaultUseDirtyRect =
retrieve2(root.__ECHARTS__DEFAULT__USE_DIRTY_RECT__, defaultUseDirtyRect);
+ }
- const devUseDirtyRect = root.__ECHARTS__DEFAULT__USE_DIRTY_RECT__;
- defaultUseDirtyRect = devUseDirtyRect == null
- ? defaultUseDirtyRect
- : devUseDirtyRect;
}
+ zrender.registerSSRDataGetter(el => {
+ const ecData = getECData(el);
+ const hashMap = createHashMap();
+ hashMap.set('series_index', ecData.seriesIndex);
+ hashMap.set('data_index', ecData.dataIndex);
+ hashMap.set('ssr_type', ecData.ssrType);
+ return hashMap;
+ });
+
const zr = this._zr = zrender.init(dom, {
renderer: opts.renderer || defaultRenderer,
devicePixelRatio: opts.devicePixelRatio,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
