From cdb41c5334b9e13b652bf80cf9c21a8e0612efe4 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Thu, 26 Oct 2023 17:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC&=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
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/fast.js                         | 2 ++
 public/assets/js/require-form.js                 | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 6a6fe270..ec35d092 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -61,7 +61,7 @@
         htmlForm.push('<div class="row">');
         for (var i in pColumns) {
             var vObjCol = pColumns[i];
-            if (!vObjCol.checkbox && vObjCol.field !== 'operate' && vObjCol.searchable && vObjCol.operate !== false) {
+            if (!vObjCol.checkbox && !vObjCol.radio && vObjCol.field && vObjCol.field !== 'operate' && vObjCol.searchable && vObjCol.operate !== false) {
                 var query = Fast.api.query(vObjCol.field);
                 var operate = Fast.api.query(vObjCol.field + "-operate");
 
diff --git a/public/assets/js/fast.js b/public/assets/js/fast.js
index 29633a75..36125da4 100644
--- a/public/assets/js/fast.js
+++ b/public/assets/js/fast.js
@@ -118,6 +118,8 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                 if (!url) {
                     url = window.location.href;
                 }
+                if (!name)
+                    return '';
                 name = name.replace(/[\[\]]/g, "\\$&");
                 var regex = new RegExp("[?&/]" + name + "([=/]([^&#/?]*)|&|#|$)"),
                     results = regex.exec(url);
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 47738706..08bf4976 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -603,7 +603,10 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
 
                 //追加上忽略元素
                 setTimeout(function () {
-                    form.data('validator').options.ignore += ((form.data('validator').options.ignore ? ',' : '') + '[data-favisible] :hidden,[data-favisible]:hidden');
+                    var validator = form.data('validator');
+                    if (validator) {
+                        validator.options.ignore += ((validator.options.ignore ? ',' : '') + '[data-favisible] :hidden,[data-favisible]:hidden');
+                    }
                 }, 0);
 
                 $("input,select", form).trigger("configchange");