caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

es6
guy 7 years ago
parent
306fbea7a4 3f2c3ba37f
commit
a93ff13493
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

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

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