From 346e3f8ffe1319945828e471792f243f0bbe53d5 Mon Sep 17 00:00:00 2001 From: Karson Date: Wed, 4 Jun 2025 11:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Favisible=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=8C=B9=E9=85=8D=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/require-form.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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; }