Bar width should be constrained with barMaxWidth even when barWidth is set

fixes and closes #5316

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--;