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

* commit '85220f5003fe10f0d9cca0787eabdc788d6b106c':
  udpate

demo/js/case/combo/demo.text_value_combo.js

@@ -11,7 +11,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
             type: "bi.horizontal_auto",
             items: [{
                 type: "bi.icon_text_value_combo",
-                text: "默认值",
+                value: "默认值",
                 width: 300,
                 items: [{
                     text: "MVC-1",

dist/bundle.js

@@ -67997,7 +67997,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            text: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.text_value_combo_popup",

dist/case.js

@@ -5851,7 +5851,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            text: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.text_value_combo_popup",

dist/demo.js

@@ -1886,7 +1886,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
             type: "bi.horizontal_auto",
             items: [{
                 type: "bi.icon_text_value_combo",
-                text: "默认值",
+                value: "默认值",
                 width: 300,
                 items: [{
                     text: "MVC-1",

dist/fineui.js

@@ -69691,7 +69691,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            text: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.text_value_combo_popup",

src/case/combo/textvaluecombo/combo.textvalue.js

@@ -21,7 +21,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            text: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.text_value_combo_popup",