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

bugfix load values of field Target Document Type (#297) 

* bugfix load values of field Target Document Type

* remove console message
pull/3759/head
Leonel Matos 2020-02-04 00:46:04 -04:00 committed by GitHub
parent d2e51f85b3
commit 343949371e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ADempiere/Tab/tabMixin.js
View File

@ -82,7 +82,7 @@ export const tabMixin = {
parentUuid: metadataTab.parentUuid, parentUuid: metadataTab.parentUuid,
containerUuid: metadataTab.uuid, containerUuid: metadataTab.uuid,
value: metadataTab.whereClause, value: metadataTab.whereClause,
isBoolToString: true isBooleanToString: true
}).value }).value
} }
} }

6
src/store/modules/ADempiere/browserControl.js
View File

@ -37,7 +37,8 @@ const browserControl = {
if (!isEmptyValue(parsedQuery) && parsedQuery.includes('@')) { if (!isEmptyValue(parsedQuery) && parsedQuery.includes('@')) {
parsedQuery = parseContext({ parsedQuery = parseContext({
containerUuid, containerUuid,
value: parsedQuery value: parsedQuery,
isBooleanToString: true
}).value }).value
} }
@ -45,7 +46,8 @@ const browserControl = {
if (!isEmptyValue(parsedWhereClause) && parsedWhereClause.includes('@')) { if (!isEmptyValue(parsedWhereClause) && parsedWhereClause.includes('@')) {
parsedWhereClause = parseContext({ parsedWhereClause = parseContext({
containerUuid, containerUuid,
value: parsedWhereClause value: parsedWhereClause,
isBooleanToString: true
}).value }).value
} }

19
src/store/modules/ADempiere/lookup.js
View File

@ -37,7 +37,8 @@ const lookup = {
parsedDirectQuery = parseContext({ parsedDirectQuery = parseContext({
parentUuid, parentUuid,
containerUuid, containerUuid,
value: directQuery value: directQuery,
isBooleanToString: true
}).value }).value
} }
@ -85,10 +86,10 @@ const lookup = {
parsedQuery = parseContext({ parsedQuery = parseContext({
parentUuid, parentUuid,
containerUuid, containerUuid,
value: query value: query,
isBooleanToString: true
}).value }).value
} }
return getLookupList({ return getLookupList({
tableName, tableName,
query: parsedQuery query: parsedQuery
@ -127,7 +128,8 @@ const lookup = {
parsedDirectQuery = parseContext({ parsedDirectQuery = parseContext({
parentUuid, parentUuid,
containerUuid, containerUuid,
value: parsedDirectQuery value: parsedDirectQuery,
isBooleanToString: true
}).value }).value
} }
const lookupItem = state.lookupItem.filter(itemLookup => { const lookupItem = state.lookupItem.filter(itemLookup => {
@ -142,7 +144,8 @@ const lookup = {
parsedQuery = parseContext({ parsedQuery = parseContext({
parentUuid: parentUuid, parentUuid: parentUuid,
containerUuid: containerUuid, containerUuid: containerUuid,
value: parsedQuery value: parsedQuery,
isBooleanToString: true
}).value }).value
} }
const lookupList = state.lookupList.filter(itemLookup => { const lookupList = state.lookupList.filter(itemLookup => {
@ -169,7 +172,8 @@ const lookup = {
parsedDirectQuery = parseContext({ parsedDirectQuery = parseContext({
parentUuid, parentUuid,
containerUuid, containerUuid,
value: parsedDirectQuery value: parsedDirectQuery,
isBooleanToString: true
}).value }).value
} }
const lookupItem = state.lookupItem.find(itemLookup => { const lookupItem = state.lookupItem.find(itemLookup => {
@ -195,7 +199,8 @@ const lookup = {
parsedQuery = parseContext({ parsedQuery = parseContext({
parentUuid, parentUuid,
containerUuid, containerUuid,
value: parsedQuery value: parsedQuery,
isBooleanToString: true
}).value }).value
} }
const lookupList = state.lookupList.find(itemLookup => { const lookupList = state.lookupList.find(itemLookup => {

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

@ -577,7 +577,8 @@ const windowControl = {
parsedQuery = parseContext({ parsedQuery = parseContext({
parentUuid: parentUuid, parentUuid: parentUuid,
containerUuid: containerUuid, containerUuid: containerUuid,
value: tab.query value: tab.query,
isBooleanToString: true
}).value }).value
} }
@ -586,7 +587,8 @@ const windowControl = {
parsedWhereClause = parseContext({ parsedWhereClause = parseContext({
parentUuid: parentUuid, parentUuid: parentUuid,
containerUuid: containerUuid, containerUuid: containerUuid,
value: tab.whereClause value: tab.whereClause,
isBooleanToString: true
}).value }).value
} }

7
src/utils/ADempiere/contextUtils.js
View File

@ -63,16 +63,17 @@ export function getParentFields({ displayLogic, mandatoryLogic, readOnlyLogic, d
* @param {string} parentUuid: (REQUIRED from Window) UUID Window * @param {string} parentUuid: (REQUIRED from Window) UUID Window
* @param {string} containerUuid: (REQUIRED) UUID Tab, Process, SmartBrowser, Report and Form * @param {string} containerUuid: (REQUIRED) UUID Tab, Process, SmartBrowser, Report and Form
* @param {string} columnName: (Optional if exists in value) Column name to search in context * @param {string} columnName: (Optional if exists in value) Column name to search in context
* @param {boolean} isBoolToString, convert boolean values to string * @param {boolean} isBooleanToString, convert boolean values to string
*/ */
export function parseContext({ export function parseContext({
parentUuid, parentUuid,
containerUuid, containerUuid,
columnName, columnName,
value, value,
isSQL = false isSQL = false,
isBooleanToString = false
}) { }) {
const isBooleanToString = value.includes('@SQL=') // const isBooleanToString = value.includes('@SQL=')
let isError = false let isError = false
const errorsList = [] const errorsList = []
value = String(value) value = String(value)