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

fix: Evaluate multiple logic's with | and &. (#301)

pull/3759/head
EdwinBetanc0urt 2020-02-04 09:49:29 -04:00 committed by GitHub
parent c7f168c4a8
commit ecf2de8b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/utils/ADempiere/evaluator.js
View File

@ -27,9 +27,8 @@ class evaluator {
objectToEvaluate.logic.trim() === '') { objectToEvaluate.logic.trim() === '') {
return defaultUndefined return defaultUndefined
} }
let st = objectToEvaluate.logic.trim().replace('\n', '') const st = objectToEvaluate.logic.trim().replace('\n', '')
st = st.replace('|', '~') const expr = /(\||&)/
const expr = /(~|&)/
const stList = st.split(expr) const stList = st.split(expr)
const it = stList.length const it = stList.length
@ -41,7 +40,7 @@ class evaluator {
let retValue = null let retValue = null
let logOp = '' let logOp = ''
stList.forEach(function(element) { stList.forEach(function(element) {
if (element === '~' || element === '&') { if (element.trim() === '|' || element.trim() === '&') {
logOp = element logOp = element
} else if (retValue === null) { } else if (retValue === null) {
retValue = evaluator.evaluateLogicTuples({ retValue = evaluator.evaluateLogicTuples({
@ -49,12 +48,12 @@ class evaluator {
conditional: element conditional: element
}) })
} else { } else {
if (logOp === '&' && logOp !== '') { if (logOp.trim() === '&') {
retValue = retValue & evaluator.evaluateLogicTuples({ retValue = retValue & evaluator.evaluateLogicTuples({
...objectToEvaluate, ...objectToEvaluate,
conditional: element conditional: element
}) })
} else if (logOp === '~' && logOp !== '') { } else if (logOp.trim() === '|') {
retValue = retValue | evaluator.evaluateLogicTuples({ retValue = retValue | evaluator.evaluateLogicTuples({
...objectToEvaluate, ...objectToEvaluate,
conditional: element conditional: element
@ -66,7 +65,7 @@ class evaluator {
} }
}) })
return Boolean(retValue) return Boolean(retValue)
} // evaluateLogic } // evaluateLogic
/** /**
* Evaluate Logic Tuples * Evaluate Logic Tuples
@ -84,7 +83,7 @@ class evaluator {
if (logic === undefined) { if (logic === undefined) {
return _defaultUndefined return _defaultUndefined
} }
let expr = /^(['"@#$a-zA-Z0-9\-_\s]){0,}((<>|<=|<|=|>=|>|!=|!|\^){1,2})([\s"'@#$a-zA-Z0-9\-_]){0,}$/i let expr = /^(['"@#$a-zA-Z0-9\-_\s]){0,}((<>|<=|<|==|=|>=|>|!=|!|\^){1,2})([\s"'@#$a-zA-Z0-9\-_]){0,}$/i
let st = expr.test(logic) let st = expr.test(logic)
if (!st) { if (!st) {
@ -92,7 +91,7 @@ class evaluator {
return _defaultUndefined return _defaultUndefined
} }
expr = /(<>|<=|<|=|>=|>|!=|!|\^){1,2}/i expr = /(<>|<=|<|==|=|>=|>|!=|!|\^){1,2}/i
st = logic.split(expr) st = logic.split(expr)
// First Part (or column name) // First Part (or column name)
@ -125,9 +124,9 @@ class evaluator {
firstEval = firstEval.replace(/['"]/g, '').trim() // strip ' and " firstEval = firstEval.replace(/['"]/g, '').trim() // strip ' and "
} }
// Operator // Operator
const operand = st[1] const operand = st[1]
// Second Part // Second Part
let second = st[2].trim() let second = st[2].trim()
let secondEval = second.trim() let secondEval = second.trim()
if (expr.test(second)) { if (expr.test(second)) {
@ -136,13 +135,13 @@ class evaluator {
parentUuid: (isGlobal || isCountable) ? null : objectToEvaluate.parentUuid, parentUuid: (isGlobal || isCountable) ? null : objectToEvaluate.parentUuid,
containerUuid: (isGlobal || isCountable) ? null : objectToEvaluate.containerUuid, containerUuid: (isGlobal || isCountable) ? null : objectToEvaluate.containerUuid,
columnName: first columnName: first
}) // replace with it's value }) // replace with it's value
} }
if (typeof secondEval === 'string') { if (typeof secondEval === 'string') {
secondEval = secondEval.replace(/['"]/g, '').trim() // strip ' and " for string values secondEval = secondEval.replace(/['"]/g, '').trim() // strip ' and " for string values
} }
// Handling of ID compare (null => 0) // Handling of ID compare (null => 0)
if (first.includes('_ID') && firstEval.length === 0) { if (first.includes('_ID') && firstEval.length === 0) {
firstEval = '0' firstEval = '0'
} }
@ -150,7 +149,7 @@ class evaluator {
secondEval = '0' secondEval = '0'
} }
// Logical Comparison // Logical Comparison
const result = this.evaluateLogicTuple(firstEval, operand, secondEval) const result = this.evaluateLogicTuple(firstEval, operand, secondEval)
return result return result
@ -229,7 +228,7 @@ class evaluator {
} }
let string = parseString.replace('@SQL=', '') let string = parseString.replace('@SQL=', '')
// while we have variables // while we have variables
while (string.includes('@')) { while (string.includes('@')) {
let pos = string.indexOf('@') let pos = string.indexOf('@')
@ -239,7 +238,7 @@ class evaluator {
pos = string.indexOf('@') pos = string.indexOf('@')
if (pos === -1) { if (pos === -1) {
continue continue
} // error number of @@ not correct } // error number of @@ not correct
// remove second @: ExampleColumn@ = ExampleColumn // remove second @: ExampleColumn@ = ExampleColumn
const value = string.substring(0, pos) const value = string.substring(0, pos)