jinql
/
vue-element-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: Corrects update records, no value was sent. (#188)

pull/3759/head
EdwinBetanc0urt 2019-12-02 11:24:10 -04:00 committed by Yamel Senih
parent 0b95a6e10d
commit f82d0a49b3
2 changed files with 70 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/store/modules/ADempiere/panel.js
View File

@ -38,8 +38,8 @@ const panel = {
payload.fieldList = payload.newFieldList
},
changeFieldValue(state, payload) {
payload.field.value = payload.newValue
payload.field.oldValue = payload.field.value
payload.field.value = payload.newValue
if (payload.isChangedOldValue) {
payload.field.oldValue = payload.newValue
}
@ -398,37 +398,42 @@ const panel = {
},
/**
* TODO: Add fieldAttributes
* @param {string} params.parentUuid
* @param {string} params.containerUuid
* @param {string} params.columnName
* @param {string} params.newValue
* @param {string} parentUuid
* @param {string} containerUuid
* @param {string} panelType
* @param {boolean} isAdvancedQuery
* @param {string} columnName
* @param {mixin} newValue
* @param {mixin} valueTo
* @param {string} displayColumn, only used for lookup
* @param {string} params.panelType
* @param {string} params.isSendToServer
* @param {string} params.isAdvancedQuery
* @param {boolean} isSendToServer
* @param {boolean} isSendCallout
* @param {boolean} isSendToQuery
* @param {boolean} isChangedOldValue
* @param {array} withOutColumnNames
*/
notifyFieldChange({ commit, dispatch, getters }, params) {
const {
parentUuid, containerUuid, columnName, displayColumn, isSendToServer = true,
isAdvancedQuery = false, panelType = 'window', withOutColumnNames = [],
isSendCallout = true
} = params
notifyFieldChange({ commit, dispatch, getters }, {
parentUuid, containerUuid, panelType = 'window', isAdvancedQuery = false, columnName,
newValue, valueTo, displayColumn,
isSendToServer = true, isSendCallout = true, isSendToQuery = true,
isChangedOldValue = false, withOutColumnNames = []
}) {
const panel = getters.getPanel(containerUuid, isAdvancedQuery)
var fieldList = panel.fieldList
// get field
var field = fieldList.find(fieldItem => fieldItem.columnName === columnName)
params.newValue = parsedValueComponent({
newValue = parsedValueComponent({
fieldType: field.componentPath,
referenceType: field.referenceType,
value: params.newValue
value: newValue
})
if (field.isRange) {
params.valueTo = parsedValueComponent({
valueTo = parsedValueComponent({
fieldType: field.componentPath,
referenceType: field.referenceType,
value: params.valueTo
value: valueTo
})
}
@ -438,7 +443,7 @@ const panel = {
parentUuid: parentUuid,
containerUuid: containerUuid,
columnName: columnName,
value: params.newValue
value: newValue
})
// request context info field
@ -478,60 +483,52 @@ const panel = {
}
// the field has not changed, then the action is broken
if (params.newValue === field.value && isEmptyValue(displayColumn)) {
if (newValue === field.value && isEmptyValue(displayColumn)) {
return
}
commit('changeFieldValue', {
field: field,
newValue: params.newValue,
valueTo: params.valueTo,
newValue: newValue,
valueTo: valueTo,
displayColumn: displayColumn,
isChangedOldValue: params.isChangedOldValue
isChangedOldValue: isChangedOldValue
})
// Change Dependents
var dependents = fieldList.filter(fieldItem => {
const dependents = fieldList.filter(fieldItem => {
return field.dependentFieldsList.includes(fieldItem.columnName)
})
// Iterate for change logic
dependents.forEach(dependent => {
// isDisplayed Logic
var isDisplayedFromLogic = false
var isMandatoryFromLogic = false
var isReadOnlyFromLogic = false
let isDisplayedFromLogic, isMandatoryFromLogic, isReadOnlyFromLogic
if (dependent.displayLogic.trim() !== '') {
isDisplayedFromLogic = evaluator.evaluateLogic({
context: getters,
parentUuid: params.parentUuid,
containerUuid: params.containerUuid,
parentUuid: parentUuid,
containerUuid: containerUuid,
logic: dependent.displayLogic,
type: 'displayed'
})
} else {
isDisplayedFromLogic = undefined
}
// Mandatory Logic
if (dependent.mandatoryLogic.trim() !== '') {
isMandatoryFromLogic = evaluator.evaluateLogic({
context: getters,
parentUuid: params.parentUuid,
containerUuid: params.containerUuid,
parentUuid: parentUuid,
containerUuid: containerUuid,
logic: dependent.mandatoryLogic
})
} else {
isReadOnlyFromLogic = undefined
}
// Read Only Logic
if (dependent.readOnlyLogic.trim() !== '') {
isReadOnlyFromLogic = evaluator.evaluateLogic({
context: getters,
parentUuid: params.parentUuid,
containerUuid: params.containerUuid,
parentUuid: parentUuid,
containerUuid: containerUuid,
logic: dependent.readOnlyLogic
})
} else {
isReadOnlyFromLogic = undefined
}
commit('changeFieldLogic', {
field: dependent,
@ -543,7 +540,7 @@ const panel = {
// request callouts
if (field.panelType === 'window' && isSendCallout) {
if (!withOutColumnNames.includes(field.columnName) && !isEmptyValue(params.newValue) && !isEmptyValue(field.callout)) {
if (!withOutColumnNames.includes(field.columnName) && !isEmptyValue(newValue) && !isEmptyValue(field.callout)) {
withOutColumnNames.push(field.columnName)
dispatch('getCallout', {
parentUuid: parentUuid,
@ -551,7 +548,7 @@ const panel = {
tableName: panel.tableName,
columnName: field.columnName,
callout: field.callout,
value: params.newValue,
value: newValue,
oldValue: field.oldValue,
withOutColumnNames: withOutColumnNames
})
@ -574,25 +571,15 @@ const panel = {
parentUuid: parentUuid,
containerUuid: containerUuid
})
.then(response => {
.then(() => {
// change old value so that it is not send in the next update
commit('changeFieldValue', {
field: field,
newValue: params.newValue,
valueTo: params.valueTo,
displayColumn: params.displayColumn,
newValue: newValue,
valueTo: valueTo,
displayColumn: displayColumn,
isChangedOldValue: true
})
var oldRoute = router.app._route
router.push({
name: oldRoute.name,
query: {
...oldRoute.query,
action: response.recordUuid
}
})
dispatch('tagsView/delView', oldRoute, true)
})
.catch(error => {
showMessage({
@ -614,9 +601,9 @@ const panel = {
})
commit('changeFieldValue', {
field: field,
newValue: params.newValue,
valueTo: params.valueTo,
displayColumn: params.displayColumn,
newValue: newValue,
valueTo: valueTo,
displayColumn: displayColumn,
isChangedOldValue: true
})
@ -639,7 +626,7 @@ const panel = {
type: 'info'
})
}
} else if (!params.isDontSendToQuery) {
} else if (isSendToQuery) {
if (panelType === 'table' || isAdvancedQuery) {
if (fieldIsDisplayed(field) && field.isShowedFromUser) {
// change action to advanced query on field value is changed in this panel
@ -864,33 +851,28 @@ const panel = {
fieldList = getters.getFieldsListFromPanel(containerUuid)
}
var attributesList = fieldList
var attributesObject = {}
var displayColumnsList = []
var rangeColumnsList = []
if (withOut.length || isEvaluatedChangedValue) {
let attributesList = fieldList
const attributesObject = {}
const displayColumnsList = []
const rangeColumnsList = []
if (withOut.length || isEvaluatedChangedValue || isEvaluateValues) {
attributesList = attributesList.filter(fieldItem => {
// columns to exclude
if (withOut.includes(fieldItem.columnName)) {
return false
}
// if value is changed
if (isEvaluatedChangedValue && fieldItem.value === fieldItem.oldValue) {
return false
}
// TODO: Evaluate valueTo for range
if (isEvaluateValues && isEmptyValue(fieldItem.value)) {
return false
}
return true
})
}
// TODO: Evaluate valueTo
if (isEvaluateValues) {
attributesList = attributesList
.filter(fieldItem => {
if (!isEmptyValue(fieldItem.value)) {
return true
}
return false
})
}
attributesList = attributesList
.map(fieldItem => {
const valueToReturn = fieldItem[propertyName]
@ -898,18 +880,18 @@ const panel = {
// Add display columns if field has value
if (fieldItem[propertyName] && fieldItem.displayColumn) {
attributesObject['DisplayColumn_' + fieldItem.columnName] = fieldItem.displayColumn
attributesObject[`DisplayColumn_${fieldItem.columnName}`] = fieldItem.displayColumn
displayColumnsList.push({
columnName: 'DisplayColumn_' + fieldItem.columnName,
columnName: `DisplayColumn_${fieldItem.columnName}`,
value: fieldItem.displayColumn
})
}
// add range columns
if (isAddRangeColumn && fieldItem.isRange) {
attributesObject[fieldItem.columnName + '_To'] = fieldItem.valueTo
attributesObject[`${fieldItem.columnName}_To`] = fieldItem.valueTo
rangeColumnsList.push({
columnName: fieldItem.columnName + '_To',
columnName: `${fieldItem.columnName}_To`,
value: fieldItem.valueTo
})
}

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

@ -122,6 +122,16 @@ const windowControl = {
eventType: 'INSERT'
})
const oldRoute = router.app._route
router.push({
name: oldRoute.name,
query: {
...oldRoute.query,
action: response.getUuid()
}
})
dispatch('tagsView/delView', oldRoute, true)
resolve({
data: newValues,
recordUuid: response.getUuid(),