You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2020/09/28 06:37:29 UTC
[incubator-echarts] branch custom-morph2 updated (24a22eb ->
9b1afaf)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch custom-morph2
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from 24a22eb enhance: tweak transform name.
add 2d1c701 fix: fix parallel smooth update. fix #13302 .
add e8f22f2 fix: add registerPostInit for gl.
add 71a590b line: optimize memory cost and initialize time for the large line.
add dee7886 fix(line): fix poly builder on some case
add 9b991a4 time: return directly if parsing val is a timestamp.
add 7b7a747 perf(line): optimize performance of time series data on line.
add efafedc fix(type): fix some type errors.
add 6f0f9eb perf: optimize storage access in List for large data.
add 170f893 perf: optimize data access in points layout
add 9f13c48 perf: clean code. fix stacked line
add e106d64 fix(line): optimizing polyline smooth algorithm.
add f2fa790 fix(list): fix some null access issues after perf refactor before.
add ddec4f3 fix(cartesian): fix null pointer error in point to data
add 76bf8f4 test: update case of large line
add a40b939 Merge pull request #13314 from apache/line-optimize
add 6c7802e export necessary method for usage in gl.
add be2e127 german translation added
add 41780c2 added DE ts file
add 76688aa Merge pull request #13315 from TQsoft-GmbH/next-german-translation
add e60e410 fix(createScale): make Model#getNeedCrossZero optional in createScale.
add 3162fe3 expose helper.getECData for gl.
add c887bca refact: rename ecData module to innerStore for adding more storage def.
add 91f4964 chore: migrate changes to next branch and fix a bug brought by a typo(apache/incubator-echarts#13213).
add 7cd58c8 Merge pull request #13214 from plainheart/fix-bmap-typo
add f656a13 feat(labelLine): add showAbove. fix #13130
add 7c7db8d fix: miss type def of labelLine.showAbove
add 7dcce2c feat(sample): support largest-triangle-three-buckets algo
add e916453 feat(sample): add demo to compare samples
add d6f6300 feat(sample): optimize performance of lttb sampling
add c68ab09 fix(task): fix downSample wont change the task params end.
add ec736db fix(List): fix wrong indicesOfNearest when data is sampled
add 255b019 fix(sample): fix lttb downsample with dataZoom
add 67f5524 fix List#indicesOfNearest when there are multiple chunks
add ab3e113 test(sample): update sampling case
add 06973ad Merge pull request #13337 from apache/pr/13317
add 6b37266 fix(event): choose the top most element that will will be highlighted
add 41988f2 refact: remove chunks in List.
add 03bf01c perf: optimize lttb downsample performance.
add d4bf86c fix(List): fix appendData
add 2269a7e fix(List): remove unnecessary chunk code
add 76c413a add comment to explain _storageArr
add d29caa8 refact: better naming.
add 529504b Merge pull request #13339 from apache/list-remove-chunk
add 14270b5 fix(type): fix coordinateSystem is not optional in radar
new 9b1afaf Merge branch 'next' into custom-morph2
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:
.gitignore | 7 +-
build/build.js | 10 +-
extension-src/bmap/BMapCoordSys.ts | 22 +-
extension-src/bmap/BMapModel.ts | 7 +-
extension-src/bmap/BMapView.ts | 26 +-
i18n/langDE-obj.js | 172 +++++++
i18n/langDE.js | 168 +++++++
src/chart/bar/BarView.ts | 2 +-
src/chart/bar/PictorialBarView.ts | 2 +-
src/chart/effectScatter/EffectScatterView.ts | 2 +-
src/chart/graph/GraphView.ts | 2 +-
src/chart/helper/LargeLineDraw.ts | 2 +-
src/chart/helper/LargeSymbolDraw.ts | 8 +-
src/chart/helper/Symbol.ts | 2 +-
src/chart/helper/SymbolDraw.ts | 18 +-
src/chart/helper/createRenderPlanner.ts | 17 +-
src/chart/line.ts | 2 +-
src/chart/line/LineSeries.ts | 2 +-
src/chart/line/LineView.ts | 156 +++---
src/chart/line/helper.ts | 2 +-
src/chart/line/lineAnimationDiff.ts | 126 +++--
src/chart/line/poly.ts | 360 +++++---------
src/chart/parallel/ParallelView.ts | 13 +-
src/chart/radar/RadarSeries.ts | 2 +-
src/chart/sankey/SankeyView.ts | 2 +-
src/chart/scatter/ScatterView.ts | 2 +-
src/chart/sunburst/SunburstPiece.ts | 2 +-
src/chart/themeRiver/ThemeRiverView.ts | 8 +-
src/chart/tree/TreeView.ts | 2 +-
src/chart/treemap/Breadcrumb.ts | 2 +-
src/chart/treemap/TreemapView.ts | 2 +-
src/component/axis/AngleAxisView.ts | 2 +-
src/component/axis/AxisBuilder.ts | 2 +-
src/component/geo/GeoView.ts | 2 +-
src/component/helper/MapDraw.ts | 2 +-
src/component/marker/MarkAreaView.ts | 2 +-
src/component/marker/MarkLineView.ts | 2 +-
src/component/marker/MarkPointView.ts | 2 +-
src/component/marker/MarkerView.ts | 2 +-
src/component/timeline/SliderTimelineView.ts | 2 +-
src/component/title.ts | 2 +-
src/component/tooltip/TooltipView.ts | 2 +-
src/component/visualMap/ContinuousView.ts | 2 +-
src/coord/calendar/Calendar.ts | 3 +-
src/coord/cartesian/Cartesian2D.ts | 57 ++-
src/coord/cartesian/Grid.ts | 10 +-
src/coord/geo/geoJSONLoader.ts | 2 +-
src/coord/scaleRawExtentInfo.ts | 2 +-
src/data/List.ts | 551 +++++++++++----------
src/data/helper/dataProvider.ts | 49 +-
src/echarts.ts | 41 +-
src/export.ts | 3 +-
src/helper.ts | 9 +-
src/i18n/langDE.ts | 142 ++++++
src/label/LabelManager.ts | 2 +-
src/label/labelGuideHelper.ts | 7 +-
src/layout/points.ts | 36 +-
src/model/Series.ts | 9 +-
src/processor/dataSample.ts | 14 +-
src/scale/Scale.ts | 2 +
src/scale/Time.ts | 2 +-
src/util/graphic.ts | 2 +-
src/util/{ecData.ts => innerStore.ts} | 0
src/util/layout.ts | 2 +-
src/util/model.ts | 9 +-
src/util/states.ts | 2 +-
src/util/types.ts | 6 +-
.../src/code.src.js => src/util/vendor.ts | 40 +-
test/{build/mktest-tpl.html => area-smooth.html} | 58 ++-
test/data/large-data.json | 1 +
test/label-layout.html | 1 +
test/largeLine.html | 40 +-
test/parallel-feature.html | 139 ++++++
test/sample-compare.html | 202 ++++++++
74 files changed, 1818 insertions(+), 799 deletions(-)
create mode 100644 i18n/langDE-obj.js
create mode 100644 i18n/langDE.js
create mode 100644 src/i18n/langDE.ts
rename src/util/{ecData.ts => innerStore.ts} (100%)
copy test/build/removeDEV/src/code.src.js => src/util/vendor.ts (61%)
copy test/{build/mktest-tpl.html => area-smooth.html} (55%)
create mode 100644 test/data/large-data.json
create mode 100644 test/parallel-feature.html
create mode 100644 test/sample-compare.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 branch 'next' into custom-morph2
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch custom-morph2
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 9b1afafd2450b9d003820c75af9eaba01367b0f7
Merge: 24a22eb 14270b5
Author: 100pah <su...@gmail.com>
AuthorDate: Mon Sep 28 14:36:57 2020 +0800
Merge branch 'next' into custom-morph2
# Conflicts:
# src/echarts.ts
.gitignore | 7 +-
build/build.js | 10 +-
extension-src/bmap/BMapCoordSys.ts | 22 +-
extension-src/bmap/BMapModel.ts | 7 +-
extension-src/bmap/BMapView.ts | 26 +-
i18n/langDE-obj.js | 172 +++++++++
i18n/langDE.js | 168 ++++++++
src/chart/bar/BarView.ts | 2 +-
src/chart/bar/PictorialBarView.ts | 2 +-
src/chart/effectScatter/EffectScatterView.ts | 2 +-
src/chart/graph/GraphView.ts | 2 +-
src/chart/helper/LargeLineDraw.ts | 2 +-
src/chart/helper/LargeSymbolDraw.ts | 8 +-
src/chart/helper/Symbol.ts | 2 +-
src/chart/helper/SymbolDraw.ts | 18 +-
src/chart/helper/createRenderPlanner.ts | 17 +-
src/chart/line.ts | 2 +-
src/chart/line/LineSeries.ts | 2 +-
src/chart/line/LineView.ts | 156 +++++---
src/chart/line/helper.ts | 2 +-
src/chart/line/lineAnimationDiff.ts | 126 +++---
src/chart/line/poly.ts | 360 ++++++-----------
src/chart/parallel/ParallelView.ts | 13 +-
src/chart/radar/RadarSeries.ts | 2 +-
src/chart/sankey/SankeyView.ts | 2 +-
src/chart/scatter/ScatterView.ts | 2 +-
src/chart/sunburst/SunburstPiece.ts | 2 +-
src/chart/themeRiver/ThemeRiverView.ts | 8 +-
src/chart/tree/TreeView.ts | 2 +-
src/chart/treemap/Breadcrumb.ts | 2 +-
src/chart/treemap/TreemapView.ts | 2 +-
src/component/axis/AngleAxisView.ts | 2 +-
src/component/axis/AxisBuilder.ts | 2 +-
src/component/geo/GeoView.ts | 2 +-
src/component/helper/MapDraw.ts | 2 +-
src/component/marker/MarkAreaView.ts | 2 +-
src/component/marker/MarkLineView.ts | 2 +-
src/component/marker/MarkPointView.ts | 2 +-
src/component/marker/MarkerView.ts | 2 +-
src/component/timeline/SliderTimelineView.ts | 2 +-
src/component/title.ts | 2 +-
src/component/tooltip/TooltipView.ts | 2 +-
src/component/visualMap/ContinuousView.ts | 2 +-
src/coord/calendar/Calendar.ts | 3 +-
src/coord/cartesian/Cartesian2D.ts | 57 ++-
src/coord/cartesian/Grid.ts | 10 +-
src/coord/geo/geoJSONLoader.ts | 2 +-
src/coord/scaleRawExtentInfo.ts | 2 +-
src/data/List.ts | 551 ++++++++++++++-------------
src/data/helper/dataProvider.ts | 49 ++-
src/echarts.ts | 41 +-
src/export.ts | 3 +-
src/helper.ts | 9 +-
src/i18n/langDE.ts | 142 +++++++
src/label/LabelManager.ts | 2 +-
src/label/labelGuideHelper.ts | 7 +-
src/layout/points.ts | 36 +-
src/model/Series.ts | 9 +-
src/processor/dataSample.ts | 14 +-
src/scale/Scale.ts | 2 +
src/scale/Time.ts | 2 +-
src/util/graphic.ts | 2 +-
src/util/{ecData.ts => innerStore.ts} | 0
src/util/layout.ts | 2 +-
src/util/model.ts | 9 +-
src/util/states.ts | 2 +-
src/util/types.ts | 6 +-
src/{chart/line.ts => util/vendor.ts} | 27 +-
test/area-smooth.html | 98 +++++
test/data/large-data.json | 1 +
test/label-layout.html | 1 +
test/largeLine.html | 40 +-
test/parallel-feature.html | 139 +++++++
test/sample-compare.html | 202 ++++++++++
74 files changed, 1879 insertions(+), 765 deletions(-)
diff --cc i18n/langDE.js
index 0000000,6fe027f..7e61b21
mode 000000,100644..100644
--- a/i18n/langDE.js
+++ b/i18n/langDE.js
@@@ -1,0 -1,167 +1,168 @@@
+
+
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+ /**
+ * AUTO-GENERATED FILE. DO NOT MODIFY.
+ */
+ (function(root, factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(['exports', 'echarts'], factory);
+ } else if (
+ typeof exports === 'object' &&
+ typeof exports.nodeName !== 'string'
+ ) {
+ // CommonJS
+ factory(exports, require('echarts'));
+ } else {
+ // Browser globals
+ factory({}, root.echarts);
+ }
+ })(this, function(exports, echarts) {
+
+
+ /**
+ * Language: German.
+ */
+
+ var localeObj = {
+ time: {
+ month: [
+ 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
+ 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'
+ ],
+ monthAbbr: [
+ 'Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun',
+ 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'
+ ],
+ dayOfWeek: [
+ 'Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'
+ ],
+ dayOfWeekAbbr: [
+ 'So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'
+ ]
+ },
+ legend: {
+ selector: {
+ all: 'Alle',
+ inverse: 'Invertiert'
+ }
+ },
+ toolbox: {
+ brush: {
+ title: {
+ rect: 'Box Auswahl',
+ polygon: 'Lasso Auswahl',
+ lineX: 'Horizontale Auswahl',
+ lineY: 'Vertikale Auswahl',
+ keep: 'Bereich Auswahl',
+ clear: 'Auswahl zurücksetzen'
+ }
+ },
+ dataView: {
+ title: 'Daten Ansicht',
+ lang: ['Daten Ansicht', 'Schließen', 'Aktualisieren']
+ },
+ dataZoom: {
+ title: {
+ zoom: 'Zoom',
+ back: 'Zoom zurücksetzen'
+ }
+ },
+ magicType: {
+ title: {
+ line: 'Zu Liniendiagramm wechseln',
+ bar: 'Zu Balkendiagramm wechseln',
+ stack: 'Stapel',
+ tiled: 'Kachel'
+ }
+ },
+ restore: {
+ title: 'Wiederherstellen'
+ },
+ saveAsImage: {
+ title: 'Als Bild speichern',
+ lang: ['Rechtsklick zum Speichern des Bildes']
+ }
+ },
+ series: {
+ typeNames: {
+ pie: 'Tortendiagramm',
+ bar: 'Balkendiagramm',
+ line: 'Liniendiagramm',
+ scatter: 'Streudiagramm',
+ effectScatter: 'Welligkeits-Streudiagramm',
+ radar: 'Radar-Karte',
+ tree: 'Baum',
+ treemap: 'Baumkarte',
+ boxplot: 'Boxplot',
+ candlestick: 'Kerzenständer',
+ k: 'K Liniendiagramm',
+ heatmap: 'Heatmap',
+ map: 'Karte',
+ parallel: 'Parallele Koordinatenkarte',
+ lines: 'Liniendiagramm',
+ graph: 'Beziehungsgrafik',
+ sankey: 'Sankey-Diagramm',
+ funnel: 'Trichterdiagramm',
+ gauge: 'Meßanzeige',
+ pictorialBar: 'Bildlicher Balken',
+ themeRiver: 'Thematische Flusskarte',
+ sunburst: 'Sonnenausbruch'
+ }
+ },
+ aria: {
+ general: {
+ withTitle: 'Dies ist ein Diagramm über "{title}"',
+ withoutTitle: 'Dies ist ein Diagramm'
+ },
+ series: {
+ single: {
+ prefix: '',
+ withName: ' mit Typ {seriesType} namens {seriesName}.',
+ withoutName: ' mit Typ {seriesType}.'
+ },
+ multiple: {
+ prefix: '. Es besteht aus {seriesCount} Serienzählung.',
+ withName: ' Die Serie {seriesId} ist ein {seriesType} welcher {seriesName} darstellt.',
+ withoutName: ' Die {seriesId}-Reihe ist ein {seriesType}.',
+ separator: {
+ middle: '',
+ end: ''
+ }
+ }
+ },
+ data: {
+ allData: 'Die Daten sind wie folgt: ',
+ partialData: 'Die ersten {displayCnt} Elemente sind: ',
+ withName: 'die Daten für {name} sind {value}',
+ withoutName: '{value}',
+ separator: {
+ middle: ',',
+ end: '.'
+ }
+ }
+ }
+ };
+ echarts.registerLocale('DE', localeObj);
++
+ });
diff --cc src/echarts.ts
index 95d8764,f64966b..08aa1f1
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@@ -186,22 -185,12 +186,25 @@@ interface SetOptionOpts
silent?: boolean;
// Rule: only `id` mapped will be merged,
// other components of the certain `mainType` will be removed.
- replaceMerge?: GlobalModelSetOptionOpts['replaceMerge']
+ replaceMerge?: GlobalModelSetOptionOpts['replaceMerge'];
+ transition?: SetOptionTransitionOpt
};
+interface SetOptionTransitionOptItem {
+ // If `from` not given, it means that do not make series transition mandatorily.
+ // There might be transition mapping dy default. Sometimes we do not need them,
+ // which might bring about misleading.
+ from?: SetOptionTransitionOptFinder;
+ to: SetOptionTransitionOptFinder;
+}
+interface SetOptionTransitionOptFinder extends modelUtil.ModelFinderObject {
+ dimension: DimensionLoose;
+}
+type SetOptionTransitionOpt = SetOptionTransitionOptItem | SetOptionTransitionOptItem[];
+
+ interface PostIniter {
+ (chart: EChartsType): void
+ }
type EventMethodName = 'on' | 'off';
function createRegisterEventWithLowercaseECharts(method: EventMethodName) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org