release 3.5.2

apache · Apr 5, 2017 · 32f5c8e · 32f5c8e
1 parent e950aa9
commit 32f5c8e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
@@ -30948,8 +30948,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	            // 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/dist/echarts.common.min.js b/dist/echarts.common.min.js
diff --git a/dist/echarts.js b/dist/echarts.js
@@ -30977,8 +30977,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	            // 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/dist/echarts.min.js b/dist/echarts.min.js
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
@@ -30933,8 +30933,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	            // 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/dist/echarts.simple.min.js b/dist/echarts.simple.min.js