Browse Source

Revert "无JIRA任务 label提供多行文本溢出显示...(仅webkit)"

This reverts commit d1a3b2418e.
es6
windy 4 years ago
parent
commit
5db2268d03
  1. 3
      changelog.md
  2. 8
      demo/js/base/demo.label.js
  3. 1
      src/base/single/label/label.js
  4. 15
      src/base/single/text.js

3
changelog.md

@ -1,7 +1,4 @@
# 更新日志 # 更新日志
2.0(2020-09)
- bi.label支持多行文本溢出显示...(仅支持webkit内核)
2.0(2020-08) 2.0(2020-08)
- bi.sign_editor支持显示值居左/居中/居右显示 - bi.sign_editor支持显示值居左/居中/居右显示
- bi.iframe新增EVENT_LOADED事件 - bi.iframe新增EVENT_LOADED事件

8
demo/js/base/demo.label.js

@ -104,14 +104,6 @@ Demo.Label = BI.inherit(BI.Widget, {
textWidth: 200, textWidth: 200,
textHeight: 30, textHeight: 30,
height: 60 height: 60
}, {
type: "bi.label",
cls: "layout-bg1",
text: "label设置了宽度, 并且设置了显示行数是2行, 无论输入多少文本,在允许换行的情况下只会显示2行,并在第二行结尾出现...",
textAlign: "left",
width: 300,
lineNumber: 2,
whiteSpace: "normal"
}, { }, {
type: "bi.left", type: "bi.left",
items: [{ items: [{

1
src/base/single/label/label.js

@ -17,7 +17,6 @@ BI.Label = BI.inherit(BI.AbstractLabel, {
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
lineHeight: o.textHeight, lineHeight: o.textHeight,
lineNumber: o.lineNumber,
text: o.text, text: o.text,
value: o.value, value: o.value,
py: o.py, py: o.py,

15
src/base/single/text.js

@ -20,8 +20,7 @@
bgap: 0, bgap: 0,
text: "", text: "",
py: "", py: "",
highLight: false, highLight: false
lineNumber: null,
}, },
render: function () { render: function () {
@ -55,20 +54,12 @@
if (BI.isWidthOrHeight(o.maxWidth)) { if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth}); this.element.css({maxWidth: o.maxWidth});
} }
var cssObj = { this.element.css({
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: this._getTextWrap(), whiteSpace: this._getTextWrap(),
textOverflow: o.whiteSpace === "nowrap" ? "ellipsis" : "", textOverflow: o.whiteSpace === "nowrap" ? "ellipsis" : "",
overflow: o.whiteSpace === "nowrap" ? "" : (BI.isWidthOrHeight(o.height) ? "auto" : ""), overflow: o.whiteSpace === "nowrap" ? "" : (BI.isWidthOrHeight(o.height) ? "auto" : "")
};
if (BI.isNumber(o.lineNumber)) {
BI.extend(cssObj, {
display: "-webkit-box",
"-webkit-line-clamp": o.lineNumber + "",
"-webkit-box-orient": "vertical",
}); });
}
this.element.css(cssObj);
if (o.handler && o.handler !== BI.emptyFn) { if (o.handler && o.handler !== BI.emptyFn) {
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.layout", type: "bi.layout",

Loading…
Cancel
Save