Browse Source

Pull request #1598: 无JIRA任务 "bi.textarea_editor"添加setWatermark方法

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

* commit 'b5e4d296fab667f281f7db385e1d0a18202e569d':
  无JIRA任务 "bi.textarea_editor"添加setWatermark方法
es6
parent
commit
d2ea320d55
  1. 1
      changelog.md
  2. 11
      src/base/single/editor/editor.textarea.js

1
changelog.md

@ -1,5 +1,6 @@
# 更新日志 # 更新日志
2.0(2020-11) 2.0(2020-11)
- bi.textarea_editor添加setWatermark方法
- 生命周期可以通过属性传递来操作 - 生命周期可以通过属性传递来操作
- 修复了颜色选择器hex框不能输入为空的问题 - 修复了颜色选择器hex框不能输入为空的问题
- 增加纯文本组件bi.pure_text - 增加纯文本组件bi.pure_text

11
src/base/single/editor/editor.textarea.js

@ -16,7 +16,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
}); });
}, },
render: function() { render: function () {
var o = this.options, self = this; var o = this.options, self = this;
this.content = BI.createWidget({ this.content = BI.createWidget({
type: "bi.layout", type: "bi.layout",
@ -25,7 +25,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
height: "100%", height: "100%",
cls: "bi-textarea textarea-editor-content display-block" cls: "bi-textarea textarea-editor-content display-block"
}); });
this.content.element.css({resize: "none"}); this.content.element.css({ resize: "none" });
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
@ -175,6 +175,11 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
return this.style; return this.style;
}, },
setWatermark: function (v) {
this.options.watermark = v;
this._checkWaterMark();
},
_setValid: function (b) { _setValid: function (b) {
BI.TextAreaEditor.superclass._setValid.apply(this, arguments); BI.TextAreaEditor.superclass._setValid.apply(this, arguments);
// this.content.setValid(b); // this.content.setValid(b);
@ -189,4 +194,4 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE"; BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.TextAreaEditor.EVENT_BLUR = "EVENT_BLUR"; BI.TextAreaEditor.EVENT_BLUR = "EVENT_BLUR";
BI.TextAreaEditor.EVENT_FOCUS = "EVENT_FOCUS"; BI.TextAreaEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.shortcut("bi.textarea_editor", BI.TextAreaEditor); BI.shortcut("bi.textarea_editor", BI.TextAreaEditor);

Loading…
Cancel
Save