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);