hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化表格&表单

pull/460/MERGE
Karson 2023-10-26 17:08:14 +08:00
parent 2fe68b4c27
commit cdb41c5334
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/js/bootstrap-table-commonsearch.js
View File

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

2
public/assets/js/fast.js
View File

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

5
public/assets/js/require-form.js
View File

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