From c55be36fc49651811a7c4403917d6b5871d239ca Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 16 Jan 2018 14:03:23 +0800 Subject: [PATCH] =?UTF-8?q?combo=E8=AE=BE=E7=BD=AE=E7=8A=B6=E6=80=81value?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/case/combo/demo.icon_text_value_combo.js | 3 ++- dist/bundle.js | 3 ++- dist/case.js | 3 ++- dist/demo.js | 3 ++- dist/fineui.js | 3 ++- src/case/combo/icontextvaluecombo/combo.icontextvalue.js | 1 + src/case/trigger/trigger.icon.text.select.js | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/demo/js/case/combo/demo.icon_text_value_combo.js b/demo/js/case/combo/demo.icon_text_value_combo.js index ed8455e7a..594beaff8 100644 --- a/demo/js/case/combo/demo.icon_text_value_combo.js +++ b/demo/js/case/combo/demo.icon_text_value_combo.js @@ -11,7 +11,8 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.icon_text_value_combo", - value: "默认值", + text: "默认值", + value: 1, width: 300, items: [{ text: "MVC-1", diff --git a/dist/bundle.js b/dist/bundle.js index d6f801394..c543c9241 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -67603,6 +67603,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { type: "bi.select_icon_text_trigger", items: o.items, height: o.height, + text: o.text, value: o.value }); this.popup = BI.createWidget({ @@ -75956,7 +75957,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, { }; } else { return { - text: o.value, + text: o.text, iconClass: "" }; } diff --git a/dist/case.js b/dist/case.js index e41b8ac32..3a0a835c0 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5458,6 +5458,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { type: "bi.select_icon_text_trigger", items: o.items, height: o.height, + text: o.text, value: o.value }); this.popup = BI.createWidget({ @@ -13811,7 +13812,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, { }; } else { return { - text: o.value, + text: o.text, iconClass: "" }; } diff --git a/dist/demo.js b/dist/demo.js index 3f7fd511e..e67631a2e 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -1832,7 +1832,8 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.icon_text_value_combo", - value: "默认值", + text: "默认值", + value: 1, width: 300, items: [{ text: "MVC-1", diff --git a/dist/fineui.js b/dist/fineui.js index 934f64cce..faf1143c1 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -69297,6 +69297,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { type: "bi.select_icon_text_trigger", items: o.items, height: o.height, + text: o.text, value: o.value }); this.popup = BI.createWidget({ @@ -77650,7 +77651,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, { }; } else { return { - text: o.value, + text: o.text, iconClass: "" }; } diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index 259ab4886..ecf4be7ca 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js @@ -19,6 +19,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { type: "bi.select_icon_text_trigger", items: o.items, height: o.height, + text: o.text, value: o.value }); this.popup = BI.createWidget({ diff --git a/src/case/trigger/trigger.icon.text.select.js b/src/case/trigger/trigger.icon.text.select.js index d957d90fd..3b3c7fb1e 100644 --- a/src/case/trigger/trigger.icon.text.select.js +++ b/src/case/trigger/trigger.icon.text.select.js @@ -46,7 +46,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, { }; } else { return { - text: o.value, + text: o.text, iconClass: "" }; }