fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit '57e6831ac7bbbfbc859d4d98032f10951ae50e46':
  icon_text_value_combo
es6
guy 7 years ago
parent
afdbb23f9e 57e6831ac7
commit
3f2c3ba37f
5 changed files with 19 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      dist/bundle.js
  2. 8
      dist/bundle.min.js
  3. 9
      dist/case.js
  4. 3
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  5. 6
      src/case/trigger/trigger.icon.text.select.js

9
dist/bundle.js vendored
Unescape View File

@ -67582,7 +67582,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",
@ -75838,8 +75839,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
element: this,
height: o.height
});
if (BI.isKey(o.text)) {
this.setValue(o.text);
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
@ -75862,7 +75863,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("");
}
},

8
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/case.js vendored
Unescape View File

@ -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)) {
this.setValue(o.text);
if (BI.isKey(o.value)) {
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("");
}
},

3
src/case/combo/icontextvaluecombo/combo.icontextvalue.js
Unescape View File

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

6
src/case/trigger/trigger.icon.text.select.js
Unescape View File

@ -19,8 +19,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
element: this,
height: o.height
});
if (BI.isKey(o.text)) {
this.setValue(o.text);
if (BI.isKey(o.value)) {
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("");
}
},

Write Preview
Loading…
Cancel
Save