Merge pull request #5434 from ecomfe/bar-chart

fix barMaxWidth for bar charts

Author: Ovilia

src/layout/barGrid.js

@@ -95,8 +95,11 @@ define(function(require) {
             // Find if any auto calculated bar exceeded maxBarWidth
             zrUtil.each(stacks, function (column, stack) {
                 var maxWidth = column.maxWidth;
-                if (!column.width && maxWidth && maxWidth < autoWidth) {
+                if (maxWidth && maxWidth < autoWidth) {
                     maxWidth = Math.min(maxWidth, remainedWidth);
+                    if (column.width) {
+                        maxWidth = Math.min(maxWidth, column.width);
+                    }
                     remainedWidth -= maxWidth;
                     column.width = maxWidth;
                     autoWidthCount--;

test/ut/core/uiHelper.js

@@ -226,6 +226,10 @@
             describe(suiteName, function() {
                 var start = isTestAll ? 0 : cases.length - 1;
                 for (var cid = start; cid < cases.length; ++cid) {
+                    if (cases[cid].ignore) {
+                        continue;
+                    }
+
                     var name = specName + ' - ' + suiteName + ': '
                         + cases[cid].name;
                     if (cases[cid].cases) {
@@ -236,13 +240,13 @@
                     if (cases[cid].test === 'equalOption') {
                         helper.expectEqualOption(name, cases[cid].option1,
                             cases[cid].option2);
-                        helper.testOption(name + ', same as last version',
-                            cases[cid].option1);
+                        // helper.testOption(name + ', same as last version',
+                        //     cases[cid].option1);
                     } else if (cases[cid].test === 'notEqualOption') {
                         helper.expectNotEqualOption(name, cases[cid].option1,
                             cases[cid].option2);
-                        helper.testOption(name + ', same as last version',
-                            cases[cid].option1);
+                        // helper.testOption(name + ', same as last version',
+                        //     cases[cid].option1);
                     } else {
                         helper.testOption(name, cases[cid].option);
                     }

test/ut/spec/ui/config.js

@@ -1,6 +1,6 @@
 require.config({
     paths: {
-        'oldEcharts': 'tmp/oldEcharts',
+        'oldEcharts': 'tmp/echarts-v3.4.0',
         'newEcharts': '../../dist/echarts'
     }
 });