Browse Source

Pull request #1456: 无JIRA任务 整理一下

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

* commit 'b018703a1c1a65b77648ae8c7e3a1fa7eef42208':
  bugfix
es6
guy 4 years ago
parent
commit
4667c6f071
  1. 3
      src/base/single/label/abstract.label.js
  2. 4
      src/core/wrapper/layout/adapt/inline.vertical.js

3
src/base/single/label/abstract.label.js

@ -211,9 +211,6 @@
_createNotCenterEl: function () { _createNotCenterEl: function () {
var o = this.options; var o = this.options;
var adaptLayout = "bi.vertical_adapt"; var adaptLayout = "bi.vertical_adapt";
if (o.textAlign === "right" && (BI.isIE() || !isSupportFlex())) {
adaptLayout = "bi.right_vertical_adapt";
}
var json = this._createJson(); var json = this._createJson();
if (BI.isNumber(o.width) && o.width > 0) { if (BI.isNumber(o.width) && o.width > 0) {
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {

4
src/core/wrapper/layout/adapt/inline.vertical.js

@ -18,7 +18,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
rgap: 0, rgap: 0,
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
textAlign: "left" horizontalAlign: "left"
}); });
}, },
@ -27,7 +27,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
var o = this.options; var o = this.options;
this.element.css({ this.element.css({
whiteSpace: "nowrap", whiteSpace: "nowrap",
textAlign: o.textAlign textAlign: o.horizontalAlign
}); });
this.populate(this.options.items); this.populate(this.options.items);
}, },

Loading…
Cancel
Save