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

Merge pull request #800 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '5596b01bff568889fc3474f31a1ff346a60dce0d':
  BI-37380 single_select_combo可配text与multi_select_combo同步一下
es6
windy 6 years ago
parent
a13487ce49 5596b01bff
commit
3c66fe4871
18 changed files with 122 additions and 50 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. 4
      demo/js/case/list/demo.select_list.js
  2. 10
      dist/bundle.ie.js
  3. 18
      dist/bundle.ie.min.js
  4. 10
      dist/bundle.js
  5. 18
      dist/bundle.min.js
  6. 29
      dist/demo.js
  7. 10
      dist/fineui.ie.js
  8. 16
      dist/fineui.ie.min.js
  9. 10
      dist/fineui.js
  10. 16
      dist/fineui.min.js
  11. 10
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 10
      dist/widget.js
  14. 1
      src/widget/singleselect/singleselect.combo.js
  15. 1
      src/widget/singleselect/singleselect.insert.combo.js
  16. 1
      src/widget/singleselect/singleselect.trigger.js
  17. 3
      src/widget/singleselect/trigger/editor.singleselect.js
  18. 3
      src/widget/singleselect/trigger/searcher.singleselect.js

4
demo/js/case/list/demo.select_list.js
Unescape View File

@ -7,6 +7,10 @@ Demo.Func = BI.inherit(BI.Widget, {
var self = this;
BI.createWidget({
type: "bi.select_list",
toolbar: {
type: "bi.multi_select_bar",
iconWrapperWidth: 26
},
element: this,
el: {
el: {

10
dist/bundle.ie.js vendored
Unescape View File

@ -73194,6 +73194,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
props: {
baseCls: "bi-number-interval-single-editor",
tipType: "success",
title: ""
},
@ -75501,6 +75502,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -75770,6 +75772,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -76452,6 +76455,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
@ -76782,7 +76786,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@ -76861,7 +76866,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

18
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/bundle.js vendored
Unescape View File

@ -73598,6 +73598,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
props: {
baseCls: "bi-number-interval-single-editor",
tipType: "success",
title: ""
},
@ -75905,6 +75906,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -76174,6 +76176,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -76856,6 +76859,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
@ -77186,7 +77190,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@ -77265,7 +77270,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

18
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

29
dist/demo.js vendored
Unescape View File

@ -2073,6 +2073,10 @@ BI.shortcut("demo.lazy_loader", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
var self = this;
BI.createWidget({
type: "bi.select_list",
toolbar: {
type: "bi.multi_select_bar",
iconWrapperWidth: 26
},
element: this,
el: {
el: {
@ -6126,7 +6130,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
};
}
});
BI.shortcut("demo.htape", Demo.HtapeLayout);/**
BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

10
dist/fineui.ie.js vendored
Unescape View File

@ -73439,6 +73439,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
props: {
baseCls: "bi-number-interval-single-editor",
tipType: "success",
title: ""
},
@ -75746,6 +75747,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -76015,6 +76017,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -76697,6 +76700,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
@ -77027,7 +77031,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@ -77106,7 +77111,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

16
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/fineui.js vendored
Unescape View File

@ -73843,6 +73843,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
props: {
baseCls: "bi-number-interval-single-editor",
tipType: "success",
title: ""
},
@ -76150,6 +76151,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -76419,6 +76421,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -77101,6 +77104,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
@ -77431,7 +77435,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@ -77510,7 +77515,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

16
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -56657,6 +56657,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
props: {
baseCls: "bi-number-interval-single-editor",
tipType: "success",
title: ""
},
@ -58964,6 +58965,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -59233,6 +59235,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -59915,6 +59918,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
@ -60245,7 +60249,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@ -60324,7 +60329,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/widget.js vendored
Unescape View File

@ -14173,6 +14173,7 @@ BI.NumberInterval.EVENT_VALID = "EVENT_VALID";
BI.NumberInterval.EVENT_ERROR = "EVENT_ERROR";
BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
props: {
baseCls: "bi-number-interval-single-editor",
tipType: "success",
title: ""
},
@ -16480,6 +16481,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -16749,6 +16751,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});
@ -17431,6 +17434,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,
@ -17761,7 +17765,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {
@ -17840,7 +17845,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

1
src/widget/singleselect/singleselect.combo.js
Unescape View File

@ -43,6 +43,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});

1
src/widget/singleselect/singleselect.insert.combo.js
Unescape View File

@ -43,6 +43,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
callback.apply(self, arguments);
});
},
text: o.text,
value: this.storeValue
});

1
src/widget/singleselect/singleselect.trigger.js
Unescape View File

@ -36,6 +36,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
this.searcher = BI.createWidget(o.searcher, {
type: "bi.single_select_searcher",
text: o.text,
height: o.height,
itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter,

3
src/widget/singleselect/trigger/editor.singleselect.js
Unescape View File

@ -22,7 +22,8 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, {
height: o.height,
watermark: BI.i18nText("BI-Basic_Search"),
allowBlank: true,
value: o.value
value: o.value,
text: o.text
});
this.editor.on(BI.Controller.EVENT_CHANGE, function () {

3
src/widget/singleselect/trigger/searcher.singleselect.js
Unescape View File

@ -23,7 +23,8 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
var self = this, o = this.options;
this.editor = BI.createWidget(o.el, {
type: "bi.single_select_editor",
height: o.height
height: o.height,
text: o.text
});
this.searcher = BI.createWidget({

Write Preview
Loading…
Cancel
Save