Default emphasis

src/util/graphic.js

@@ -307,10 +307,11 @@ define(function(require) {
      * @param {string} color
      */
     graphic.setText = function (textStyle, labelModel, color) {
-        var labelPosition = labelModel.get('position') || 'inside';
+        var labelPosition = labelModel.getShallow('position') || 'inside';
         var labelColor = labelPosition.indexOf('inside') >= 0 ? 'white' : color;
         var textStyleModel = labelModel.getModel('textStyle');
         zrUtil.extend(textStyle, {
+            textDistance: labelModel.getShallow('distance') || 5,
             textFont: textStyleModel.getFont(),
             textPosition: labelPosition,
             textFill: textStyleModel.get('color') || labelColor

src/util/model.js

@@ -155,17 +155,19 @@ define(function(require) {
      *         }
      *     }
      * @param {Object} opt
-     * @param {Array.<string>} [subOpts=['position', 'show']]
+     * @param {Array.<string>} subOpts
      */
      modelUtil.defaultEmphasis = function (opt, subOpts) {
         if (opt) {
             var emphasisOpt = opt.emphasis = opt.emphasis || {};
             var normalOpt = opt.normal = opt.normal || {};
 
-            subOpts = subOpts || ['position', 'show', 'textStyle'];
             // Default emphasis option from normal
             zrUtil.each(subOpts, function (subOptName) {
-                emphasisOpt[subOptName] = zrUtil.retrieve(emphasisOpt[subOptName], normalOpt[subOptName]);
+                var val = zrUtil.retrieve(emphasisOpt[subOptName], normalOpt[subOptName]);
+                if (val != null) {
+                    emphasisOpt[subOptName] = val;
+                }
             });
         }
     };