Keep remove normal status.

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');

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;

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

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) {

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')
             });
         }
 

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')
             });

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.

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);