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] =?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) {