Browse Source

Pull request #1444: 无JIRA任务 文本支持点击

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

* commit '2a0f53e8ffbd042bcabfe8d79968ad38db9bc8f8':
  文本支持点击
es6
guy 4 years ago
parent
commit
43d0621be6
  1. 8
      src/base/single/label/abstract.label.js
  2. 2
      src/base/single/text.js

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

@ -18,7 +18,8 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
tgap: 0, tgap: 0,
bgap: 0, bgap: 0,
text: "", text: "",
highLight: false highLight: false,
handler: null
}); });
}, },
@ -33,7 +34,8 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
value: o.value, value: o.value,
py: o.py, py: o.py,
keyword: o.keyword, keyword: o.keyword,
highLight: o.highLight highLight: o.highLight,
handler: o.handler
}; };
}, },
@ -368,4 +370,4 @@ BI.AbstractLabel = BI.inherit(BI.Single, {
populate: function () { populate: function () {
BI.AbstractLabel.superclass.populate.apply(this, arguments); BI.AbstractLabel.superclass.populate.apply(this, arguments);
} }
}); });

2
src/base/single/text.js

@ -59,7 +59,7 @@ BI.Text = BI.inherit(BI.Single, {
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 (o.handler) { if (o.handler && o.handler !== BI.emptyFn) {
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.layout", type: "bi.layout",
tagName: "span" tagName: "span"

Loading…
Cancel
Save