Browse Source

BI-41992 fix: nowrap的情况下才设置ellipsis

es6
qcc 6 years ago
parent
commit
a85b274bdf
  1. 6
      dist/2.0/fineui.ie.js
  2. 6
      dist/2.0/fineui.js
  3. 6
      dist/base.js
  4. 6
      dist/bundle.ie.js
  5. 6
      dist/bundle.js
  6. 6
      dist/fineui.ie.js
  7. 6
      dist/fineui.js
  8. 6
      dist/fineui_without_jquery_polyfill.js
  9. 3
      src/base/single/html/html.js
  10. 3
      src/base/single/text.js
  11. 2
      src/less/base/single/label.less
  12. 2
      src/less/base/single/text.less

6
dist/2.0/fineui.ie.js vendored

@ -36019,7 +36019,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -44563,7 +44564,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/2.0/fineui.js vendored

@ -36423,7 +36423,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -44967,7 +44968,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/base.js vendored

@ -581,7 +581,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -9125,7 +9126,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/bundle.ie.js vendored

@ -36019,7 +36019,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -44563,7 +44564,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/bundle.js vendored

@ -36423,7 +36423,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -44967,7 +44968,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/fineui.ie.js vendored

@ -36264,7 +36264,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -44808,7 +44809,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/fineui.js vendored

@ -36668,7 +36668,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -45212,7 +45213,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

6
dist/fineui_without_jquery_polyfill.js vendored

@ -25112,7 +25112,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({
@ -32743,7 +32744,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

3
src/base/single/html/html.js

@ -52,7 +52,8 @@ BI.Html = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

3
src/base/single/text.js

@ -54,7 +54,8 @@ BI.Text = BI.inherit(BI.Single, {
} }
this.element.css({ this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace whiteSpace: o.whiteSpace,
textOverflow: o.whiteSpace === 'nowrap' ? "ellipsis" : "",
}); });
if (o.handler) { if (o.handler) {
this.text = BI.createWidget({ this.text = BI.createWidget({

2
src/less/base/single/label.less

@ -1,6 +1,6 @@
@import "../../index"; @import "../../index";
.bi-label { .bi-label {
.overflow-dot(); .overflow-hidden();
word-break: break-all; word-break: break-all;
} }

2
src/less/base/single/text.less

@ -1,7 +1,7 @@
@import "../../index"; @import "../../index";
.bi-text { .bi-text {
.overflow-dot(); .overflow-hidden();
.box-sizing(border-box); .box-sizing(border-box);
// BI-9141 加的,但是去掉后在firefox下没有问题,先去掉以适配ie9 // BI-9141 加的,但是去掉后在firefox下没有问题,先去掉以适配ie9
word-break: break-word; word-break: break-word;

Loading…
Cancel
Save