Browse Source

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

* commit 'c55be36fc49651811a7c4403917d6b5871d239ca':
  combo设置状态value后的问题
es6
windy 7 years ago
parent
commit
76909b7871
  1. 3
      demo/js/case/combo/demo.icon_text_value_combo.js
  2. 3
      dist/bundle.js
  3. 3
      dist/case.js
  4. 3
      dist/demo.js
  5. 3
      dist/fineui.js
  6. 1
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  7. 2
      src/case/trigger/trigger.icon.text.select.js

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

3
dist/bundle.js vendored

@ -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: ""
};
}

3
dist/case.js vendored

@ -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: ""
};
}

3
dist/demo.js vendored

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

3
dist/fineui.js vendored

@ -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: ""
};
}

1
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({

2
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: ""
};
}

Loading…
Cancel
Save