Browse Source

Pull request #1956: 无JIRA任务 bugfix

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

* commit '7e3613b1ba7f24e7ef7c87be654fcb5b955b2405':
  bugfix
es6
guy 3 years ago
parent
commit
e9383a4643
  1. 32
      src/core/wrapper/layout/flex/flex.leftrightvertical.center.js

32
src/core/wrapper/layout/flex/flex.leftrightvertical.center.js

@ -54,28 +54,18 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
return json; return json;
}); });
rightItems = BI.map(rightItems, function (i, item) {
var json = {
el: BI.stripEL(item)
};
if (o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
json.tgap = o.rvgap + o.rtgap + (item.tgap || 0) + (item.vgap || 0);
}
if (o.rhgap + o.rlgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
json.lgap = o.rlgap + (item.lgap || 0) + (item.hgap || 0);
}
if (o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
json.rgap = o.rhgap + o.rrgap + (item.rgap || 0) + (item.hgap || 0);
}
if (o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
json.bgap = o.rvgap + o.rbgap + (item.bgap || 0) + (item.vgap || 0);
}
return json;
});
return leftItems.concat({ return leftItems.concat({
type: "bi.flex_vertical_adapt", el: {
cls: "flex-left-auto", type: "bi.flex_vertical_adapt",
items: rightItems cls: "flex-left-auto",
hgap: o.rhgap,
vgap: o.rvgap,
lgap: o.rlgap,
rgap: o.rrgap,
tgap: o.rtgap,
bgap: o.rbgap,
items: rightItems
}
}); });
}, },

Loading…
Cancel
Save