Browse Source

Merge pull request #30029 in DEC/fineui from master to feature/x

* commit 'e6f9452252478bdd824745af22f6bd4df1ca38a4':
  布局优化
es6
superman 3 years ago
parent
commit
87acd02082
  1. 2
      src/core/wrapper/layout/layout.inline.js

2
src/core/wrapper/layout/layout.inline.js

@ -40,7 +40,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) {
var o = this.options;
var w = BI.InlineLayout.superclass._addElement.apply(this, arguments);
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width;
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width;
if (o.columnSize.length > 0) {
if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) {
columnSize = null;

Loading…
Cancel
Save