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

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

* commit 'acc24f6e7ddddfdfdcb22917a0dc8b042a2ca902':
  combo支持value完成
es6
windy 7 years ago
parent
09a18a6a71 acc24f6e7d
commit
f713e2c4d1
12 changed files with 143 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      demo/js/case/combo/demo.editor_icon_check_combo.js
  2. 1
      demo/js/case/combo/demo.text_vlaue_check_combo.js
  3. 22
      dist/bundle.js
  4. 62
      dist/bundle.min.js
  5. 22
      dist/case.js
  6. 15
      dist/demo.js
  7. 22
      dist/fineui.js
  8. 48
      dist/fineui.min.js
  9. 6
      src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js
  10. 7
      src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
  11. 6
      src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js
  12. 3
      src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js

14
demo/js/case/combo/demo.editor_icon_check_combo.js
Unescape View File

@ -6,14 +6,18 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
baseCls: "" baseCls: ""
}, },
render: function () { render: function () {
var self = this;
return { return {
type: "bi.horizontal_auto", type: "bi.horizontal_auto",
items: [{ items: [{
type: "bi.editor_icon_check_combo", type: "bi.editor_icon_check_combo",
ref: function () {
self.combo = this;
},
watermark: "默认值", watermark: "默认值",
width: 200, width: 200,
height: 30, height: 30,
value: 2,
items: [{ items: [{
// text: "MVC-1", // text: "MVC-1",
value: "1" value: "1"
@ -24,6 +28,14 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
// text: "MVC-3", // text: "MVC-3",
value: "3" value: "3"
}] }]
}, {
type: "bi.button",
width: 90,
height: 25,
text: "setValue为空",
handler: function () {
self.combo.setValue()
}
}], }],
vgap: 20 vgap: 20
}; };

1
demo/js/case/combo/demo.text_vlaue_check_combo.js
Unescape View File

@ -12,6 +12,7 @@ Demo.TextValueCheckCombo = BI.inherit(BI.Widget, {
items: [{ items: [{
type: "bi.text_value_check_combo", type: "bi.text_value_check_combo",
text: "默认值", text: "默认值",
value: 1,
width: 300, width: 300,
items: [{ items: [{
text: "MVC-1", text: "MVC-1",

22
dist/bundle.js vendored
Unescape View File

@ -67447,7 +67447,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
quitChecker: o.quitChecker, quitChecker: o.quitChecker,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText errorText: o.errorText,
value: o.value
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -67456,7 +67457,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -67964,12 +67966,15 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -68039,12 +68044,14 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
type: "bi.small_select_text_trigger", type: "bi.small_select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -68097,7 +68104,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
chooseType: o.chooseType, chooseType: o.chooseType,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}] }],
value: o.value
}); });
this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) { this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) {

62
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

22
dist/case.js vendored
Unescape View File

@ -5157,7 +5157,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
quitChecker: o.quitChecker, quitChecker: o.quitChecker,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText errorText: o.errorText,
value: o.value
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -5166,7 +5167,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -5674,12 +5676,15 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -5749,12 +5754,14 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
type: "bi.small_select_text_trigger", type: "bi.small_select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -5807,7 +5814,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
chooseType: o.chooseType, chooseType: o.chooseType,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}] }],
value: o.value
}); });
this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) { this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) {

15
dist/demo.js vendored
Unescape View File

@ -1756,14 +1756,18 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
baseCls: "" baseCls: ""
}, },
render: function () { render: function () {
var self = this;
return { return {
type: "bi.horizontal_auto", type: "bi.horizontal_auto",
items: [{ items: [{
type: "bi.editor_icon_check_combo", type: "bi.editor_icon_check_combo",
ref: function () {
self.combo = this;
},
watermark: "默认值", watermark: "默认值",
width: 200, width: 200,
height: 30, height: 30,
value: 2,
items: [{ items: [{
// text: "MVC-1", // text: "MVC-1",
value: "1" value: "1"
@ -1774,6 +1778,14 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
// text: "MVC-3", // text: "MVC-3",
value: "3" value: "3"
}] }]
}, {
type: "bi.button",
width: 90,
height: 25,
text: "setValue为空",
handler: function () {
self.combo.setValue()
}
}], }],
vgap: 20 vgap: 20
}; };
@ -2008,6 +2020,7 @@ Demo.TextValueCheckCombo = BI.inherit(BI.Widget, {
items: [{ items: [{
type: "bi.text_value_check_combo", type: "bi.text_value_check_combo",
text: "默认值", text: "默认值",
value: 1,
width: 300, width: 300,
items: [{ items: [{
text: "MVC-1", text: "MVC-1",

22
dist/fineui.js vendored
Unescape View File

@ -69141,7 +69141,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
quitChecker: o.quitChecker, quitChecker: o.quitChecker,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText errorText: o.errorText,
value: o.value
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -69150,7 +69151,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -69658,12 +69660,15 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -69733,12 +69738,14 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
type: "bi.small_select_text_trigger", type: "bi.small_select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());
@ -69791,7 +69798,8 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
chooseType: o.chooseType, chooseType: o.chooseType,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}] }],
value: o.value
}); });
this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) { this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) {

48
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/case/combo/editoriconcheckcombo/combo.editoriconcheck.js
Unescape View File

@ -27,7 +27,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
quitChecker: o.quitChecker, quitChecker: o.quitChecker,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
watermark: o.watermark, watermark: o.watermark,
errorText: o.errorText errorText: o.errorText,
value: o.value
}); });
this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () { this.trigger.on(BI.EditorTrigger.EVENT_CHANGE, function () {
self.popup.setValue(this.getValue()); self.popup.setValue(this.getValue());
@ -36,7 +37,8 @@ BI.EditorIconCheckCombo = BI.inherit(BI.Widget, {
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());

7
src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
Unescape View File

@ -20,12 +20,15 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());

6
src/case/combo/textvaluecheckcombo/combo.textvaluechecksmall.js
Unescape View File

@ -20,12 +20,14 @@ BI.SmallTextValueCheckCombo = BI.inherit(BI.Widget, {
type: "bi.small_select_text_trigger", type: "bi.small_select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_check_combo_popup", type: "bi.text_value_check_combo_popup",
chooseType: o.chooseType, chooseType: o.chooseType,
items: o.items items: o.items,
value: o.value
}); });
this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () { this.popup.on(BI.TextValueCheckComboPopup.EVENT_CHANGE, function () {
self.setValue(self.popup.getValue()); self.setValue(self.popup.getValue());

3
src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js
Unescape View File

@ -15,7 +15,8 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
chooseType: o.chooseType, chooseType: o.chooseType,
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}] }],
value: o.value
}); });
this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) { this.popup.on(BI.Controller.EVENT_CHANGE, function (type, val, obj) {

Write Preview
Loading…
Cancel
Save