Browse Source

Merging in latest from upstream (FUI/fineui:refs/heads/master)

* commit '3ed00419053a9e21f347e8c1e258c3889cf666ce':
  update 拼音lib
  update
  update
  update
  add
es6
guy 7 years ago
parent
commit
33f731290b
  1. 34
      bi/case.js
  2. 108
      bi/core.js
  3. 142
      dist/bundle.js
  4. 34
      dist/bundle.min.js
  5. 34
      dist/case.js
  6. 108
      dist/core.js
  7. 10
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  8. 11
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  9. 10
      src/case/combo/textvaluecombo/combo.textvalue.js
  10. 3
      src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js
  11. 108
      src/core/utils/chinesePY.js

34
bi/case.js

@ -5462,9 +5462,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo",
height: 30,
text: "",
value: "",
el: {}
})
});
},
_init: function () {
@ -5473,8 +5473,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
@ -5498,6 +5497,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setValue: function (v) {
@ -5650,8 +5652,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
width: 100,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})
value: ""
});
},
_init: function () {
@ -5660,8 +5662,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup",
@ -5686,6 +5687,10 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setTitle: function (title) {
@ -5844,9 +5849,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
baseClass: "bi-text-value-combo",
height: 30,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: "",
el: {}
})
});
},
_init: function () {
@ -5855,8 +5860,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.text_value_combo_popup",
@ -5881,6 +5885,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setValue: function (v) {
@ -6027,8 +6034,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-down-list-combo",
height: 30,
text: ""
height: 30
})
},

108
bi/core.js

File diff suppressed because one or more lines are too long

142
dist/bundle.js vendored

File diff suppressed because one or more lines are too long

34
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

34
dist/case.js vendored

@ -5462,9 +5462,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo",
height: 30,
text: "",
value: "",
el: {}
})
});
},
_init: function () {
@ -5473,8 +5473,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
@ -5498,6 +5497,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setValue: function (v) {
@ -5650,8 +5652,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
width: 100,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})
value: ""
});
},
_init: function () {
@ -5660,8 +5662,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup",
@ -5686,6 +5687,10 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setTitle: function (title) {
@ -5844,9 +5849,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
baseClass: "bi-text-value-combo",
height: 30,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: "",
el: {}
})
});
},
_init: function () {
@ -5855,8 +5860,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.text_value_combo_popup",
@ -5881,6 +5885,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setValue: function (v) {
@ -6027,8 +6034,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-down-list-combo",
height: 30,
text: ""
height: 30
})
},

108
dist/core.js vendored

File diff suppressed because one or more lines are too long

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

@ -7,9 +7,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
baseClass: "bi-icon-text-value-combo",
height: 30,
text: "",
value: "",
el: {}
})
});
},
_init: function () {
@ -18,8 +18,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup",
@ -43,6 +42,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setValue: function (v) {

11
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js

@ -10,8 +10,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
width: 100,
height: 24,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: ""
})
value: ""
});
},
_init: function () {
@ -20,8 +20,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({
type: "bi.select_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup",
@ -46,6 +45,10 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setTitle: function (title) {

10
src/case/combo/textvaluecombo/combo.textvalue.js

@ -10,9 +10,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
baseClass: "bi-text-value-combo",
height: 30,
chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
text: "",
value: "",
el: {}
})
});
},
_init: function () {
@ -21,8 +21,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, {
type: "bi.select_text_trigger",
items: o.items,
height: o.height,
text: o.text
height: o.height
});
this.popup = BI.createWidget({
type: "bi.text_value_combo_popup",
@ -47,6 +46,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300
}
});
if (BI.isKey(o.value)) {
this.setValue(o.value);
}
},
setValue: function (v) {

3
src/case/combo/textvaluedownlistcombo/combo.textvaluedownlist.js

@ -6,8 +6,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-value-down-list-combo",
height: 30,
text: ""
height: 30
})
},

108
src/core/utils/chinesePY.js

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save