Browse Source

Merge pull request #506 in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '6a53dc7c55f742ced372eceac724a4f0e9e45697':
  build
  DEC-2957  部门树层级过高时候concat重复数据过多,卡死了.
es6
Dailer 6 years ago
parent
commit
88867cd8e2
  1. 18
      dist/_fineui.min.js
  2. 2
      dist/base.js
  3. 2
      dist/bundle.js
  4. 18
      dist/bundle.min.js
  5. 2
      dist/fineui.js
  6. 18
      dist/fineui.min.js
  7. 2
      src/base/combination/tree.button.js

18
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.js vendored

@ -1498,7 +1498,7 @@ BI.ButtonTree = BI.inherit(BI.ButtonGroup, {
var v = []; var v = [];
BI.each(this.buttons, function (i, item) { BI.each(this.buttons, function (i, item) {
if (item.isEnabled() && !BI.isFunction(item.setSelected)) { if (item.isEnabled() && !BI.isFunction(item.setSelected)) {
v = BI.concat(v, item.getValue()); v = BI.union(v, item.getValue());
return; return;
} }
if (item.isEnabled() && item.isSelected && item.isSelected()) { if (item.isEnabled() && item.isSelected && item.isSelected()) {

2
dist/bundle.js vendored

@ -37303,7 +37303,7 @@ BI.ButtonTree = BI.inherit(BI.ButtonGroup, {
var v = []; var v = [];
BI.each(this.buttons, function (i, item) { BI.each(this.buttons, function (i, item) {
if (item.isEnabled() && !BI.isFunction(item.setSelected)) { if (item.isEnabled() && !BI.isFunction(item.setSelected)) {
v = BI.concat(v, item.getValue()); v = BI.union(v, item.getValue());
return; return;
} }
if (item.isEnabled() && item.isSelected && item.isSelected()) { if (item.isEnabled() && item.isSelected && item.isSelected()) {

18
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -37552,7 +37552,7 @@ BI.ButtonTree = BI.inherit(BI.ButtonGroup, {
var v = []; var v = [];
BI.each(this.buttons, function (i, item) { BI.each(this.buttons, function (i, item) {
if (item.isEnabled() && !BI.isFunction(item.setSelected)) { if (item.isEnabled() && !BI.isFunction(item.setSelected)) {
v = BI.concat(v, item.getValue()); v = BI.union(v, item.getValue());
return; return;
} }
if (item.isEnabled() && item.isSelected && item.isSelected()) { if (item.isEnabled() && item.isSelected && item.isSelected()) {

18
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
src/base/combination/tree.button.js

@ -78,7 +78,7 @@ BI.ButtonTree = BI.inherit(BI.ButtonGroup, {
var v = []; var v = [];
BI.each(this.buttons, function (i, item) { BI.each(this.buttons, function (i, item) {
if (item.isEnabled() && !BI.isFunction(item.setSelected)) { if (item.isEnabled() && !BI.isFunction(item.setSelected)) {
v = BI.concat(v, item.getValue()); v = BI.union(v, item.getValue());
return; return;
} }
if (item.isEnabled() && item.isSelected && item.isSelected()) { if (item.isEnabled() && item.isSelected && item.isSelected()) {

Loading…
Cancel
Save