diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js index bd0b4ecc..04ad44e2 100755 --- a/public/assets/js/require-form.js +++ b/public/assets/js/require-form.js @@ -540,7 +540,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio var checkCondition = function (condition) { var conditionArr = condition.split(/&&/); var success = 0; - var baseregex = /^([a-z0-9\_]+)([>|<|=|\!]=?)(.*)$/i, strregex = /^('|")(.*)('|")$/, regregex = /^regex:(.*)$/; + var baseregex = /^([a-z0-9\_\[\]]+)([>|<|=|\!]=?)(.*)$/i, strregex = /^('|")(.*)('|")$/, regregex = /^regex:(.*)$/; // @formatter:off var operator_result = { '>': function (a, b) { @@ -595,7 +595,15 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio operator = 'regex'; value = regmatches[1]; } - var chkname = "row[" + name + "]"; + var chkname; + if (name.match(/[\[\]]+/)) { + chkname = name; + } else { + chkname = "row[" + name + "]"; + if (typeof dataObj[chkname] === 'undefined' && typeof dataObj[name] !== 'undefined') { + chkname = name; + } + } if (typeof dataObj[chkname] === 'undefined') { return false; }