Browse Source

update

master
windy 7 years ago
parent
commit
b6178cdf5f
  1. 1
      demo/js/widget/multiselect/demo.multi_select_combo.js
  2. 6
      dist/_fineui.min.js
  3. 2
      dist/base.js
  4. 12
      dist/bundle.js
  5. 18
      dist/bundle.min.js
  6. 4
      dist/case.js
  7. 1
      dist/demo.js
  8. 12
      dist/fineui.js
  9. 6
      dist/fineui.min.js
  10. BIN
      dist/images/1x/background/auto_color.png
  11. BIN
      dist/images/1x/background/auto_color_disable.png
  12. BIN
      dist/images/1x/background/auto_color_select.png
  13. BIN
      dist/images/2x/background/auto_color.png
  14. BIN
      dist/images/2x/background/auto_color_disable.png
  15. BIN
      dist/images/2x/background/auto_color_select.png
  16. 6
      dist/widget.js
  17. 2
      src/base/single/editor/editor.js
  18. 4
      src/case/colorchooser/colorchooser.trigger.js
  19. 6
      src/widget/searchmultiselect/multiselect.combo.search.js

1
demo/js/widget/multiselect/demo.multi_select_combo.js

@ -80,6 +80,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
type: "bi.search_multi_select_combo", type: "bi.search_multi_select_combo",
items: Demo.CONSTANTS.ITEMS, items: Demo.CONSTANTS.ITEMS,
text: "请选择", text: "请选择",
width: 200,
value: { value: {
type: 1, type: 1,
value: ["1", "2", "3"] value: ["1", "2", "3"]

6
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/base.js vendored

@ -18520,7 +18520,7 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue()); errorText = errorText(this.editor.getValue());
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles.show(this.getName(), errorText, this); BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
this._checkToolTip(); this._checkToolTip();
return BI.Bubbles.get(this.getName()); return BI.Bubbles.get(this.getName());
} }

12
dist/bundle.js vendored

@ -54290,7 +54290,7 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue()); errorText = errorText(this.editor.getValue());
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles.show(this.getName(), errorText, this); BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
this._checkToolTip(); this._checkToolTip();
return BI.Bubbles.get(this.getName()); return BI.Bubbles.get(this.getName());
} }
@ -76554,8 +76554,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3 bottom: 3
}, { }, {
el: down, el: down,
right: 3, right: 1,
bottom: 3 bottom: 1
}] }]
}); });
if (BI.isNotNull(this.options.value)) { if (BI.isNotNull(this.options.value)) {
@ -104262,12 +104262,12 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if(BI.isNotEmptyArray(v)) { if(BI.isNotEmptyArray(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];
var result = BI.find(this.allValue, function (idx, value) { var result = BI.find(this.allValue, function (idx, value) {
return BI.contains(v, value); return !BI.contains(v, value);
}); });
if (BI.isNull(result)) { if (BI.isNull(result)) {
this.element.addClass("combo-error");
} else {
this.element.removeClass("combo-error"); this.element.removeClass("combo-error");
} else {
this.element.addClass("combo-error");
} }
} else { } else {
v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error"); v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error");

18
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/case.js vendored

@ -4086,8 +4086,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3 bottom: 3
}, { }, {
el: down, el: down,
right: 3, right: 1,
bottom: 3 bottom: 1
}] }]
}); });
if (BI.isNotNull(this.options.value)) { if (BI.isNotNull(this.options.value)) {

1
dist/demo.js vendored

@ -12816,6 +12816,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
type: "bi.search_multi_select_combo", type: "bi.search_multi_select_combo",
items: Demo.CONSTANTS.ITEMS, items: Demo.CONSTANTS.ITEMS,
text: "请选择", text: "请选择",
width: 200,
value: { value: {
type: 1, type: 1,
value: ["1", "2", "3"] value: ["1", "2", "3"]

12
dist/fineui.js vendored

@ -54533,7 +54533,7 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue()); errorText = errorText(this.editor.getValue());
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles.show(this.getName(), errorText, this); BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
this._checkToolTip(); this._checkToolTip();
return BI.Bubbles.get(this.getName()); return BI.Bubbles.get(this.getName());
} }
@ -76797,8 +76797,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3 bottom: 3
}, { }, {
el: down, el: down,
right: 3, right: 1,
bottom: 3 bottom: 1
}] }]
}); });
if (BI.isNotNull(this.options.value)) { if (BI.isNotNull(this.options.value)) {
@ -104505,12 +104505,12 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if(BI.isNotEmptyArray(v)) { if(BI.isNotEmptyArray(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];
var result = BI.find(this.allValue, function (idx, value) { var result = BI.find(this.allValue, function (idx, value) {
return BI.contains(v, value); return !BI.contains(v, value);
}); });
if (BI.isNull(result)) { if (BI.isNull(result)) {
this.element.addClass("combo-error");
} else {
this.element.removeClass("combo-error"); this.element.removeClass("combo-error");
} else {
this.element.addClass("combo-error");
} }
} else { } else {
v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error"); v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error");

6
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/images/1x/background/auto_color.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 865 B

After

Width:  |  Height:  |  Size: 771 B

BIN
dist/images/1x/background/auto_color_disable.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 725 B

BIN
dist/images/1x/background/auto_color_select.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 744 B

BIN
dist/images/2x/background/auto_color.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/images/2x/background/auto_color_disable.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
dist/images/2x/background/auto_color_select.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

6
dist/widget.js vendored

@ -16643,12 +16643,12 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if(BI.isNotEmptyArray(v)) { if(BI.isNotEmptyArray(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];
var result = BI.find(this.allValue, function (idx, value) { var result = BI.find(this.allValue, function (idx, value) {
return BI.contains(v, value); return !BI.contains(v, value);
}); });
if (BI.isNull(result)) { if (BI.isNull(result)) {
this.element.addClass("combo-error");
} else {
this.element.removeClass("combo-error"); this.element.removeClass("combo-error");
} else {
this.element.addClass("combo-error");
} }
} else { } else {
v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error"); v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error");

2
src/base/single/editor/editor.js

@ -227,7 +227,7 @@ BI.Editor = BI.inherit(BI.Single, {
errorText = errorText(this.editor.getValue()); errorText = errorText(this.editor.getValue());
} }
if (!this.disabledError && BI.isKey(errorText)) { if (!this.disabledError && BI.isKey(errorText)) {
BI.Bubbles.show(this.getName(), errorText, this); BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this);
this._checkToolTip(); this._checkToolTip();
return BI.Bubbles.get(this.getName()); return BI.Bubbles.get(this.getName());
} }

4
src/case/colorchooser/colorchooser.trigger.js

@ -41,8 +41,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
bottom: 3 bottom: 3
}, { }, {
el: down, el: down,
right: 3, right: 1,
bottom: 3 bottom: 1
}] }]
}); });
if (BI.isNotNull(this.options.value)) { if (BI.isNotNull(this.options.value)) {

6
src/widget/searchmultiselect/multiselect.combo.search.js

@ -424,12 +424,12 @@ BI.SearchMultiSelectCombo = BI.inherit(BI.Single, {
if(BI.isNotEmptyArray(v)) { if(BI.isNotEmptyArray(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];
var result = BI.find(this.allValue, function (idx, value) { var result = BI.find(this.allValue, function (idx, value) {
return BI.contains(v, value); return !BI.contains(v, value);
}); });
if (BI.isNull(result)) { if (BI.isNull(result)) {
this.element.addClass("combo-error");
} else {
this.element.removeClass("combo-error"); this.element.removeClass("combo-error");
} else {
this.element.addClass("combo-error");
} }
} else { } else {
v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error"); v.length === this.allValue.length ? this.element.removeClass("combo-error") : this.element.addClass("combo-error");

Loading…
Cancel
Save