Browse Source

float_center_adapt 用inline_center_adapt 替换

es6
Dailer 6 years ago
parent
commit
f3d8016e71
  1. 4
      src/core/platform/web/config.js
  2. 22
      src/core/wrapper/layout/adapt/inline.center.js

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

@ -3,7 +3,7 @@ BI.prepares.push(function () {
// 注册布局 // 注册布局
var _isSupprtFlex; var _isSupprtFlex;
var isSupportFlex = function () { var isSupportFlex = function () {
if(_isSupprtFlex == null) { if (_isSupprtFlex == null) {
_isSupprtFlex = !!(BI.isSupportCss3 && BI.isSupportCss3("flex")); _isSupprtFlex = !!(BI.isSupportCss3 && BI.isSupportCss3("flex"));
} }
return _isSupprtFlex; return _isSupprtFlex;
@ -45,6 +45,6 @@ BI.prepares.push(function () {
} }
return BI.extend(ob, {type: "bi.flex_center"}); return BI.extend(ob, {type: "bi.flex_center"});
} }
return ob; return BI.extend(ob, {type: "bi.inline_center_adapt"});
}); });
}); });

22
src/core/wrapper/layout/adapt/inline.center.js

@ -24,33 +24,21 @@ BI.InlineCenterAdaptLayout = BI.inherit(BI.Layout, {
render: function () { render: function () {
BI.InlineCenterAdaptLayout.superclass.render.apply(this, arguments); BI.InlineCenterAdaptLayout.superclass.render.apply(this, arguments);
this.element.css({ this.element.css({
whiteSpace: "nowrap" whiteSpace: "nowrap",
textAlign: "center"
}); });
this.populate(this.options.items); this.populate(this.options.items);
}, },
_addElement: function (i, item, length) { _addElement: function (i, item, length) {
var o = this.options; var o = this.options;
if (!this.hasWidget(this.getName() + i)) { var w = BI.InlineVerticalAdaptLayout.superclass._addElement.apply(this, arguments);
var t = BI.createWidget(item);
t.element.css({
position: "relative"
});
var w = BI.createWidget({
type: "bi.horizontal_auto",
items: [t]
});
this.addWidget(this.getName() + i, w);
} else {
var w = this.getWidgetByName(this.getName() + i);
}
w.element.css({ w.element.css({
position: "relative", position: "relative",
display: "inline-block", display: "inline-block",
"vertical-align": "middle", "vertical-align": "middle",
"*display": "inline", "*display": "inline",
"*zoom": 1, "*zoom": 1
"min-width": 100 / length + "%"
}); });
if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
w.element.css({ w.element.css({
@ -59,7 +47,7 @@ BI.InlineCenterAdaptLayout = BI.inherit(BI.Layout, {
} }
if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
w.element.css({ w.element.css({
"margin-left": (i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0) +"px" "margin-left": (i === 0 ? o.hgap : 0) + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
}); });
} }
if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) { if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {

Loading…
Cancel
Save