Merge pull request #325 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '63b0e0fecd579c4b7d1e4835f3ecad9aa8d7c4c0':
  trigger和editor.shelter

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) {

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) {

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) {

docs/_book/detailed/bi.button/node.html

@@ -2889,7 +2889,7 @@ BI.createWidget({
         height: <span class="hljs-number">30</span>,
         text: <span class="hljs-string">&quot;&#x4E09;&#x89D2;&#x5F62;&#x7684;&#x8282;&#x70B9;&quot;</span>
     }, {
-        type: <span class="hljs-string">&quot;bi.triangle_group_node&quot;</span>,
+        type: <span class="hljs-string">&quot;bi.arrow_group_node&quot;</span>,
         text: <span class="hljs-string">&quot;&#x4E09;&#x89D2;&#x5F62;&#x7684;&#x8282;&#x70B9;&quot;</span>
     }, {
         type: <span class="hljs-string">&quot;bi.label&quot;</span>,

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",

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",

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 () {

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) {