Browse Source

统一都采用maxWidth

es6
guy 3 years ago
parent
commit
4ff54e7bb9
  1. 6
      src/base/single/label/abstract.label.js

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

@ -211,7 +211,7 @@
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) {
json.width = o.textWidth; json.maxWidth = o.textWidth;
if (BI.isNumber(o.height) && o.height > 0) { // 2.1 if (BI.isNumber(o.height) && o.height > 0) { // 2.1
BI.createWidget({ BI.createWidget({
type: adaptLayout, type: adaptLayout,
@ -265,7 +265,7 @@
} }
return; return;
} }
json.width = o.width - 2 * o.hgap - o.lgap - o.rgap; json.maxWidth = o.width - 2 * o.hgap - o.lgap - o.rgap;
BI.createWidget({ // 2.4 BI.createWidget({ // 2.4
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,
@ -285,7 +285,7 @@
return; return;
} }
if (BI.isNumber(o.textWidth) && o.textWidth > 0) { if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
json.width = o.textWidth; json.maxWidth = o.textWidth;
BI.createWidget({ // 2.5 BI.createWidget({ // 2.5
type: adaptLayout, type: adaptLayout,
horizontalAlign: o.textAlign, horizontalAlign: o.textAlign,

Loading…
Cancel
Save