Browse Source

Merge pull request #350 in FUI/fineui from ~WINDY/fui:master to master

* commit 'a339a79cbcd0f8165fde585a93f86df0eff9808e':
  BI-18028 combo默认传value时的标红
es6
guy 7 years ago
parent
commit
a41df140ad
  1. 2
      demo/js/case/combo/demo.search_text_value_combo.js
  2. 2
      demo/js/case/combo/demo.text_value_combo.js
  3. 40
      dist/_fineui.min.js
  4. 10
      dist/bundle.js
  5. 40
      dist/bundle.min.js
  6. 10
      dist/case.js
  7. 4
      dist/demo.js
  8. 40
      dist/fineui.min.js
  9. 7
      src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
  10. 3
      src/case/combo/textvaluecombo/combo.textvalue.js

2
demo/js/case/combo/demo.search_text_value_combo.js

@ -15,7 +15,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
combo = this; combo = this;
}, },
text: "默认值", text: "默认值",
value: 2, value: 14,
width: 300, width: 300,
items: [{ items: [{
text: "ABC-1", text: "ABC-1",

2
demo/js/case/combo/demo.text_value_combo.js

@ -15,7 +15,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
combo = this; combo = this;
}, },
text: "默认值", text: "默认值",
value: 2, value: 22,
width: 300, width: 300,
items: [{ items: [{
text: "MVC-1", text: "MVC-1",

40
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/bundle.js vendored

@ -78215,6 +78215,13 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}; };
}, },
mounted: function () {
var o = this.options;
if(BI.isKey(o.value)) {
this._checkError(o.value);
}
},
_checkError: function (v) { _checkError: function (v) {
if(BI.isNotNull(v)) { if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];
@ -78741,6 +78748,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if(BI.isKey(o.value)) {
this._checkError(o.value);
}
}, },
_checkError: function (v) { _checkError: function (v) {

40
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

10
dist/case.js vendored

@ -5770,6 +5770,13 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}; };
}, },
mounted: function () {
var o = this.options;
if(BI.isKey(o.value)) {
this._checkError(o.value);
}
},
_checkError: function (v) { _checkError: function (v) {
if(BI.isNotNull(v)) { if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];
@ -6296,6 +6303,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if(BI.isKey(o.value)) {
this._checkError(o.value);
}
}, },
_checkError: function (v) { _checkError: function (v) {

4
dist/demo.js vendored

@ -2068,7 +2068,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
combo = this; combo = this;
}, },
text: "默认值", text: "默认值",
value: 2, value: 14,
width: 300, width: 300,
items: [{ items: [{
text: "ABC-1", text: "ABC-1",
@ -2186,7 +2186,7 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
combo = this; combo = this;
}, },
text: "默认值", text: "默认值",
value: 2, value: 22,
width: 300, width: 300,
items: [{ items: [{
text: "MVC-1", text: "MVC-1",

40
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@ -104,6 +104,13 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
}; };
}, },
mounted: function () {
var o = this.options;
if(BI.isKey(o.value)) {
this._checkError(o.value);
}
},
_checkError: function (v) { _checkError: function (v) {
if(BI.isNotNull(v)) { if(BI.isNotNull(v)) {
v = BI.isArray(v) ? v : [v]; v = BI.isArray(v) ? v : [v];

3
src/case/combo/textvaluecombo/combo.textvalue.js

@ -49,6 +49,9 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
maxHeight: 300 maxHeight: 300
} }
}); });
if(BI.isKey(o.value)) {
this._checkError(o.value);
}
}, },
_checkError: function (v) { _checkError: function (v) {

Loading…
Cancel
Save