diff --git a/src/api/ADempiere/data.js b/src/api/ADempiere/data.js index 707a9afa..ad1a397f 100644 --- a/src/api/ADempiere/data.js +++ b/src/api/ADempiere/data.js @@ -158,14 +158,12 @@ export function getLookup({ export function getLookupList({ tableName, query, - valuesList, pageToken, pageSize }) { return Instance.call(this).requestListLookupFromReference({ tableName, query, - valuesList, pageToken, pageSize }) diff --git a/src/components/ADempiere/Field/FieldSelect.vue b/src/components/ADempiere/Field/FieldSelect.vue index f5bb41ec..8180a7d3 100644 --- a/src/components/ADempiere/Field/FieldSelect.vue +++ b/src/components/ADempiere/Field/FieldSelect.vue @@ -12,8 +12,6 @@ :allow-create="metadata.isSelectCreated" :collapse-tags="!isSelectMultiple" :disabled="isDisabled" - remote - :remote-method="getRemoteList" @change="preHandleChange" @visible-change="getDataLookupList" @clear="clearLookup" @@ -291,6 +289,7 @@ export default { directQuery: this.metadata.reference.directQuery, value: this.value }) + // set empty list and empty option this.changeBlankOption() const list = [] @@ -300,26 +299,7 @@ export default { // set empty value this.value = this.blankOption.key } - }, - getRemoteList(value) { - if (!isNaN(value)) { - value = parseInt(value, 10) - } - if (!this.isLoading && String(value.length > 2)) { - setTimeout(() => { - this.isLoading = true - this.$store.dispatch('getLookupListFromServer', { - parentUuid: this.metadata.parentUuid, - containerUuid: this.metadata.containerUuid, - tableName: this.metadata.reference.tableName, - query: this.metadata.reference.query, - valueToFilter: value - }) - .then(response => { - this.isLoading = false - }) - }, 250) - } + } } diff --git a/src/store/modules/ADempiere/lookup.js b/src/store/modules/ADempiere/lookup.js index ffbff256..5abef39e 100644 --- a/src/store/modules/ADempiere/lookup.js +++ b/src/store/modules/ADempiere/lookup.js @@ -92,8 +92,7 @@ const lookup = { parentUuid, containerUuid, tableName, - query, - valueToFilter + query }) { if (isEmptyValue(query)) { return @@ -107,15 +106,9 @@ const lookup = { isBooleanToString: true }).value } - - const valuesList = [] - if (!isEmptyValue(valueToFilter)) { - valuesList.push(valueToFilter) - } return getLookupList({ tableName, - query: parsedQuery, - valuesList + query: parsedQuery }) .then(lookupListResponse => { const list = []