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/23 03:48:40 UTC
[incubator-echarts] branch next updated: refact: rename ecData
module to innerStore for adding more storage def.
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
The following commit(s) were added to refs/heads/next by this push:
new c887bca refact: rename ecData module to innerStore for adding more storage def.
c887bca is described below
commit c887bcae711ab331e63fd83adda2f4582268cb80
Author: pissang <bm...@gmail.com>
AuthorDate: Wed Sep 23 11:48:03 2020 +0800
refact: rename ecData module to innerStore for adding more storage def.
---
src/chart/bar/BarView.ts | 2 +-
src/chart/bar/PictorialBarView.ts | 2 +-
src/chart/graph/GraphView.ts | 2 +-
src/chart/helper/LargeLineDraw.ts | 2 +-
src/chart/helper/LargeSymbolDraw.ts | 2 +-
src/chart/helper/Symbol.ts | 2 +-
src/chart/line/LineView.ts | 2 +-
src/chart/sankey/SankeyView.ts | 2 +-
src/chart/sunburst/SunburstPiece.ts | 2 +-
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/timeline/SliderTimelineView.ts | 2 +-
src/component/title.ts | 2 +-
src/component/tooltip/TooltipView.ts | 2 +-
src/component/visualMap/ContinuousView.ts | 2 +-
src/data/List.ts | 2 +-
src/echarts.ts | 4 ++--
src/helper.ts | 2 +-
src/label/LabelManager.ts | 2 +-
src/util/graphic.ts | 2 +-
src/util/{ecData.ts => innerStore.ts} | 0
src/util/states.ts | 2 +-
30 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/chart/bar/BarView.ts b/src/chart/bar/BarView.ts
index 5b7729a..dee4eb4 100644
--- a/src/chart/bar/BarView.ts
+++ b/src/chart/bar/BarView.ts
@@ -30,7 +30,7 @@ import {
initLabel,
removeElementWithFadeOut
} from '../../util/graphic';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import { enableHoverEmphasis, setStatesStylesFromModel } from '../../util/states';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
import {throttle} from '../../util/throttle';
diff --git a/src/chart/bar/PictorialBarView.ts b/src/chart/bar/PictorialBarView.ts
index e3e2466..e926232 100644
--- a/src/chart/bar/PictorialBarView.ts
+++ b/src/chart/bar/PictorialBarView.ts
@@ -39,7 +39,7 @@ import { getDefaultLabel } from '../helper/labelHelper';
import { PathProps, PathStyleProps } from 'zrender/src/graphic/Path';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
import ZRImage from 'zrender/src/graphic/Image';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
const BAR_BORDER_WIDTH_QUERY = ['itemStyle', 'borderWidth'] as const;
diff --git a/src/chart/graph/GraphView.ts b/src/chart/graph/GraphView.ts
index 136b6b9..c632ad6 100644
--- a/src/chart/graph/GraphView.ts
+++ b/src/chart/graph/GraphView.ts
@@ -35,7 +35,7 @@ import View from '../../coord/View';
import Symbol from '../helper/Symbol';
import List from '../../data/List';
import Line from '../helper/Line';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
function isViewCoordSys(coordSys: CoordinateSystem): coordSys is View {
return coordSys.type === 'view';
diff --git a/src/chart/helper/LargeLineDraw.ts b/src/chart/helper/LargeLineDraw.ts
index 692ce3d..50e4f8d 100644
--- a/src/chart/helper/LargeLineDraw.ts
+++ b/src/chart/helper/LargeLineDraw.ts
@@ -27,7 +27,7 @@ import { PathProps } from 'zrender/src/graphic/Path';
import List from '../../data/List';
import { StageHandlerProgressParams, LineStyleOption, ColorString } from '../../util/types';
import Model from '../../model/Model';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
class LargeLinesPathShape {
polyline = false;
diff --git a/src/chart/helper/LargeSymbolDraw.ts b/src/chart/helper/LargeSymbolDraw.ts
index 432df1f..1840c54 100644
--- a/src/chart/helper/LargeSymbolDraw.ts
+++ b/src/chart/helper/LargeSymbolDraw.ts
@@ -30,7 +30,7 @@ import PathProxy from 'zrender/src/core/PathProxy';
import SeriesModel from '../../model/Series';
import { StageHandlerProgressParams } from '../../util/types';
import { CoordinateSystemClipArea } from '../../coord/CoordinateSystem';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
const BOOST_SIZE_THRESHOLD = 4;
diff --git a/src/chart/helper/Symbol.ts b/src/chart/helper/Symbol.ts
index 0ddb157..8b89c12 100644
--- a/src/chart/helper/Symbol.ts
+++ b/src/chart/helper/Symbol.ts
@@ -19,7 +19,7 @@
import {createSymbol} from '../../util/symbol';
import * as graphic from '../../util/graphic';
-import {getECData} from '../../util/ecData';
+import {getECData} from '../../util/innerStore';
import { enterEmphasis, leaveEmphasis, enableHoverEmphasis } from '../../util/states';
import {parsePercent} from '../../util/number';
import {getDefaultLabel} from './labelHelper';
diff --git a/src/chart/line/LineView.ts b/src/chart/line/LineView.ts
index e0df31d..c2f43f9 100644
--- a/src/chart/line/LineView.ts
+++ b/src/chart/line/LineView.ts
@@ -41,7 +41,7 @@ import type OrdinalScale from '../../scale/Ordinal';
import type Axis2D from '../../coord/cartesian/Axis2D';
import { CoordinateSystemClipArea } from '../../coord/CoordinateSystem';
import { setStatesStylesFromModel, setStatesFlag, enableHoverEmphasis } from '../../util/states';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import { createFloat32Array } from '../../util/vendor';
diff --git a/src/chart/sankey/SankeyView.ts b/src/chart/sankey/SankeyView.ts
index b2b5519..8b1bb95 100644
--- a/src/chart/sankey/SankeyView.ts
+++ b/src/chart/sankey/SankeyView.ts
@@ -28,7 +28,7 @@ import ExtensionAPI from '../../ExtensionAPI';
import List from '../../data/List';
import { RectLike } from 'zrender/src/core/BoundingRect';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
interface FocusNodeAdjacencyPayload extends Payload {
dataIndex?: number
diff --git a/src/chart/sunburst/SunburstPiece.ts b/src/chart/sunburst/SunburstPiece.ts
index 1b1f981..72396af 100644
--- a/src/chart/sunburst/SunburstPiece.ts
+++ b/src/chart/sunburst/SunburstPiece.ts
@@ -27,7 +27,7 @@ import GlobalModel from '../../model/Global';
import { PathStyleProps } from 'zrender/src/graphic/Path';
import { ColorString } from '../../util/types';
import Model from '../../model/Model';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
const DEFAULT_SECTOR_Z = 2;
const DEFAULT_TEXT_Z = 4;
diff --git a/src/chart/tree/TreeView.ts b/src/chart/tree/TreeView.ts
index fe65c25..d8ecec8 100644
--- a/src/chart/tree/TreeView.ts
+++ b/src/chart/tree/TreeView.ts
@@ -19,7 +19,7 @@
import * as zrUtil from 'zrender/src/core/util';
import * as graphic from '../../util/graphic';
-import {getECData} from '../../util/ecData';
+import {getECData} from '../../util/innerStore';
import SymbolClz from '../helper/Symbol';
import {radialCoordinate} from './layoutHelper';
import * as bbox from 'zrender/src/core/bbox';
diff --git a/src/chart/treemap/Breadcrumb.ts b/src/chart/treemap/Breadcrumb.ts
index db206b0..6ee42a6 100644
--- a/src/chart/treemap/Breadcrumb.ts
+++ b/src/chart/treemap/Breadcrumb.ts
@@ -18,7 +18,7 @@
*/
import * as graphic from '../../util/graphic';
-import {getECData} from '../../util/ecData';
+import {getECData} from '../../util/innerStore';
import * as layout from '../../util/layout';
import {wrapTreePathInfo} from '../helper/treeHelper';
import TreemapSeriesModel, { TreemapSeriesNodeItemOption, TreemapSeriesOption } from './TreemapSeries';
diff --git a/src/chart/treemap/TreemapView.ts b/src/chart/treemap/TreemapView.ts
index 22f1ea9..2d97f7a 100644
--- a/src/chart/treemap/TreemapView.ts
+++ b/src/chart/treemap/TreemapView.ts
@@ -19,7 +19,7 @@
import {bind, each, indexOf, curry, extend, retrieve, normalizeCssArray} from 'zrender/src/core/util';
import * as graphic from '../../util/graphic';
-import {getECData} from '../../util/ecData';
+import {getECData} from '../../util/innerStore';
import {
isHighDownDispatcher,
setAsHighDownDispatcher,
diff --git a/src/component/axis/AngleAxisView.ts b/src/component/axis/AngleAxisView.ts
index 0221640..e197cec 100644
--- a/src/component/axis/AngleAxisView.ts
+++ b/src/component/axis/AngleAxisView.ts
@@ -29,7 +29,7 @@ import Polar from '../../coord/polar/Polar';
import ComponentView from '../../view/Component';
import AngleAxis from '../../coord/polar/AngleAxis';
import { ZRTextAlign, ZRTextVerticalAlign, ColorString } from '../../util/types';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
const elementList = [
'axisLine',
diff --git a/src/component/axis/AxisBuilder.ts b/src/component/axis/AxisBuilder.ts
index c5f61d5..55fa890 100644
--- a/src/component/axis/AxisBuilder.ts
+++ b/src/component/axis/AxisBuilder.ts
@@ -19,7 +19,7 @@
import {retrieve, defaults, extend, each, isObject} from 'zrender/src/core/util';
import * as graphic from '../../util/graphic';
-import {getECData} from '../../util/ecData';
+import {getECData} from '../../util/innerStore';
import {createTextStyle} from '../../label/labelStyle';
import Model from '../../model/Model';
import {isRadianAroundZero, remRadian} from '../../util/number';
diff --git a/src/component/geo/GeoView.ts b/src/component/geo/GeoView.ts
index afa6302..a98ef0e 100644
--- a/src/component/geo/GeoView.ts
+++ b/src/component/geo/GeoView.ts
@@ -24,7 +24,7 @@ import GlobalModel from '../../model/Global';
import ExtensionAPI from '../../ExtensionAPI';
import GeoModel from '../../coord/geo/GeoModel';
import { Payload, ZRElementEvent, ECEventData } from '../../util/types';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import { enterSelect, leaveSelect } from '../../util/states';
class GeoView extends ComponentView {
diff --git a/src/component/helper/MapDraw.ts b/src/component/helper/MapDraw.ts
index d71e584..ac44e31 100644
--- a/src/component/helper/MapDraw.ts
+++ b/src/component/helper/MapDraw.ts
@@ -37,7 +37,7 @@ import Geo from '../../coord/geo/Geo';
import Model from '../../model/Model';
import Transformable from 'zrender/src/core/Transformable';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
interface RegionsGroup extends graphic.Group {
diff --git a/src/component/marker/MarkAreaView.ts b/src/component/marker/MarkAreaView.ts
index cd836d5..cd992fc 100644
--- a/src/component/marker/MarkAreaView.ts
+++ b/src/component/marker/MarkAreaView.ts
@@ -40,7 +40,7 @@ import MarkerModel from './MarkerModel';
import { makeInner } from '../../util/model';
import { getVisualFromData } from '../../visual/helper';
import { setLabelStyle, getLabelStatesModels } from '../../label/labelStyle';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
interface MarkAreaDrawGroup {
group: graphic.Group
diff --git a/src/component/marker/MarkLineView.ts b/src/component/marker/MarkLineView.ts
index 47e04a5..6f890ac 100644
--- a/src/component/marker/MarkLineView.ts
+++ b/src/component/marker/MarkLineView.ts
@@ -27,7 +27,7 @@ import { CoordinateSystem, isCoordinateSystemType } from '../../coord/Coordinate
import MarkLineModel, { MarkLine2DDataItemOption, MarkLineOption } from './MarkLineModel';
import { ScaleDataValue, ColorString } from '../../util/types';
import SeriesModel from '../../model/Series';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import ExtensionAPI from '../../ExtensionAPI';
import Cartesian2D from '../../coord/cartesian/Cartesian2D';
import GlobalModel from '../../model/Global';
diff --git a/src/component/marker/MarkPointView.ts b/src/component/marker/MarkPointView.ts
index 8981e96..503e855 100644
--- a/src/component/marker/MarkPointView.ts
+++ b/src/component/marker/MarkPointView.ts
@@ -31,7 +31,7 @@ import GlobalModel from '../../model/Global';
import MarkerModel from './MarkerModel';
import ExtensionAPI from '../../ExtensionAPI';
import { HashMap, isFunction, map, defaults, filter, curry } from 'zrender/src/core/util';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import { getVisualFromData } from '../../visual/helper';
import { ZRColor } from '../../util/types';
diff --git a/src/component/timeline/SliderTimelineView.ts b/src/component/timeline/SliderTimelineView.ts
index e8688f8..b382e5a 100644
--- a/src/component/timeline/SliderTimelineView.ts
+++ b/src/component/timeline/SliderTimelineView.ts
@@ -43,7 +43,7 @@ import IntervalScale from '../../scale/Interval';
import { VectorArray } from 'zrender/src/core/vector';
import { parsePercent } from 'zrender/src/contain/text';
import { makeInner } from '../../util/model';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import { enableHoverEmphasis } from '../../util/states';
import { createTooltipMarkup } from '../tooltip/tooltipMarkup';
diff --git a/src/component/title.ts b/src/component/title.ts
index 22d392c..376a823 100644
--- a/src/component/title.ts
+++ b/src/component/title.ts
@@ -19,7 +19,7 @@
import * as zrUtil from 'zrender/src/core/util';
import * as graphic from '../util/graphic';
-import {getECData} from '../util/ecData';
+import {getECData} from '../util/innerStore';
import {createTextStyle} from '../label/labelStyle';
import {getLayoutRect} from '../util/layout';
import ComponentModel from '../model/Component';
diff --git a/src/component/tooltip/TooltipView.ts b/src/component/tooltip/TooltipView.ts
index d877177..d915c41 100644
--- a/src/component/tooltip/TooltipView.ts
+++ b/src/component/tooltip/TooltipView.ts
@@ -49,7 +49,7 @@ import TooltipModel, {TooltipOption} from './TooltipModel';
import Element from 'zrender/src/Element';
import { AxisBaseModel } from '../../coord/AxisBaseModel';
// import { isDimensionStacked } from '../../data/helper/dataStackHelper';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
import { shouldTooltipConfine } from './helper';
import { DataByCoordSys, DataByAxis } from '../axisPointer/axisTrigger';
import { normalizeTooltipFormatResult } from '../../model/mixin/dataFormat';
diff --git a/src/component/visualMap/ContinuousView.ts b/src/component/visualMap/ContinuousView.ts
index bb09781..cd83e3d 100644
--- a/src/component/visualMap/ContinuousView.ts
+++ b/src/component/visualMap/ContinuousView.ts
@@ -38,7 +38,7 @@ import { parsePercent } from 'zrender/src/contain/text';
import { setAsHighDownDispatcher } from '../../util/states';
import { createSymbol } from '../../util/symbol';
import ZRImage from 'zrender/src/graphic/Image';
-import { getECData } from '../../util/ecData';
+import { getECData } from '../../util/innerStore';
const linearMap = numberUtil.linearMap;
const each = zrUtil.each;
diff --git a/src/data/List.ts b/src/data/List.ts
index ca2e84c..6721795 100644
--- a/src/data/List.ts
+++ b/src/data/List.ts
@@ -37,7 +37,7 @@ import {
ModelOption, SeriesDataType, OrdinalRawValue
} from '../util/types';
import {isDataItemOption, convertOptionIdName} from '../util/model';
-import { getECData } from '../util/ecData';
+import { getECData } from '../util/innerStore';
import { PathStyleProps } from 'zrender/src/graphic/Path';
import type Graph from './Graph';
import type Tree from './Tree';
diff --git a/src/echarts.ts b/src/echarts.ts
index f019c49..3181c2d 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -36,7 +36,7 @@ import SeriesModel, { SeriesModelConstructor } from './model/Series';
import ComponentView, {ComponentViewConstructor} from './view/Component';
import ChartView, {ChartViewConstructor} from './view/Chart';
import * as graphic from './util/graphic';
-import {getECData} from './util/ecData';
+import {getECData} from './util/innerStore';
import {
enterEmphasisWhenMouseOver,
leaveEmphasisWhenMouseOut,
@@ -2091,7 +2091,7 @@ class ECharts extends Eventful {
label.zlevel = el.zlevel;
// lift z2 of text content
// TODO if el.emphasis.z2 is spcefied, what about textContent.
- label.z2 = el.z2 + 1;
+ label.z2 = el.z2 + 2;
}
if (labelLine) {
labelLine.z = el.z;
diff --git a/src/helper.ts b/src/helper.ts
index a0332d8..d76de34 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -35,7 +35,7 @@ import {
} from './data/helper/dataStackHelper';
import SeriesModel from './model/Series';
import { AxisBaseModel } from './coord/AxisBaseModel';
-import { getECData } from './util/ecData';
+import { getECData } from './util/innerStore';
/**
* Create a muti dimension List structure from seriesModel.
diff --git a/src/label/LabelManager.ts b/src/label/LabelManager.ts
index 77924f3..4c07da5 100644
--- a/src/label/LabelManager.ts
+++ b/src/label/LabelManager.ts
@@ -26,7 +26,7 @@ import {
updateProps,
initProps
} from '../util/graphic';
-import { getECData } from '../util/ecData';
+import { getECData } from '../util/innerStore';
import ExtensionAPI from '../ExtensionAPI';
import {
ZRTextAlign,
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index dbdd8d1..2b5c0f7 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -69,7 +69,7 @@ import {interpolateNumber} from 'zrender/src/animation/Animator';
import List from '../data/List';
import { getLabelText } from '../label/labelStyle';
import { AnimationEasing } from 'zrender/src/animation/easing';
-import { getECData } from './ecData';
+import { getECData } from './innerStore';
import {makeInner} from './model';
diff --git a/src/util/ecData.ts b/src/util/innerStore.ts
similarity index 100%
rename from src/util/ecData.ts
rename to src/util/innerStore.ts
diff --git a/src/util/states.ts b/src/util/states.ts
index fbeb25f..4256f5f 100644
--- a/src/util/states.ts
+++ b/src/util/states.ts
@@ -18,7 +18,7 @@ import {
DownplayPayload
} from './types';
import { extend, indexOf, isArrayLike, isObject, keys, isArray, each } from 'zrender/src/core/util';
-import { getECData } from './ecData';
+import { getECData } from './innerStore';
import * as colorTool from 'zrender/src/tool/color';
import { EChartsType } from '../echarts';
import List from '../data/List';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org