blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-11 13:39:48 +08:00
Code Issues Releases Wiki Activity

field search bug fix in LookupFactory (#501)

Browse Source 
* field search bug fix in LookupFactory

* remove console
This commit is contained in:
elsiosanchez 2020-05-21 11:13:45 -04:00 committed by GitHub
parent 303baee821
commit 635363a8e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 69 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/store/modules/ADempiere/field.js
View File

@ -65,22 +65,22 @@ const field = {
getters: { getters: {
getFieldFromUuid: (state) => (uuid) => { getFieldFromUuid: (state) => (uuid) => {
return state.fieldList.find(fieldItem => { return state.fieldList.find(fieldItem => {
return fieldItem.uuid === uuid return fieldItem.fieldResponse.uuid === uuid
}) })
}, },
getFieldFromColumnUuid: (state) => (columnUuid) => { getFieldFromColumnUuid: (state) => (columnUuid) => {
return state.fieldList.find(fieldItem => { return state.fieldList.find(fieldItem => {
return fieldItem.columnUuid === columnUuid return fieldItem.fieldResponse.columnUuid === columnUuid
}) })
}, },
getFieldFromElementUuid: (state) => (elementUuid) => { getFieldFromElementUuid: (state) => (elementUuid) => {
return state.fieldList.find(fieldItem => { return state.fieldList.find(fieldItem => {
return fieldItem.elementUuid === elementUuid return fieldItem.fieldResponse.elementUuid === elementUuid
}) })
}, },
getFieldFromElementColumnName: (state) => (elementColumnName) => { getFieldFromElementColumnName: (state) => (elementColumnName) => {
return state.fieldList.find(fieldItem => { return state.fieldList.find(fieldItem => {
return fieldItem.elementColumnName === elementColumnName return fieldItem.fieldResponse.elementColumnName === elementColumnName
}) })
}, },
getFieldFromTableNameAndColumnName: (state) => ({ getFieldFromTableNameAndColumnName: (state) => ({
@ -88,7 +88,7 @@ const field = {
columnName columnName
}) => { }) => {
return state.fieldList.find(fieldItem => { return state.fieldList.find(fieldItem => {
return fieldItem.tableName === tableName && fieldItem.columnName === columnName return fieldItem.fieldResponse.tableName === tableName && fieldItem.fieldResponse.columnName === columnName
}) })
} }
} }

127
src/utils/ADempiere/lookupFactory.js
View File

@ -79,28 +79,28 @@ export function createFieldFromDictionary({
columnName columnName
}) })
} }
if (!isEmptyValue(field)) { if (isEmptyValue(field)) {
return getFactoryFromField({ containerUuid, field }) return new Promise(resolve => {
} store.dispatch('getFieldFromServer', {
return new Promise(resolve => { fieldUuid,
store.dispatch('getFieldFromServer', { columnUuid,
fieldUuid, elementUuid,
columnUuid, elementColumnName,
elementUuid, tableName,
elementColumnName, columnName
tableName,
columnName
})
.then(response => {
resolve(getFactoryFromField({
containerUuid,
field: response,
overwriteDefinition
}))
}).catch(error => {
console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
}) })
}) .then(response => {
resolve(getFactoryFromField({
containerUuid,
field: response,
overwriteDefinition
}))
}).catch(error => {
console.warn(`LookupFactory: Get Field From Server (State) - Error ${error.code}: ${error.message}.`)
})
})
}
return new Promise(resolve => { resolve(getFactoryFromField({ containerUuid, field })) })
} }
// Convert field getted from server to factory // Convert field getted from server to factory
@ -109,49 +109,50 @@ function getFactoryFromField({
field, field,
overwriteDefinition = {} overwriteDefinition = {}
}) { }) {
const fieldAttributes = isEmptyValue(field.fieldResponse) ? field : field.fieldResponse
const fieldDefinition = { const fieldDefinition = {
displayType: field.displayType, displayType: fieldAttributes.displayType,
tableName: field.reference.tableName, tableName: fieldAttributes.reference.tableName,
directQuery: field.directQuery, directQuery: fieldAttributes.directQuery,
query: field.reference.query, query: fieldAttributes.reference.query,
keyColumnName: field.reference.keyColumnName, keyColumnName: fieldAttributes.reference.keyColumnName,
validationCode: field.reference.validationCode, validationCode: fieldAttributes.reference.validationCode,
windowsList: field.reference.windowsList, windowsList: fieldAttributes.reference.windowsList,
id: field.id, id: fieldAttributes.id,
uuid: field.uuid, uuid: fieldAttributes.uuid,
name: field.name, name: fieldAttributes.name,
description: field.description, description: fieldAttributes.description,
help: field.help, help: fieldAttributes.help,
fieldGroup: field.fieldGroup, fieldGroup: fieldAttributes.fieldGroup,
isFieldOnly: field.isFieldOnly, isFieldOnly: fieldAttributes.isFieldOnly,
isRange: field.isRange, isRange: fieldAttributes.isRange,
isSameLine: field.isSameLine, isSameLine: fieldAttributes.isSameLine,
sequence: field.sequence, sequence: fieldAttributes.sequence,
seqNoGrid: field.seqNoGrid, seqNoGrid: fieldAttributes.seqNoGrid,
isIdentifier: field.isIdentifier, isIdentifier: fieldAttributes.isIdentifier,
isKey: field.isKey, isKey: fieldAttributes.isKey,
isSelectionColumn: field.isSelectionColumn, isSelectionColumn: fieldAttributes.isSelectionColumn,
isUpdateable: field.isUpdateable, isUpdateable: fieldAttributes.isUpdateable,
formatPattern: field.formatPattern, formatPattern: fieldAttributes.formatPattern,
vFormat: field.vFormat, vFormat: fieldAttributes.vFormat,
defaultValue: field.defaultValue, defaultValue: fieldAttributes.defaultValue,
defaultValueTo: field.defaultValueTo, defaultValueTo: fieldAttributes.defaultValueTo,
valueMin: field.valueMin, valueMin: fieldAttributes.valueMin,
valueMax: field.valueMax, valueMax: fieldAttributes.valueMax,
isActive: field.isActive, isActive: fieldAttributes.isActive,
isMandatory: field.isMandatory, isMandatory: fieldAttributes.isMandatory,
isReadOnly: field.isReadOnly, isReadOnly: fieldAttributes.isReadOnly,
isDisplayedFromLogic: field.isDisplayedFromLogic, isDisplayedFromLogic: fieldAttributes.isDisplayedFromLogic,
isReadOnlyFromLogic: field.isReadOnlyFromLogic, isReadOnlyFromLogic: fieldAttributes.isReadOnlyFromLogic,
isMandatoryFromLogic: field.isMandatoryFromLogic, isMandatoryFromLogic: fieldAttributes.isMandatoryFromLogic,
callout: field.callout, callout: fieldAttributes.callout,
isQueryCriteria: field.isQueryCriteria, isQueryCriteria: fieldAttributes.isQueryCriteria,
displayLogic: field.displayLogic, displayLogic: fieldAttributes.displayLogic,
mandatoryLogic: field.mandatoryLogic, mandatoryLogic: fieldAttributes.mandatoryLogic,
readOnlyLogic: field.readOnlyLogic, readOnlyLogic: fieldAttributes.readOnlyLogic,
parentFieldsList: field.parentFieldsList, parentFieldsList: fieldAttributes.parentFieldsList,
dependentFieldsList: field.dependentFieldsList, dependentFieldsList: fieldAttributes.dependentFieldsList,
contextInfo: field.contextInfo, contextInfo: fieldAttributes.contextInfo,
// Overwrite definition // Overwrite definition
...overwriteDefinition ...overwriteDefinition
} }