diff --git a/src/components/ADempiere/DataTable/Components/CellDisplayInfo.vue b/src/components/ADempiere/DataTable/Components/CellDisplayInfo.vue index 611023035a4..47690ae48f3 100644 --- a/src/components/ADempiere/DataTable/Components/CellDisplayInfo.vue +++ b/src/components/ADempiere/DataTable/Components/CellDisplayInfo.vue @@ -34,7 +34,7 @@ /> -->

@@ -191,16 +191,16 @@ export default defineComponent({ value: currentValue, currency: props.dataRow[DISPLAY_COLUMN_PREFIX + CURRENCY], displayedValue: props.dataRow[displayColumnName.value], - displayType: props.fieldAttributes.displayType + displayType: props.fieldAttributes.display_type }) }) const cellCssClass = computed(() => { let classCss = '' - if (isNumberField(props.fieldAttributes.displayType) || props.fieldAttributes.componentPath === 'FieldNumber') { + if (isNumberField(props.fieldAttributes.display_type) || props.fieldAttributes.componentPath === 'FieldNumber') { classCss = ' cell-align-right ' } - if (props.fieldAttributes.isColumnDocumentStatus || props.fieldAttributes.displayType === IMAGE.id) { + if (props.fieldAttributes.isColumnDocumentStatus || props.fieldAttributes.display_type === IMAGE.id) { classCss = ' cell-align-center ' } return classCss diff --git a/src/components/ADempiere/DataTable/Components/CellEditInfo.vue b/src/components/ADempiere/DataTable/Components/CellEditInfo.vue index f9ec48929a7..fc565fab47b 100644 --- a/src/components/ADempiere/DataTable/Components/CellEditInfo.vue +++ b/src/components/ADempiere/DataTable/Components/CellEditInfo.vue @@ -116,7 +116,7 @@ export default defineComponent({ }) const isRowChangeEdited = computed(() => { - if ([BINARY_DATA.id, IMAGE.id].includes(props.fieldAttributes.displayType)) { + if ([BINARY_DATA.id, IMAGE.id].includes(props.fieldAttributes.display_type)) { return false } if (props.dataRow.isEditRow && !isReadOnly.value) { diff --git a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue index 62518ed0904..10391876df6 100644 --- a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue +++ b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue @@ -45,7 +45,7 @@ :span="6" > { - // return field.displayType === field.displayType === CHAR.id + // return field.display_type === CHAR.id return field.identifierSequence > 0 }) .sort((fieldA, fieldB) => { @@ -251,12 +251,12 @@ export default { // } // find on identifier columns for (const field of this.storedIdentifierColumns) { - const { columnName, displayColumnName, displayType } = field + const { columnName, displayColumnName, display_type } = field const currentValue = formatField({ value: row[columnName], displayedValue: row[displayColumnName], - displayType + displayType: display_type }) const valueToCompare = String(currentValue).toLowerCase() @@ -344,12 +344,12 @@ export default { // generate with identifier columns this.storedIdentifierColumns.forEach(field => { - const { columnName, displayColumnName, displayType } = field + const { columnName, displayColumnName, display_type } = field const currentValue = formatField({ value: row[columnName], displayedValue: row[displayColumnName], - displayType + displayType: display_type }) if (isEmptyValue(currentValue)) { diff --git a/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue b/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue index 91845a9ccf7..97ab794f143 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSelect/index.vue @@ -91,7 +91,7 @@ export default { isFiltrable() { if (this.isMobile) { - if (LIST.id === this.metadata.displayType) { + if (LIST.id === this.metadata.display_type) { return false } } @@ -352,17 +352,17 @@ export default { } }, remoteSearch(searchQuery = '') { - const results = this.localSearch(searchQuery) - if (isEmptyValue(searchQuery) || - (!isEmptyValue(searchQuery) && (isEmptyValue(results) || results.length < 3))) { - clearTimeout(this.timeOut) - this.timeOut = setTimeout(() => { - this.loadListFromServer(searchQuery) - }, 500) - return - } + // const results = this.localSearch(searchQuery) + // if (isEmptyValue(searchQuery) || + // (!isEmptyValue(searchQuery) && (isEmptyValue(results) || results.length < 3))) { + clearTimeout(this.timeOut) + this.timeOut = setTimeout(() => { + this.loadListFromServer(searchQuery) + }, 500) + // return + // } // use this, if remote is enabled, local search not working - this.optionsList = results + // this.optionsList = results }, localSearch(searchQuery = '') { if (isEmptyValue(searchQuery)) { diff --git a/src/components/ADempiere/FieldDefinition/FieldText.vue b/src/components/ADempiere/FieldDefinition/FieldText.vue index 71e2aa27431..2c524004117 100644 --- a/src/components/ADempiere/FieldDefinition/FieldText.vue +++ b/src/components/ADempiere/FieldDefinition/FieldText.vue @@ -1,19 +1,19 @@