Browse Source

Pull request #2073: 无JIRA任务 bugfix

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'ffd4a43f212097982b31b7c75f7da6c1aec1c0fa':
  bugfix
es6
guy 3 years ago
parent
commit
229f8dc696
  1. 2
      src/core/platform/web/config.js
  2. 1
      src/core/wrapper/layout/fill/float.fill.horizontal.js

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

@ -31,7 +31,7 @@ BI.prepares.push(function () {
// 当列宽既需要自动列宽又需要自适应列宽时,inline布局也处理不了了,降级table处理吧 // 当列宽既需要自动列宽又需要自适应列宽时,inline布局也处理不了了,降级table处理吧
var hasAutoAndFillColumnSize = false; var hasAutoAndFillColumnSize = false;
if (ob.columnSize && ob.columnSize.length > 0) { if (ob.columnSize && ob.columnSize.length > 0) {
if (ob.columnSize && ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) { if (ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) {
hasAutoAndFillColumnSize = true; hasAutoAndFillColumnSize = true;
} }
} else { } else {

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

@ -38,6 +38,7 @@ BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, {
type: "bi.vertical_adapt", type: "bi.vertical_adapt",
horizontalAlign: BI.HorizontalAlign.Stretch, horizontalAlign: BI.HorizontalAlign.Stretch,
verticalAlign: o.verticalAlign, verticalAlign: o.verticalAlign,
columnSize: ["fill"],
items: [item] items: [item]
}); });
} else { } else {

Loading…
Cancel
Save