caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

* commit '0f195e459031344f4c2e86cb23bf84051a0c52cb':
  update
  BI-37529 横纵向滚动条都由容器负责
es6
windy 6 years ago
parent
f381acaab8 0f195e4590
commit
eb38d5df09
15 changed files with 146 additions and 142 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. 30
      dist/bundle.ie.js
  2. 20
      dist/bundle.ie.min.js
  3. 30
      dist/bundle.js
  4. 24
      dist/bundle.min.js
  5. 30
      dist/fineui.ie.js
  6. 18
      dist/fineui.ie.min.js
  7. 30
      dist/fineui.js
  8. 22
      dist/fineui.min.js
  9. 30
      dist/fineui_without_jquery_polyfill.js
  10. 2
      dist/utils.min.js
  11. 30
      dist/widget.js
  12. 11
      src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
  13. 3
      src/widget/multilayerselecttree/multilayerselecttree.popup.js
  14. 5
      src/widget/multilayersingletree/multilayersingletree.leveltree.js
  15. 3
      src/widget/multilayersingletree/multilayersingletree.popup.js

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

@ -65716,7 +65716,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -65742,7 +65743,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -65752,7 +65753,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -65808,9 +65809,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {
@ -65869,7 +65870,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({
@ -66407,7 +66409,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -66502,7 +66505,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},
@ -66566,7 +66569,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({
@ -73259,12 +73263,8 @@ BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidt
return this.editor.getValue();
},
setTitle: function () {
return this.editor.setTitle();
},
setEnable: function () {
return this.editor.setEnable();
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) {

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

File diff suppressed because one or more lines are too long

30
dist/bundle.js vendored
Unescape View File

@ -66120,7 +66120,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -66146,7 +66147,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -66156,7 +66157,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -66212,9 +66213,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {
@ -66273,7 +66274,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({
@ -66811,7 +66813,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -66906,7 +66909,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},
@ -66970,7 +66973,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({
@ -73663,12 +73667,8 @@ BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidt
return this.editor.getValue();
},
setTitle: function () {
return this.editor.setTitle();
},
setEnable: function () {
return this.editor.setEnable();
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) {

24
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -65961,7 +65961,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -65987,7 +65988,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -65997,7 +65998,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -66053,9 +66054,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {
@ -66114,7 +66115,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({
@ -66652,7 +66654,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -66747,7 +66750,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},
@ -66811,7 +66814,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({
@ -73504,12 +73508,8 @@ BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidt
return this.editor.getValue();
},
setTitle: function () {
return this.editor.setTitle();
},
setEnable: function () {
return this.editor.setEnable();
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) {

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

File diff suppressed because one or more lines are too long

30
dist/fineui.js vendored
Unescape View File

@ -66365,7 +66365,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -66391,7 +66392,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -66401,7 +66402,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -66457,9 +66458,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {
@ -66518,7 +66519,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({
@ -67056,7 +67058,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -67151,7 +67154,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},
@ -67215,7 +67218,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({
@ -73908,12 +73912,8 @@ BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidt
return this.editor.getValue();
},
setTitle: function () {
return this.editor.setTitle();
},
setEnable: function () {
return this.editor.setEnable();
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) {

22
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -49179,7 +49179,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -49205,7 +49206,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -49215,7 +49216,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -49271,9 +49272,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {
@ -49332,7 +49333,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({
@ -49870,7 +49872,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -49965,7 +49968,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},
@ -50029,7 +50032,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({
@ -56722,12 +56726,8 @@ BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidt
return this.editor.getValue();
},
setTitle: function () {
return this.editor.setTitle();
},
setEnable: function () {
return this.editor.setEnable();
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) {

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

30
dist/widget.js vendored
Unescape View File

@ -6695,7 +6695,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -6721,7 +6722,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -6731,7 +6732,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -6787,9 +6788,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {
@ -6848,7 +6849,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({
@ -7386,7 +7388,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -7481,7 +7484,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},
@ -7545,7 +7548,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({
@ -14238,12 +14242,8 @@ BI.shortcut("bi.number_interval", BI.NumberInterval);BI.NumberIntervalSingleEidt
return this.editor.getValue();
},
setTitle: function () {
return this.editor.setTitle();
},
setEnable: function () {
return this.editor.setEnable();
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) {

11
src/widget/multilayerselecttree/multilayerselecttree.leveltree.js
Unescape View File

@ -11,7 +11,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
value: ""
value: "",
scrollable: true
});
},
@ -37,7 +38,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
extend.isLastNode = true;
}
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_select_tree_first_plus_group_node"
extend.type = "bi.multilayer_select_tree_first_plus_group_node";
}
if (i === 0 && i === nodes.length - 1 && !pNode) { // 根
extend.type = "bi.multilayer_select_tree_plus_group_node";
@ -47,7 +48,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
} else {
extend.type = "bi.multilayer_single_tree_mid_tree_leaf_item";
if (i === 0 && !pNode) {
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item"
extend.type = "bi.multilayer_single_tree_first_tree_leaf_item";
}
if (i === nodes.length - 1) {
extend.type = "bi.multilayer_single_tree_last_tree_leaf_item";
@ -103,9 +104,9 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
})
});
},
populate: function (nodes) {

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

@ -28,7 +28,8 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
value: o.value,
itemsCreator: o.itemsCreator
itemsCreator: o.itemsCreator,
scrollable: null
});
BI.createWidget({

5
src/widget/multilayersingletree/multilayersingletree.leveltree.js
Unescape View File

@ -11,7 +11,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
isDefaultInit: false,
items: [],
itemsCreator: BI.emptyFn,
chooseType: BI.Selection.Single
chooseType: BI.Selection.Single,
scrollable: true
});
},
@ -106,7 +107,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
BI.createWidget({
type: "bi.adaptive",
element: this,
scrollable: true,
scrollable: o.scrollable,
items: [this.tree]
});
},

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

@ -27,7 +27,8 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Pane, {
isDefaultInit: o.isDefaultInit,
items: o.items,
itemsCreator: o.itemsCreator,
value: o.value
value: o.value,
scrollable: null
});
BI.createWidget({

Write Preview
Loading…
Cancel
Save