This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch dataset-trans
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 53d0200400bf0ca3907d8192d5f5afd6328d75d7
Merge: 9d9ffce d9d27e2
Author: 100pah <sushuang0...@gmail.com>
AuthorDate: Thu Jul 30 13:28:03 2020 +0800
Merge branch 'next' into dataset-trans
# Conflicts:
# src/chart/graph/GraphSeries.ts
# src/chart/sankey/SankeySeries.ts
# src/data/helper/dimensionHelper.ts
# src/model/mixin/dataFormat.ts
# src/util/graphic.ts
# src/util/states.ts
.eslintignore | 14 +-
.gitignore | 4 +-
README.md | 2 +-
build/build.js | 229 +-
build/config.js | 73 +-
build/dev-fast.js | 25 +-
build/ec-lang-rollup-plugin.js | 2 +-
build/pre-publish.js | 122 +-
build/progress.js | 6 +-
build/release.js | 81 +
build/{remove-dev.js => transform-dev.js} | 39 +-
echarts.common.ts | 2 +-
{extension => extension-src}/bmap/README.md | 0
extension-src/dataTool/prepareBoxplotData.ts | 23 +-
extension/bmap/BMapCoordSys.js | 245 --
extension/bmap/BMapModel.js | 68 -
extension/bmap/BMapView.js | 143 -
extension/bmap/bmap.js | 65 -
extension/dataTool/gexf.js | 230 --
extension/dataTool/index.js | 61 -
extension/dataTool/prepareBoxplotData.js | 107 -
extension/webpack.config.js | 36 -
package-lock.json | 165 +-
package.json | 14 +-
src/.eslintrc.yaml | 1 +
src/ExtensionAPI.ts | 8 +-
src/chart/bar/BarView.ts | 5 +-
src/chart/bar/PictorialBarView.ts | 17 +-
src/chart/custom.ts | 3 +-
src/chart/gauge/GaugeView.ts | 4 +-
src/chart/graph/GraphSeries.ts | 10 +-
src/chart/graph/GraphView.ts | 5 +-
src/chart/heatmap/HeatmapView.ts | 3 +-
src/chart/helper/LargeLineDraw.ts | 3 +-
src/chart/helper/LargeSymbolDraw.ts | 3 +-
src/chart/helper/LineDraw.ts | 3 +-
src/chart/helper/Polyline.ts | 1 +
src/chart/helper/Symbol.ts | 34 +-
src/chart/helper/SymbolDraw.ts | 3 +-
src/chart/line/LineSeries.ts | 12 +-
src/chart/line/LineView.ts | 19 +-
src/chart/lines/LinesSeries.ts | 11 +-
src/chart/lines/LinesView.ts | 1 -
src/chart/map/MapSeries.ts | 21 +-
src/chart/pie/labelLayout.ts | 5 +
src/chart/radar/RadarSeries.ts | 58 +-
src/chart/radar/RadarView.ts | 18 +-
src/chart/sankey/SankeySeries.ts | 32 +-
src/chart/sankey/SankeyView.ts | 7 +-
src/chart/sankey/sankeyVisual.ts | 11 +-
src/chart/sunburst/SunburstPiece.ts | 5 +-
src/chart/sunburst/sunburstAction.ts | 1 -
src/chart/themeRiver/ThemeRiverSeries.ts | 20 +-
src/chart/tree/TreeSeries.ts | 23 +-
src/chart/tree/TreeView.ts | 5 +-
src/chart/treemap/Breadcrumb.ts | 6 +-
src/chart/treemap/TreemapSeries.ts | 28 +-
src/chart/treemap/TreemapView.ts | 31 +-
src/component/axis/AngleAxisView.ts | 3 +-
src/component/axis/AxisBuilder.ts | 30 +-
src/component/axis/AxisView.ts | 1 -
src/component/axis/CartesianAxisView.ts | 17 +-
src/component/axisPointer/AxisPointerModel.ts | 13 +-
src/component/axisPointer/axisTrigger.ts | 18 +-
src/component/axisPointer/findPointFromSeries.ts | 29 +-
src/component/axisPointer/viewHelper.ts | 11 +-
src/component/brush/BrushModel.ts | 1 -
src/component/dataZoom/DataZoomModel.ts | 1 -
src/component/dataZoom/SliderZoomModel.ts | 96 +-
src/component/dataZoom/SliderZoomView.ts | 418 ++-
src/component/dataZoom/helper.ts | 1 -
src/component/geo/GeoView.ts | 2 +-
src/component/graphic.ts | 1 -
src/component/helper/BrushController.ts | 3 +-
src/component/helper/BrushTargetManager.ts | 1 -
src/component/helper/MapDraw.ts | 3 +-
src/component/legend/LegendView.ts | 22 +-
src/component/marker/MarkAreaView.ts | 3 +-
src/component/marker/MarkLineView.ts | 3 +-
src/component/marker/MarkPointView.ts | 2 +-
src/component/marker/MarkerModel.ts | 31 +-
src/component/radar/RadarView.ts | 1 -
src/component/timeline/SliderTimelineModel.ts | 61 +-
src/component/timeline/SliderTimelineView.ts | 192 +-
src/component/timeline/TimelineModel.ts | 21 +
src/component/title.ts | 10 +-
src/component/toolbox/feature/DataZoom.ts | 16 +-
src/component/tooltip/TooltipHTMLContent.ts | 103 +-
src/component/tooltip/TooltipModel.ts | 50 +-
src/component/tooltip/TooltipRichContent.ts | 21 +-
src/component/tooltip/TooltipView.ts | 199 +-
src/component/visualMap/ContinuousModel.ts | 48 +-
src/component/visualMap/ContinuousView.ts | 250 +-
src/component/visualMap/PiecewiseModel.ts | 1 -
src/config.ts | 41 -
src/coord/Axis.ts | 10 +-
src/coord/axisCommonTypes.ts | 24 +-
src/coord/axisDefault.ts | 32 +-
src/coord/axisHelper.ts | 51 +-
src/coord/axisTickLabelBuilder.ts | 147 +-
src/coord/calendar/Calendar.ts | 1 -
src/coord/cartesian/Grid.ts | 1 -
src/coord/cartesian/GridModel.ts | 2 +-
src/coord/cartesian/cartesianAxisHelper.ts | 1 -
src/coord/geo/geoCreator.ts | 1 -
src/coord/geo/geoSourceManager.ts | 1 -
src/coord/geo/mapDataStorage.ts | 1 -
src/coord/polar/polarCreator.ts | 1 -
src/coord/radar/IndicatorAxis.ts | 2 +
src/coord/scaleRawExtentInfo.ts | 1 -
src/data/Graph.ts | 1 -
src/data/List.ts | 3 +-
src/data/helper/dataProvider.ts | 1 -
src/data/helper/dimensionHelper.ts | 1 -
src/data/helper/sourceHelper.ts | 1 -
src/echarts.ts | 114 +-
src/export.ts | 2 +
extension/echarts.js => src/global.d.ts | 2 +-
src/label/LabelManager.ts | 4 +-
src/label/labelStyle.ts | 45 +-
src/lang.ts | 16 +
src/langEN.ts | 20 +-
src/layout/barGrid.ts | 14 +-
src/legacy/dataSelectAction.ts | 1 -
.../legacy/getTextRect.ts | 52 +-
src/model/Global.ts | 1 -
src/model/Series.ts | 71 +-
src/model/internalComponentCreator.ts | 1 -
src/model/mixin/dataFormat.ts | 6 +-
src/model/referHelper.ts | 1 -
src/preprocessor/backwardCompat.ts | 1 -
src/preprocessor/helper/compatStyle.ts | 1 -
src/scale/Interval.ts | 39 +-
src/scale/Log.ts | 11 +-
src/scale/Ordinal.ts | 12 +-
src/scale/Scale.ts | 6 +-
src/scale/Time.ts | 467 ++-
src/stream/task.ts | 1 -
src/util/animation.ts | 1 +
src/util/clazz.ts | 1 -
.../util/ecData.ts | 31 +-
src/util/format.ts | 48 +-
src/util/graphic.ts | 31 +-
src/util/log.ts | 1 -
src/util/model.ts | 1 -
src/util/number.ts | 2 +-
src/util/states.ts | 17 +-
src/util/styleCompat.ts | 1 -
src/util/symbol.ts | 2 +-
src/util/time.ts | 276 ++
src/util/types.ts | 36 +-
src/visual/helper.ts | 1 -
test/boxplot.html | 2 +-
test/dataZoom-rainfall-inside.html | 7 +-
test/line-boldWhenHover.html | 92 +
test/new-tooltip.html | 3280 ++++++++++++++++++++
test/timeScale-formatter.html | 364 +++
test/timeScale.html | 9 +-
test/timeZone.html | 17 +-
test/timeline-finance.html | 6 +-
test/visualMap-scatter-symbolSize.html | 1 +
tsconfig.json | 2 +-
162 files changed, 6921 insertions(+), 2376 deletions(-)
diff --cc src/chart/graph/GraphSeries.ts
index a72622f,489a389..77f4887
--- a/src/chart/graph/GraphSeries.ts
+++ b/src/chart/graph/GraphSeries.ts
@@@ -42,8 -42,7 +42,9 @@@ import
Dictionary,
LineLabelOption,
StatesOptionMixin,
+ GraphEdgeItemObject,
- OptionDataValueNumeric
++ OptionDataValueNumeric,
+ TooltipRenderMode
} from '../../util/types';
import SeriesModel from '../../model/Series';
import Graph from '../../data/Graph';
diff --cc src/chart/sankey/SankeySeries.ts
index 19c64f6,4b4a7f1..5fe0f3e
--- a/src/chart/sankey/SankeySeries.ts
+++ b/src/chart/sankey/SankeySeries.ts
@@@ -33,8 -32,7 +32,9 @@@ import
ColorString,
StatesOptionMixin,
OptionDataItemObject,
+ GraphEdgeItemObject,
- OptionDataValueNumeric
++ OptionDataValueNumeric,
+ TooltipRenderMode
} from '../../util/types';
import GlobalModel from '../../model/Global';
import List from '../../data/List';
diff --cc src/data/helper/dimensionHelper.ts
index 955a3d0,433fd79..98805ac
--- a/src/data/helper/dimensionHelper.ts
+++ b/src/data/helper/dimensionHelper.ts
@@@ -17,12 -17,12 +17,11 @@@
* under the License.
*/
-// @ts-nocheck
import {each, createHashMap, assert} from 'zrender/src/core/util';
- import { __DEV__ } from '../../config';
-import List from '../List';
+import List, { ListDimensionType } from '../List';
import {
- DimensionName, VISUAL_DIMENSIONS, DimensionType, DimensionUserOuput
+ DimensionName, VISUAL_DIMENSIONS, DimensionType, DimensionUserOuput,
DimensionUserOuputEncode, DimensionIndex
} from '../../util/types';
export type DimensionSummaryEncode = {
diff --cc src/data/helper/sourceHelper.ts
index 45d1c10,19bc6ee..8f9d7cb
--- a/src/data/helper/sourceHelper.ts
+++ b/src/data/helper/sourceHelper.ts
@@@ -17,8 -17,8 +17,7 @@@
* under the License.
*/
-// @ts-nocheck
- import {__DEV__} from '../../config';
import {makeInner, getDataItemValue} from '../../util/model';
import {
createHashMap,
diff --cc src/model/mixin/dataFormat.ts
index a10f4a7,c1e714a..f1aa9b7
--- a/src/model/mixin/dataFormat.ts
+++ b/src/model/mixin/dataFormat.ts
@@@ -28,7 -28,7 +28,8 @@@ import
ColorString,
ZRColor,
OptionDataValue,
- SeriesDataType
++ SeriesDataType,
+ TooltipOrderMode
} from '../../util/types';
import GlobalModel from '../Global';
diff --cc src/util/states.ts
index 15f53f8,9cf8e03..fbeb25f
--- a/src/util/states.ts
+++ b/src/util/states.ts
@@@ -5,9 -5,19 +5,20 @@@ import { PatternObject } from 'zrender/
import { GradientObject } from 'zrender/src/graphic/Gradient';
import Element, { ElementEvent } from 'zrender/src/Element';
import Model from '../model/Model';
- import { DisplayState, ECElement, ColorString, BlurScope, InnerFocus,
Payload, ZRColor, SeriesDataType } from './types';
+ import {
++ SeriesDataType,
+ DisplayState,
+ ECElement,
+ ColorString,
+ BlurScope,
+ InnerFocus,
+ Payload,
+ ZRColor,
+ HighlightPayload,
+ DownplayPayload
+ } from './types';
import { extend, indexOf, isArrayLike, isObject, keys, isArray, each } from
'zrender/src/core/util';
- import { getECData } from './graphic';
+ import { getECData } from './ecData';
import * as colorTool from 'zrender/src/tool/color';
import { EChartsType } from '../echarts';
import List from '../data/List';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
