Merge remote-tracking branch 'origin/master'

dist/bundle.js

@@ -67563,7 +67563,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_icon_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            value: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.icon_text_value_combo_popup",
@@ -75819,8 +75820,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
             element: this,
             height: o.height
         });
-        if (BI.isKey(o.text)) {
+        if (BI.isKey(o.value)) {
-            this.setValue(o.text);
+            this.setValue(o.value);
         }
     },
 
@@ -75843,7 +75844,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
             this.trigger.setText(result.text);
             this.trigger.setIcon(result.iconClass);
         } else {
-            this.trigger.setText(o.text);
+            this.trigger.setText(o.value);
             this.trigger.setIcon("");
         }
     },

dist/case.js

@@ -5473,7 +5473,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_icon_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            value: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.icon_text_value_combo_popup",
@@ -13729,8 +13730,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
             element: this,
             height: o.height
         });
-        if (BI.isKey(o.text)) {
+        if (BI.isKey(o.value)) {
-            this.setValue(o.text);
+            this.setValue(o.value);
         }
     },
 
@@ -13753,7 +13754,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
             this.trigger.setText(result.text);
             this.trigger.setIcon(result.iconClass);
         } else {
-            this.trigger.setText(o.text);
+            this.trigger.setText(o.value);
             this.trigger.setIcon("");
         }
     },

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -18,7 +18,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget(o.el, {
             type: "bi.select_icon_text_trigger",
             items: o.items,
-            height: o.height
+            height: o.height,
+            value: o.value
         });
         this.popup = BI.createWidget({
             type: "bi.icon_text_value_combo_popup",

src/case/trigger/trigger.icon.text.select.js

@@ -19,8 +19,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
             element: this,
             height: o.height
         });
-        if (BI.isKey(o.text)) {
+        if (BI.isKey(o.value)) {
-            this.setValue(o.text);
+            this.setValue(o.value);
         }
     },
 
@@ -43,7 +43,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
             this.trigger.setText(result.text);
             this.trigger.setIcon(result.iconClass);
         } else {
-            this.trigger.setText(o.text);
+            this.trigger.setText(o.value);
             this.trigger.setIcon("");
         }
     },