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

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

* commit '18a9d429a5f009d71788cbc0ce866bee1ed154b4':
  update
  BI-24766
es6
windy 6 years ago
parent
8fb08833bc 18a9d429a5
commit
c17073c555
20 changed files with 178 additions and 62 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. 28
      dist/_fineui.min.js
  2. 37
      dist/bundle.js
  3. 36
      dist/bundle.min.js
  4. 7
      dist/case.js
  5. 37
      dist/fineui.js
  6. 28
      dist/fineui.min.js
  7. 30
      dist/widget.js
  8. 1
      src/case/combo/iconcombo/popup.iconcombo.js
  9. 1
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js
  10. 2
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  11. 1
      src/case/combo/searchtextvaluecombo/popup.searchtextvalue.js
  12. 1
      src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js
  13. 1
      src/case/combo/textvaluecombo/popup.textvalue.js
  14. 1
      src/widget/multilayerselecttree/multilayerselecttree.popup.js
  15. 1
      src/widget/multilayersingletree/multilayersingletree.popup.js
  16. 7
      src/widget/multiselect/multiselect.loader.js
  17. 9
      src/widget/multiselect/multiselect.loader.nobar.js
  18. 1
      src/widget/selecttree/selecttree.popup.js
  19. 10
      src/widget/singleselect/singleselect.loader.js
  20. 1
      src/widget/singletree/singletree.popup.js

28
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

37
dist/bundle.js vendored
Unescape View File

@ -78258,6 +78258,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -78494,6 +78495,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -78585,7 +78587,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}]
},
maxHeight: 242
maxHeight: 252
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -78684,6 +78686,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options;
return {
type: "bi.vertical",
vgap: 5,
items: [{
type: "bi.button_group",
ref: function () {
@ -79087,6 +79090,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -79305,6 +79309,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -96193,6 +96198,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});
@ -96754,6 +96760,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});
@ -98840,7 +98847,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({
type: "bi.select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -98907,6 +98913,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -99013,7 +99025,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded,
el: {
type: "bi.loader",
@ -99077,6 +99088,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
}, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -105891,6 +105910,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});
@ -107485,7 +107505,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value;
this.button_group = BI.createWidget({
type: "bi.single_select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -107542,6 +107561,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -107554,6 +107581,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: false
});
@ -109520,6 +109548,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});

36
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/case.js vendored
Unescape View File

@ -5774,6 +5774,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -6010,6 +6011,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -6101,7 +6103,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}]
},
maxHeight: 242
maxHeight: 252
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -6200,6 +6202,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options;
return {
type: "bi.vertical",
vgap: 5,
items: [{
type: "bi.button_group",
ref: function () {
@ -6603,6 +6606,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -6821,6 +6825,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},

37
dist/fineui.js vendored
Unescape View File

@ -78501,6 +78501,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -78737,6 +78738,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -78828,7 +78830,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}]
},
maxHeight: 242
maxHeight: 252
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
@ -78927,6 +78929,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options;
return {
type: "bi.vertical",
vgap: 5,
items: [{
type: "bi.button_group",
ref: function () {
@ -79330,6 +79333,7 @@ BI.shortcut("bi.small_text_value_check_combo", BI.SmallTextValueCheckCombo);BI.T
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -79548,6 +79552,7 @@ BI.shortcut("bi.small_text_value_combo", BI.SmallTextValueCombo);BI.TextValueCom
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},
@ -96436,6 +96441,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});
@ -96997,6 +97003,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});
@ -99083,7 +99090,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({
type: "bi.select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -99150,6 +99156,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -99256,7 +99268,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded,
el: {
type: "bi.loader",
@ -99320,6 +99331,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
}, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -106134,6 +106153,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});
@ -107728,7 +107748,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value;
this.button_group = BI.createWidget({
type: "bi.single_select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -107785,6 +107804,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -107797,6 +107824,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: false
});
@ -109763,6 +109791,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});

28
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
dist/widget.js vendored
Unescape View File

@ -8562,6 +8562,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});
@ -9123,6 +9124,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});
@ -11209,7 +11211,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({
type: "bi.select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -11276,6 +11277,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -11382,7 +11389,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded,
el: {
type: "bi.loader",
@ -11446,6 +11452,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
}, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -18260,6 +18274,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});
@ -19854,7 +19869,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value;
this.button_group = BI.createWidget({
type: "bi.single_select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -19911,6 +19925,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -19923,6 +19945,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: false
});
@ -21889,6 +21912,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});

1
src/case/combo/iconcombo/popup.iconcombo.js
Unescape View File

@ -38,6 +38,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},

1
src/case/combo/icontextvaluecombo/popup.icontextvalue.js
Unescape View File

@ -36,6 +36,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},

2
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
Unescape View File

@ -63,7 +63,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}
}]
},
maxHeight: 242
maxHeight: 252
},
listeners: [{
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,

1
src/case/combo/searchtextvaluecombo/popup.searchtextvalue.js
Unescape View File

@ -11,6 +11,7 @@ BI.SearchTextValueComboPopup = BI.inherit(BI.Pane, {
var self = this, o = this.options;
return {
type: "bi.vertical",
vgap: 5,
items: [{
type: "bi.button_group",
ref: function () {

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

@ -29,6 +29,7 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},

1
src/case/combo/textvaluecombo/popup.textvalue.js
Unescape View File

@ -34,6 +34,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.popup]
});
},

1
src/widget/multilayerselecttree/multilayerselecttree.popup.js
Unescape View File

@ -36,6 +36,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});

1
src/widget/multilayersingletree/multilayersingletree.popup.js
Unescape View File

@ -35,6 +35,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
scrolly: false,
scrollable: true,
element: this,
vgap: 5,
items: [this.tree]
});

7
src/widget/multiselect/multiselect.loader.js
Unescape View File

@ -32,7 +32,6 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget({
type: "bi.select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -99,6 +98,12 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});

9
src/widget/multiselect/multiselect.loader.nobar.js
Unescape View File

@ -32,7 +32,6 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
this.button_group = BI.createWidget(BI.extend({
type: "bi.list_pane",
element: this,
onLoaded: opts.onLoaded,
el: {
type: "bi.loader",
@ -96,6 +95,14 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
}, opts.el));
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});

1
src/widget/selecttree/selecttree.popup.js
Unescape View File

@ -66,6 +66,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});

10
src/widget/singleselect/singleselect.loader.js
Unescape View File

@ -29,7 +29,6 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
this.storeValue = opts.value;
this.button_group = BI.createWidget({
type: "bi.single_select_list",
element: this,
logic: opts.logic,
el: BI.extend({
onLoaded: opts.onLoaded,
@ -86,6 +85,14 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
},
value: this.storeValue
});
BI.createWidget({
type: "bi.vertical",
element: this,
items: [this.button_group],
vgap: 5
});
this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
});
@ -98,6 +105,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
return BI.createItems(items, {
type: "bi.single_select_combo.item",
logic: this.options.logic,
cls: "bi-list-item-active",
height: 24,
selected: false
});

1
src/widget/singletree/singletree.popup.js
Unescape View File

@ -32,6 +32,7 @@ BI.SingleTreePopup = BI.inherit(BI.Pane, {
BI.createWidget({
type: "bi.vertical",
element: this,
vgap: 5,
items: [this.tree]
});

Write Preview
Loading…
Cancel
Save