From 0f43d3c665961566cf564747d8a7e57c29041f54 Mon Sep 17 00:00:00 2001 From: pissang Date: Wed, 27 Dec 2017 23:33:14 +0800 Subject: [PATCH] Keep remove normal status. --- src/chart/pie/labelLayout.js | 2 +- src/chart/treemap/TreemapView.js | 8 ++++---- src/chart/treemap/treemapLayout.js | 8 ++++---- src/component/helper/MapDraw.js | 8 ++++---- src/component/marker/MarkLineView.js | 2 +- src/component/marker/MarkPointView.js | 2 +- src/component/timeline/SliderTimelineView.js | 10 +++++----- src/visual/dataColor.js | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/chart/pie/labelLayout.js b/src/chart/pie/labelLayout.js index 99b5b3115..a31865483 100644 --- a/src/chart/pie/labelLayout.js +++ b/src/chart/pie/labelLayout.js @@ -143,7 +143,7 @@ export default function (seriesModel, r, viewWidth, viewHeight) { var itemModel = data.getItemModel(idx); var labelModel = itemModel.getModel('label'); // Use position in normal or emphasis - var labelPosition = labelModel.get('position') || itemModel.get('label.emphasis.position'); + var labelPosition = labelModel.get('position') || itemModel.get('emphasis.label.position'); var labelLineModel = itemModel.getModel('labelLine'); var labelLineLen = labelLineModel.get('length'); diff --git a/src/chart/treemap/TreemapView.js b/src/chart/treemap/TreemapView.js index 2e1f9e807..29f997552 100644 --- a/src/chart/treemap/TreemapView.js +++ b/src/chart/treemap/TreemapView.js @@ -16,10 +16,10 @@ var Rect = graphic.Rect; var each = zrUtil.each; var DRAG_THRESHOLD = 3; -var PATH_LABEL_NOAMAL = ['label', 'normal']; -var PATH_LABEL_EMPHASIS = ['label', 'emphasis']; -var PATH_UPPERLABEL_NORMAL = ['upperLabel', 'normal']; -var PATH_UPPERLABEL_EMPHASIS = ['upperLabel', 'emphasis']; +var PATH_LABEL_NOAMAL = ['label']; +var PATH_LABEL_EMPHASIS = ['emphasis', 'label']; +var PATH_UPPERLABEL_NORMAL = ['upperLabel']; +var PATH_UPPERLABEL_EMPHASIS = ['emphasis', 'upperLabel']; var Z_BASE = 10; // Should bigger than every z. var Z_BG = 1; var Z_CONTENT = 2; diff --git a/src/chart/treemap/treemapLayout.js b/src/chart/treemap/treemapLayout.js index 075085030..6474908e6 100644 --- a/src/chart/treemap/treemapLayout.js +++ b/src/chart/treemap/treemapLayout.js @@ -9,10 +9,10 @@ var mathMin = Math.min; var retrieveValue = zrUtil.retrieve; var each = zrUtil.each; -var PATH_BORDER_WIDTH = ['itemStyle', 'normal', 'borderWidth']; -var PATH_GAP_WIDTH = ['itemStyle', 'normal', 'gapWidth']; -var PATH_UPPER_LABEL_SHOW = ['upperLabel', 'normal', 'show']; -var PATH_UPPER_LABEL_HEIGHT = ['upperLabel', 'normal', 'height']; +var PATH_BORDER_WIDTH = ['itemStyle', 'borderWidth']; +var PATH_GAP_WIDTH = ['itemStyle', 'gapWidth']; +var PATH_UPPER_LABEL_SHOW = ['upperLabel', 'show']; +var PATH_UPPER_LABEL_HEIGHT = ['upperLabel', 'height']; /** * @public diff --git a/src/component/helper/MapDraw.js b/src/component/helper/MapDraw.js index 479ac1c3e..d8945ce98 100644 --- a/src/component/helper/MapDraw.js +++ b/src/component/helper/MapDraw.js @@ -147,10 +147,10 @@ MapDraw.prototype = { group.removeAll(); - var itemStyleAccessPath = ['itemStyle', 'normal']; - var hoverItemStyleAccessPath = ['itemStyle', 'emphasis']; - var labelAccessPath = ['label', 'normal']; - var hoverLabelAccessPath = ['label', 'emphasis']; + var itemStyleAccessPath = ['itemStyle']; + var hoverItemStyleAccessPath = ['emphasis', 'itemStyle']; + var labelAccessPath = ['label']; + var hoverLabelAccessPath = ['emphasis', 'label']; var nameMap = zrUtil.createHashMap(); zrUtil.each(geo.regions, function (region) { diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js index eb7dd9a4e..12bc4dad8 100644 --- a/src/component/marker/MarkLineView.js +++ b/src/component/marker/MarkLineView.js @@ -278,7 +278,7 @@ export default MarkerView.extend({ data.setItemVisual(idx, { symbolSize: itemModel.get('symbolSize') || symbolSize[isFrom ? 0 : 1], symbol: itemModel.get('symbol', true) || symbolType[isFrom ? 0 : 1], - color: itemModel.get('itemStyle.normal.color') || seriesData.getVisual('color') + color: itemModel.get('itemStyle.color') || seriesData.getVisual('color') }); } diff --git a/src/component/marker/MarkPointView.js b/src/component/marker/MarkPointView.js index f403aba42..9407c8c69 100644 --- a/src/component/marker/MarkPointView.js +++ b/src/component/marker/MarkPointView.js @@ -82,7 +82,7 @@ export default MarkerView.extend({ } mpData.setItemVisual(idx, { symbolSize: symbolSize, - color: itemModel.get('itemStyle.normal.color') + color: itemModel.get('itemStyle.color') || seriesData.getVisual('color'), symbol: itemModel.getShallow('symbol') }); diff --git a/src/component/timeline/SliderTimelineView.js b/src/component/timeline/SliderTimelineView.js index 1e9ba4484..33bf187ce 100644 --- a/src/component/timeline/SliderTimelineView.js +++ b/src/component/timeline/SliderTimelineView.js @@ -113,7 +113,7 @@ export default TimelineView.extend({ }, _layout: function (timelineModel, api) { - var labelPosOpt = timelineModel.get('label.normal.position'); + var labelPosOpt = timelineModel.get('label.position'); var orient = timelineModel.get('orient'); var viewRect = getViewRect(timelineModel, api); // Auto label offset. @@ -153,7 +153,7 @@ export default TimelineView.extend({ var sizePlusGap = controlSize + controlGap; // Special label rotate. - var labelRotation = timelineModel.get('label.normal.rotate') || 0; + var labelRotation = timelineModel.get('label.rotate') || 0; labelRotation = labelRotation * PI / 180; // To radian. var playPosition; @@ -193,9 +193,9 @@ export default TimelineView.extend({ rotation: rotationMap[orient], labelRotation: labelRotation, labelPosOpt: labelPosOpt, - labelAlign: timelineModel.get('label.normal.align') || labelAlignMap[orient], - labelBaseline: timelineModel.get('label.normal.verticalAlign') - || timelineModel.get('label.normal.baseline') + labelAlign: timelineModel.get('label.align') || labelAlignMap[orient], + labelBaseline: timelineModel.get('label.verticalAlign') + || timelineModel.get('label.baseline') || labelBaselineMap[orient], // Based on mainGroup. diff --git a/src/visual/dataColor.js b/src/visual/dataColor.js index 4847797db..0f32301b1 100644 --- a/src/visual/dataColor.js +++ b/src/visual/dataColor.js @@ -24,7 +24,7 @@ export default function (seriesType, ecModel) { if (!singleDataColor) { // FIXME Performance var itemModel = dataAll.getItemModel(rawIdx); - var color = itemModel.get('itemStyle.normal.color') + var color = itemModel.get('itemStyle.color') || seriesModel.getColorFromPalette(dataAll.getName(rawIdx), paletteScope); // Legend may use the visual info in data before processed dataAll.setItemVisual(rawIdx, 'color', color); -- GitLab