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

Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui 

# Conflicts:
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
Zhenfei.Li 6 years ago
parent
7139235189 a4f3135612
commit
41e73673fe
16 changed files with 61 additions and 34 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. 5
      dist/2.0/fineui.ie.js
  2. 8
      dist/2.0/fineui.ie.min.js
  3. 5
      dist/2.0/fineui.js
  4. 8
      dist/2.0/fineui.min.js
  5. 5
      dist/bundle.ie.js
  6. 8
      dist/bundle.ie.min.js
  7. 5
      dist/bundle.js
  8. 8
      dist/bundle.min.js
  9. 5
      dist/fineui.ie.js
  10. 8
      dist/fineui.ie.min.js
  11. 5
      dist/fineui.js
  12. 8
      dist/fineui.min.js
  13. 5
      dist/fineui_without_jquery_polyfill.js
  14. 2
      dist/utils.min.js
  15. 5
      dist/widget.js
  16. 5
      src/widget/downlist/popup.downlist.js

5
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -61599,6 +61599,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -61713,7 +61716,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

8
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/2.0/fineui.js vendored
Unescape View File

@ -62003,6 +62003,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -62117,7 +62120,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

8
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -61599,6 +61599,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -61713,7 +61716,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

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

File diff suppressed because one or more lines are too long

5
dist/bundle.js vendored
Unescape View File

@ -62003,6 +62003,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -62117,7 +62120,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

8
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -61844,6 +61844,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -61958,7 +61961,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

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

File diff suppressed because one or more lines are too long

5
dist/fineui.js vendored
Unescape View File

@ -62248,6 +62248,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -62362,7 +62365,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

8
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -45071,6 +45071,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -45185,7 +45188,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/widget.js vendored
Unescape View File

@ -2087,6 +2087,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -2201,7 +2204,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

5
src/widget/downlist/popup.downlist.js
Unescape View File

@ -87,6 +87,9 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.each(it, function (i, item) {
if (BI.isNotEmptyArray(item.children) && !BI.isEmpty(item.el)) {
item.type = "bi.combo_group";
// popup未初始化返回的是options中的value, 在经过buttontree的getValue concat之后，无法区分值来自options
// 还是item自身, 这边控制defaultInit为true来避免这个问题
item.isDefaultInit = true;
item.cls = "down-list-group";
item.trigger = "hover";
item.isNeedAdjustWidth = false;
@ -201,7 +204,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
_checkValues: function (values) {
var value = [];
BI.each(this.items, function (idx, itemGroup) {
BI.each(this.options.items, function (idx, itemGroup) {
BI.each(itemGroup, function (id, item) {
if(BI.isNotNull(item.children)) {
var childValues = BI.map(item.children, "value");

Write Preview
Loading…
Cancel
Save