From 6a94a07903ed4d646a57263a6f94cc91b31ddcac Mon Sep 17 00:00:00 2001 From: Karson Date: Wed, 28 Feb 2024 12:00:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfavisible=E4=B8=ADselectpage?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 优化通用搜索 --- public/assets/js/bootstrap-table-commonsearch.js | 2 +- public/assets/js/require-form.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js index ec35d092..60bf9fbd 100644 --- a/public/assets/js/bootstrap-table-commonsearch.js +++ b/public/assets/js/bootstrap-table-commonsearch.js @@ -43,7 +43,7 @@ setTimeout(function () { that.onCommonSearch(); - }, 0); + }, 1); }); }; diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js index 54a2ff4d..6b25fab4 100755 --- a/public/assets/js/require-form.js +++ b/public/assets/js/require-form.js @@ -591,7 +591,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio form.on("keyup change click configchange", "input,textarea,select", function () { $("[data-favisible][data-favisible!='']", form).each(function () { var visible = $(this).data("favisible"); - var groupArr = visible.split(/\|\|/); + var groupArr = visible ? visible.toString().split(/\|\|/) : []; var success = 0; $.each(groupArr, function (i, j) { if (checkCondition(j)) { @@ -610,7 +610,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio setTimeout(function () { var validator = form.data('validator'); if (validator) { - validator.options.ignore += ((validator.options.ignore ? ',' : '') + '[data-favisible] :hidden,[data-favisible]:hidden'); + validator.options.ignore += ((validator.options.ignore ? ',' : '') + '.hidden[data-favisible] :hidden,.hidden[data-favisible]:hidden'); } }, 0);