From 63b0e0fecd579c4b7d1e4835f3ecad9aa8d7c4c0 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 25 Jan 2018 17:24:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?trigger=E5=92=8Ceditor.shelter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
dist/bundle.js | 10 +++++-----
dist/case.js | 10 +++++-----
dist/fineui.js | 10 +++++-----
docs/_book/detailed/bi.button/node.html | 2 +-
docs/_book/detailed/bi.button/node.md | 2 +-
docs/detailed/bi.button/node.md | 2 +-
src/case/editor/editor.shelter.js | 5 +++--
src/case/trigger/trigger.text.select.js | 5 ++---
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/dist/bundle.js b/dist/bundle.js
index 3fed451c3..ec7ec3f9e 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -68831,7 +68831,8 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4
+ hgap: 4,
+ keyword: o.keyword
});
BI.createWidget({
type: "bi.absolute",
@@ -69001,7 +69002,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();
+ this._checkText();node
},
getValue: function () {
@@ -76360,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)
});
},
@@ -76383,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..25d0d339c 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -6316,7 +6316,8 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4
+ hgap: 4,
+ keyword: o.keyword
});
BI.createWidget({
type: "bi.absolute",
@@ -6486,7 +6487,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();
+ this._checkText();node
},
getValue: 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/fineui.js b/dist/fineui.js
index c8f4bc6ec..00644c2d0 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -70595,7 +70595,8 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4
+ hgap: 4,
+ keyword: o.keyword
});
BI.createWidget({
type: "bi.absolute",
@@ -70765,7 +70766,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();
+ this._checkText();node
},
getValue: function () {
@@ -78124,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)
});
},
@@ -78147,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/case/editor/editor.shelter.js b/src/case/editor/editor.shelter.js
index 74e9008ba..128c6746a 100644
--- a/src/case/editor/editor.shelter.js
+++ b/src/case/editor/editor.shelter.js
@@ -52,7 +52,8 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4
+ hgap: 4,
+ keyword: o.keyword
});
BI.createWidget({
type: "bi.absolute",
@@ -222,7 +223,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();
+ this._checkText();node
},
getValue: 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) {
From 3e26deafde9638d68b7c9b749a8ce01c93faa04d Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Thu, 25 Jan 2018 19:11:55 +0800
Subject: [PATCH 2/2] update
---
demo/js/base/button/demo.text_button.js | 3 ++-
demo/js/case/editor/demo.shelter_editor.js | 3 ++-
dist/base.js | 3 ++-
dist/bundle.js | 9 +++++----
dist/case.js | 6 +++---
dist/demo.js | 6 ++++--
dist/fineui.js | 9 +++++----
src/base/single/button/buttons/button.text.js | 3 ++-
src/case/editor/editor.shelter.js | 6 +++---
9 files changed, 28 insertions(+), 20 deletions(-)
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 ec7ec3f9e..16bde66ae 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -42735,7 +42735,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
});
},
@@ -68831,8 +68832,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4,
- keyword: o.keyword
+ hgap: 4
});
BI.createWidget({
type: "bi.absolute",
@@ -68912,6 +68912,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
});
this._showHint();
self._checkText();
+ this.text.doRedMark(o.keyword);
},
_checkText: function () {
@@ -69002,7 +69003,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();node
+ this._checkText();
},
getValue: function () {
diff --git a/dist/case.js b/dist/case.js
index 25d0d339c..f94a7684c 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -6316,8 +6316,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4,
- keyword: o.keyword
+ hgap: 4
});
BI.createWidget({
type: "bi.absolute",
@@ -6397,6 +6396,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
});
this._showHint();
self._checkText();
+ this.text.doRedMark(o.keyword);
},
_checkText: function () {
@@ -6487,7 +6487,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();node
+ this._checkText();
},
getValue: function () {
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 00644c2d0..9902658f4 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -44499,7 +44499,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
});
},
@@ -70595,8 +70596,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4,
- keyword: o.keyword
+ hgap: 4
});
BI.createWidget({
type: "bi.absolute",
@@ -70676,6 +70676,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
});
this._showHint();
self._checkText();
+ this.text.doRedMark(o.keyword);
},
_checkText: function () {
@@ -70766,7 +70767,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();node
+ this._checkText();
},
getValue: function () {
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 128c6746a..3e7d42e45 100644
--- a/src/case/editor/editor.shelter.js
+++ b/src/case/editor/editor.shelter.js
@@ -52,8 +52,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
- hgap: 4,
- keyword: o.keyword
+ hgap: 4
});
BI.createWidget({
type: "bi.absolute",
@@ -133,6 +132,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
});
this._showHint();
self._checkText();
+ this.text.doRedMark(o.keyword);
},
_checkText: function () {
@@ -223,7 +223,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
setValue: function (k) {
this.editor.setValue(k);
- this._checkText();node
+ this._checkText();
},
getValue: function () {