浏览代码

优化表格&表单

Karson 2 年之前
父节点
当前提交
cdb41c5334
共有 3 个文件被更改,包括 7 次插入2 次删除
  1. 1 1
      public/assets/js/bootstrap-table-commonsearch.js
  2. 2 0
      public/assets/js/fast.js
  3. 4 1
      public/assets/js/require-form.js

+ 1 - 1
public/assets/js/bootstrap-table-commonsearch.js

@@ -61,7 +61,7 @@
         htmlForm.push('<div class="row">');
         htmlForm.push('<div class="row">');
         for (var i in pColumns) {
         for (var i in pColumns) {
             var vObjCol = pColumns[i];
             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 query = Fast.api.query(vObjCol.field);
                 var operate = Fast.api.query(vObjCol.field + "-operate");
                 var operate = Fast.api.query(vObjCol.field + "-operate");
 
 

+ 2 - 0
public/assets/js/fast.js

@@ -118,6 +118,8 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
                 if (!url) {
                 if (!url) {
                     url = window.location.href;
                     url = window.location.href;
                 }
                 }
+                if (!name)
+                    return '';
                 name = name.replace(/[\[\]]/g, "\\$&");
                 name = name.replace(/[\[\]]/g, "\\$&");
                 var regex = new RegExp("[?&/]" + name + "([=/]([^&#/?]*)|&|#|$)"),
                 var regex = new RegExp("[?&/]" + name + "([=/]([^&#/?]*)|&|#|$)"),
                     results = regex.exec(url);
                     results = regex.exec(url);

+ 4 - 1
public/assets/js/require-form.js

@@ -603,7 +603,10 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
 
 
                 //追加上忽略元素
                 //追加上忽略元素
                 setTimeout(function () {
                 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);
                 }, 0);
 
 
                 $("input,select", form).trigger("configchange");
                 $("input,select", form).trigger("configchange");