Browse Source

整理代码

es6
guy 3 years ago
parent
commit
d55e7a8bdd
  1. 4
      src/core/platform/web/config.js
  2. 2
      src/core/wrapper/layout/fill/float.fill.horizontal.js

4
src/core/platform/web/config.js

@ -49,7 +49,9 @@ BI.prepares.push(function () {
if (hasAutoAndFillColumnSize) { if (hasAutoAndFillColumnSize) {
// 宽度是不是受限 // 宽度是不是受限
if ((ob.scrollable !== true && ob.scrollx !== true) || ob.horizontalAlign === BI.HorizontalAlign.Stretch) { if ((ob.scrollable !== true && ob.scrollx !== true) || ob.horizontalAlign === BI.HorizontalAlign.Stretch) {
return BI.extend({}, ob, {type: "bi.horizontal_float_fill"}); return BI.extend({
verticalAlign: BI.VerticalAlign.Top
}, ob, {type: "bi.horizontal_float_fill"});
} }
return BI.extend({ return BI.extend({
horizontalAlign: BI.HorizontalAlign.Stretch horizontalAlign: BI.HorizontalAlign.Stretch

2
src/core/wrapper/layout/fill/float.fill.horizontal.js

@ -1,7 +1,7 @@
BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, { BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, {
props: function () { props: function () {
return BI.extend(BI.FloatHorizontalFillLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.FloatHorizontalFillLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-h-float-fill", baseCls: "bi-h-float-fill clearfix",
horizontalAlign: BI.HorizontalAlign.Stretch, horizontalAlign: BI.HorizontalAlign.Stretch,
verticalAlign: BI.VerticalAlign.Stretch, verticalAlign: BI.VerticalAlign.Stretch,
hgap: 0, hgap: 0,

Loading…
Cancel
Save