Browse Source

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

* commit '9eab165d76e693045f97d5a2a02317722f2545d7':
  BI-57759 fix: nobar的getValue返回值为array,因此trigger的itemsCreator回调中使用storeValue
es6
parent
commit
ac03e6b8c5
  1. 4
      dist/2.0/fineui.ie.js
  2. 2
      dist/2.0/fineui.ie.js.map
  3. 6
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.ie.min.js.map
  5. 4
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 2
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 4
      dist/bundle.ie.js
  11. 2
      dist/bundle.ie.js.map
  12. 6
      dist/bundle.ie.min.js
  13. 2
      dist/bundle.ie.min.js.map
  14. 4
      dist/bundle.js
  15. 2
      dist/bundle.js.map
  16. 2
      dist/bundle.min.css
  17. 4
      dist/bundle.min.js
  18. 2
      dist/bundle.min.js.map
  19. 4
      dist/fineui.ie.js
  20. 2
      dist/fineui.ie.js.map
  21. 6
      dist/fineui.ie.min.js
  22. 2
      dist/fineui.ie.min.js.map
  23. 4
      dist/fineui.js
  24. 2
      dist/fineui.js.map
  25. 2
      dist/fineui.min.css
  26. 4
      dist/fineui.min.js
  27. 2
      dist/fineui.min.js.map
  28. 4
      dist/fineui_without_jquery_polyfill.js
  29. 2
      dist/fineui_without_jquery_polyfill.js.map
  30. 2
      dist/utils.min.js
  31. 4
      dist/widget.js
  32. 2
      dist/widget.js.map
  33. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  34. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js

4
dist/2.0/fineui.ie.js vendored

@ -72202,7 +72202,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -73097,7 +73097,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/2.0/fineui.ie.js.map vendored

File diff suppressed because one or more lines are too long

6
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.js vendored

@ -72605,7 +72605,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -73500,7 +73500,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.ie.js vendored

@ -72202,7 +72202,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -73097,7 +73097,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/bundle.ie.js.map vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -72605,7 +72605,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -73500,7 +73500,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/bundle.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.js vendored

@ -72449,7 +72449,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -73344,7 +73344,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/fineui.ie.js.map vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored

@ -72852,7 +72852,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -73747,7 +73747,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored

@ -55132,7 +55132,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -56027,7 +56027,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -10211,7 +10211,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });
@ -11106,7 +11106,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
dist/widget.js.map vendored

File diff suppressed because one or more lines are too long

2
src/widget/multiselect/multiselect.combo.nobar.js

@ -268,7 +268,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

2
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -268,7 +268,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
o.itemsCreator(op, function (res) { o.itemsCreator(op, function (res) {
if (op.times === 1 && BI.isNotNull(op.keywords)) { if (op.times === 1 && BI.isNotNull(op.keywords)) {
// 预防trigger内部把当前的storeValue改掉 // 预防trigger内部把当前的storeValue改掉
self.trigger.setValue(BI.deepClone(self.getValue())); self.trigger.setValue(BI.deepClone(self.storeValue));
} }
callback.apply(self, arguments); callback.apply(self, arguments);
}); });

Loading…
Cancel
Save