Legend out align fix, Grid containLabel adjustment fix when there is no data

src/component/legend/LegendView.js

@@ -79,7 +79,7 @@ define(function (require) {
             group.removeAll();
 
             if (itemAlign === 'auto') {
-                itemAlign = group.position[0] / api.getWidth() < 0.7 ? 'left' : 'right';
+                itemAlign = legendModel.get('x') === 'right' ? 'right' : 'left';
             }
 
             var legendDataMap = {};

src/coord/cartesian/Grid.js

@@ -107,14 +107,16 @@ define(function(require, factory) {
         if (gridModel.get('containLabel')) {
             each(axesList, function (axis) {
                 var labelUnionRect = getLabelUnionRect(axis);
-                var dim = axis.isHorizontal() ? 'height' : 'width';
-                var margin = axis.model.get('axisLabel.margin');
-                gridRect[dim] -= labelUnionRect[dim] + margin;
-                if (axis.position === 'top') {
-                    gridRect.y += labelUnionRect.height + margin;
-                }
-                else if (axis.position === 'left')  {
-                    gridRect.x += labelUnionRect.width + margin;
+                if (labelUnionRect) {
+                    var dim = axis.isHorizontal() ? 'height' : 'width';
+                    var margin = axis.model.get('axisLabel.margin');
+                    gridRect[dim] -= labelUnionRect[dim] + margin;
+                    if (axis.position === 'top') {
+                        gridRect.y += labelUnionRect.height + margin;
+                    }
+                    else if (axis.position === 'left')  {
+                        gridRect.x += labelUnionRect.width + margin;
+                    }
                 }
             });