Browse Source

Merge pull request #783 in VISUAL/fineui from ~LEI.WANG/fineui:master to master

* commit '56acead40f376e118ccacb54b47c5d00940c28b6':
  BI-35972 搜索高亮问题
master
lei.wang 6 years ago
parent
commit
3379e501d4
  1. 12
      dist/bundle.ie.js
  2. 12
      dist/bundle.js
  3. 38
      dist/bundle.min.js
  4. 12
      dist/case.js
  5. 12
      dist/fineui.ie.js
  6. 12
      dist/fineui.js
  7. 12
      dist/fineui_without_jquery_polyfill.js
  8. 9
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js

12
dist/bundle.ie.js vendored

@ -53803,6 +53803,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -53821,7 +53826,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -53831,7 +53836,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -53844,7 +53849,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

12
dist/bundle.js vendored

@ -54207,6 +54207,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -54225,7 +54230,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -54235,7 +54240,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -54248,7 +54253,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

38
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/case.js vendored

@ -4610,6 +4610,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -4628,7 +4633,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -4638,7 +4643,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -4651,7 +4656,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

12
dist/fineui.ie.js vendored

@ -54045,6 +54045,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -54063,7 +54068,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -54073,7 +54078,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -54086,7 +54091,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

12
dist/fineui.js vendored

@ -54449,6 +54449,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -54467,7 +54472,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -54477,7 +54482,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -54490,7 +54495,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

12
dist/fineui_without_jquery_polyfill.js vendored

@ -37467,6 +37467,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -37485,7 +37490,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -37495,7 +37500,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {
@ -37508,7 +37513,8 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconTextValueComboPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);/** BI.shortcut("bi.icon_text_value_combo_popup", BI.IconTextValueComboPopup);
/**
* Created by Windy on 2018/2/2. * Created by Windy on 2018/2/2.
*/ */
BI.SearchTextValueCombo = BI.inherit(BI.Widget, { BI.SearchTextValueCombo = BI.inherit(BI.Widget, {

9
src/case/combo/icontextvaluecombo/popup.icontextvalue.js

@ -24,6 +24,11 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
layouts: [{ layouts: [{
type: "bi.vertical" type: "bi.vertical"
}], }],
behaviors: {
redmark: function () {
return true;
}
},
value: o.value value: o.value
}); });
@ -42,7 +47,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
}); });
}, },
populate: function (items) { populate: function (items, keyword) {
BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments); BI.IconTextValueComboPopup.superclass.populate.apply(this, arguments);
var o = this.options; var o = this.options;
items = BI.createItems(items, { items = BI.createItems(items, {
@ -52,7 +57,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
iconWidth: o.iconWidth iconWidth: o.iconWidth
}); });
this.popup.populate(items); this.popup.populate(items, keyword);
}, },
getValue: function () { getValue: function () {

Loading…
Cancel
Save