|
|
@ -29,9 +29,11 @@ BI.prepares.push(function () { |
|
|
|
}); |
|
|
|
}); |
|
|
|
BI.Plugin.configWidget("bi.inline", function (ob) { |
|
|
|
BI.Plugin.configWidget("bi.inline", function (ob) { |
|
|
|
// 当列宽既需要自动列宽又需要自适应列宽时,inline布局也处理不了了,降级table处理吧
|
|
|
|
// 当列宽既需要自动列宽又需要自适应列宽时,inline布局也处理不了了,降级table处理吧
|
|
|
|
var hasAutoAndFillColumnSize; |
|
|
|
var hasAutoAndFillColumnSize = false; |
|
|
|
if (ob.columnSize && ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) { |
|
|
|
if (ob.columnSize && ob.columnSize.length > 0) { |
|
|
|
hasAutoAndFillColumnSize = true; |
|
|
|
if (ob.columnSize && ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) { |
|
|
|
|
|
|
|
hasAutoAndFillColumnSize = true; |
|
|
|
|
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
var hasAuto = false, hasFill = false; |
|
|
|
var hasAuto = false, hasFill = false; |
|
|
|
BI.each(ob.items, function (i, item) { |
|
|
|
BI.each(ob.items, function (i, item) { |
|
|
@ -121,7 +123,7 @@ BI.prepares.push(function () { |
|
|
|
// 宽度不受限,要用table布局
|
|
|
|
// 宽度不受限,要用table布局
|
|
|
|
return BI.extend({ |
|
|
|
return BI.extend({ |
|
|
|
horizontalAlign: BI.HorizontalAlign.Stretch, |
|
|
|
horizontalAlign: BI.HorizontalAlign.Stretch, |
|
|
|
verticalAlign: BI.VerticalAlign.Stretch, |
|
|
|
verticalAlign: BI.VerticalAlign.Stretch |
|
|
|
}, ob, {type: "bi.table_adapt"}); |
|
|
|
}, ob, {type: "bi.table_adapt"}); |
|
|
|
} |
|
|
|
} |
|
|
|
return BI.extend({}, ob, {type: "bi.horizontal_float_fill"}); |
|
|
|
return BI.extend({}, ob, {type: "bi.horizontal_float_fill"}); |
|
|
|