Merge branch 'master' of https://github.com/ecomfe/echarts

apache · Apr 5, 2017 · e950aa9 · e950aa9
2 parents f661ecb + d6e10c7
commit e950aa9
Show file tree

Hide file tree

Showing 13 changed files with 2,634 additions and 1,696 deletions.
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
diff --git a/dist/echarts.js b/dist/echarts.js
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "A powerful charting and visualization library for browser",
   "keywords": [
     "visualization",
@@ -35,7 +35,7 @@
     "prepublish": "node build/amd2common.js"
   },
   "dependencies": {
-    "zrender": "^3.4.1"
+    "zrender": "^3.4.2"
   },
   "devDependencies": {
     "coordtransform": "^2.0.2",
@@ -45,6 +45,6 @@
     "fs-extra": "^0.26.5",
     "glob": "^7.0.0",
     "webpack": "^1.12.13",
-    "zrender": "^3.4.1"
+    "zrender": "^3.4.2"
   }
 }
diff --git a/src/echarts.js b/src/echarts.js
@@ -1508,9 +1508,9 @@ define(function (require) {
         /**
          * @type {number}
          */
-        version: '3.5.1',
+        version: '3.5.2',
         dependencies: {
-            zrender: '3.4.1'
+            zrender: '3.4.2'
         }
     };
 

diff --git a/src/layout/barGrid.js b/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--;

diff --git a/test/ut/core/uiHelper.js b/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);
                     }

diff --git a/test/ut/spec/ui/config.js b/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'
     }
 });