vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: Autocomplete

Browse source 
- Show value as description
- Validate value from options
- Override max_items
This commit is contained in:
Faris Ansari 2019-08-13 19:42:36 +05:30
parent bae336154f
commit fcb4e13415
1 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
frappe/public/js/frappe/form/controls/autocomplete.js
View file

@ -14,7 +14,7 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({
options = options.split('\n');
}
if (typeof options[0] === 'string') {
options = options.map(o => ({label: o, value: o}));
options = options.map(o => ({ label: o, value: o }));
}
this._data = options;
}
@ -24,12 +24,12 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({
var me = this;
return {
minChars: 0,
maxItems: 99,
maxItems: this.df.max_items || 99,
autoFirst: true,
list: this.get_data(),
data: function(item) {
if(!(item instanceof Object)) {
var d = {"value": item};
if (!(item instanceof Object)) {
var d = { value: item };
item = d;
}
@ -38,9 +38,13 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({
value: item.value
};
},
filter: function(item, input) {
let hay = item.label + item.value;
return Awesomplete.FILTER_CONTAINS(hay, input);
},
item: function(item) {
var d = this.get_item(item.value);
if(!d) {
if (!d) {
d = item;
}
@ -48,9 +52,9 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({
d.label = d.value;
}
var _label = (me.translate_values) ? __(d.label) : d.label;
var html = "<strong>" + _label + "</strong>";
if(d.description && d.value!==d.description) {
var _label = me.translate_values ? __(d.label) : d.label;
var html = '<strong>' + _label + '</strong>';
if (d.description) {
html += '<br><span class="small">' + __(d.description) + '</span>';
}
@ -67,13 +71,21 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({
},
setup_awesomplete() {
this.awesomplete = new Awesomplete(this.input, this.get_awesomplete_settings());
this.awesomplete = new Awesomplete(
this.input,
this.get_awesomplete_settings()
);
$(this.input_area).find('.awesomplete ul').css('min-width', '100%');
$(this.input_area)
.find('.awesomplete ul')
.css('min-width', '100%');
this.$input.on('input', frappe.utils.debounce(() => {
this.awesomplete.list = this.get_data();
}, 500));
this.$input.on(
'input',
frappe.utils.debounce(() => {
this.awesomplete.list = this.get_data();
}, 500)
);
this.$input.on('focus', () => {
if (!this.$input.val()) {
@ -87,6 +99,15 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({
});
},
validate(value) {
let valid_values = this.awesomplete._list.map(d => d.value);
if (valid_values.includes(value)) {
return value;
} else {
return '';
}
},
get_data() {
return this._data || [];
},