diff --git a/demo/js/base/button/demo.text_button.js b/demo/js/base/button/demo.text_button.js index bca5414ee..a98414a8c 100644 --- a/demo/js/base/button/demo.text_button.js +++ b/demo/js/base/button/demo.text_button.js @@ -8,7 +8,8 @@ Demo.Button = BI.inherit(BI.Widget, { el: { type: "bi.text_button", text: "文字按钮", - height: 30 + height: 30, + keyword: "w" } } ]; diff --git a/demo/js/case/editor/demo.shelter_editor.js b/demo/js/case/editor/demo.shelter_editor.js index a9c95ae61..2d351df62 100644 --- a/demo/js/case/editor/demo.shelter_editor.js +++ b/demo/js/case/editor/demo.shelter_editor.js @@ -13,7 +13,8 @@ Demo.ClearEditor = BI.inherit(BI.Widget, { return v != "a"; }, watermark: "可以设置标记的输入框", - text: "这是一个遮罩" + value: "这是一个遮罩", + keyword: "z" }); BI.createWidget({ type: "bi.vertical", diff --git a/dist/base.js b/dist/base.js index 0ddb4b702..dcf7260ad 100644 --- a/dist/base.js +++ b/dist/base.js @@ -16688,7 +16688,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, { rgap: o.rgap, text: o.text, value: o.value, - py: o.py + py: o.py, + keyword: o.keyword }); }, diff --git a/dist/bundle.js b/dist/bundle.js index 8c04ac3e0..a819600ee 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -42734,7 +42734,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, { rgap: o.rgap, text: o.text, value: o.value, - py: o.py + py: o.py, + keyword: o.keyword }); }, @@ -68910,6 +68911,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, { }); this._showHint(); self._checkText(); + this.text.doRedMark(o.keyword); }, _checkText: function () { @@ -76359,6 +76361,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { type: "bi.text_trigger", element: this, height: o.height, + readonly: o.readonly, text: this._digest(o.value, o.items) }); }, @@ -76382,9 +76385,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - if (!this.isReadOnly()) { - this.trigger.setText(this._digest(vals, this.options.items)); - } + this.trigger.setText(this._digest(vals, this.options.items)); }, populate: function (items) { diff --git a/dist/case.js b/dist/case.js index 4adc82270..f94a7684c 100644 --- a/dist/case.js +++ b/dist/case.js @@ -6396,6 +6396,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, { }); this._showHint(); self._checkText(); + this.text.doRedMark(o.keyword); }, _checkText: function () { @@ -13845,6 +13846,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { type: "bi.text_trigger", element: this, height: o.height, + readonly: o.readonly, text: this._digest(o.value, o.items) }); }, @@ -13868,9 +13870,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - if (!this.isReadOnly()) { - this.trigger.setText(this._digest(vals, this.options.items)); - } + this.trigger.setText(this._digest(vals, this.options.items)); }, populate: function (items) { diff --git a/dist/demo.js b/dist/demo.js index c997d56bb..7eb405e22 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -272,7 +272,8 @@ BI.shortcut("demo.image_button", Demo.Button);Demo.Button = BI.inherit(BI.Widget el: { type: "bi.text_button", text: "文字按钮", - height: 30 + height: 30, + keyword: "w" } } ]; @@ -2248,7 +2249,8 @@ Demo.ClearEditor = BI.inherit(BI.Widget, { return v != "a"; }, watermark: "可以设置标记的输入框", - text: "这是一个遮罩" + value: "这是一个遮罩", + keyword: "z" }); BI.createWidget({ type: "bi.vertical", diff --git a/dist/fineui.js b/dist/fineui.js index 753d5234e..3569c2b57 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -44498,7 +44498,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, { rgap: o.rgap, text: o.text, value: o.value, - py: o.py + py: o.py, + keyword: o.keyword }); }, @@ -70674,6 +70675,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, { }); this._showHint(); self._checkText(); + this.text.doRedMark(o.keyword); }, _checkText: function () { @@ -78123,6 +78125,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { type: "bi.text_trigger", element: this, height: o.height, + readonly: o.readonly, text: this._digest(o.value, o.items) }); }, @@ -78146,9 +78149,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - if (!this.isReadOnly()) { - this.trigger.setText(this._digest(vals, this.options.items)); - } + this.trigger.setText(this._digest(vals, this.options.items)); }, populate: function (items) { diff --git a/docs/_book/detailed/bi.button/node.html b/docs/_book/detailed/bi.button/node.html index a074a45cf..69769de1f 100644 --- a/docs/_book/detailed/bi.button/node.html +++ b/docs/_book/detailed/bi.button/node.html @@ -2889,7 +2889,7 @@ BI.createWidget({ height: 30, text: "三角形的节点" }, { - type: "bi.triangle_group_node", + type: "bi.arrow_group_node", text: "三角形的节点" }, { type: "bi.label", diff --git a/docs/_book/detailed/bi.button/node.md b/docs/_book/detailed/bi.button/node.md index 1445723ba..65716cccf 100644 --- a/docs/_book/detailed/bi.button/node.md +++ b/docs/_book/detailed/bi.button/node.md @@ -21,7 +21,7 @@ BI.createWidget({ height: 30, text: "三角形的节点" }, { - type: "bi.triangle_group_node", + type: "bi.arrow_group_node", text: "三角形的节点" }, { type: "bi.label", diff --git a/docs/detailed/bi.button/node.md b/docs/detailed/bi.button/node.md index 1445723ba..65716cccf 100644 --- a/docs/detailed/bi.button/node.md +++ b/docs/detailed/bi.button/node.md @@ -21,7 +21,7 @@ BI.createWidget({ height: 30, text: "三角形的节点" }, { - type: "bi.triangle_group_node", + type: "bi.arrow_group_node", text: "三角形的节点" }, { type: "bi.label", diff --git a/src/base/single/button/buttons/button.text.js b/src/base/single/button/buttons/button.text.js index 2f8476fad..505ceffa8 100644 --- a/src/base/single/button/buttons/button.text.js +++ b/src/base/single/button/buttons/button.text.js @@ -41,7 +41,8 @@ BI.TextButton = BI.inherit(BI.BasicButton, { rgap: o.rgap, text: o.text, value: o.value, - py: o.py + py: o.py, + keyword: o.keyword }); }, diff --git a/src/case/editor/editor.shelter.js b/src/case/editor/editor.shelter.js index 74e9008ba..3e7d42e45 100644 --- a/src/case/editor/editor.shelter.js +++ b/src/case/editor/editor.shelter.js @@ -132,6 +132,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, { }); this._showHint(); self._checkText(); + this.text.doRedMark(o.keyword); }, _checkText: function () { diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index d1ffd0712..a83f51003 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -22,6 +22,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { type: "bi.text_trigger", element: this, height: o.height, + readonly: o.readonly, text: this._digest(o.value, o.items) }); }, @@ -45,9 +46,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - if (!this.isReadOnly()) { - this.trigger.setText(this._digest(vals, this.options.items)); - } + this.trigger.setText(this._digest(vals, this.options.items)); }, populate: function (items) {