Merge pull request #242 in FUI/fineui from ~GUY/fineui:master to master

* commit 'cb7dcf6b547a47c8a575b56dac404501262b1afe':
  update
  trigger和editor.shelter

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"
                 }
             }
         ];

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

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
         });
     },
 

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

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

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

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

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/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
         });
     },
 

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

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