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

修复通用搜索在启用自定义搜索时的BUG

pull/MERGE
Karson 2018-06-30 16:40:11 +08:00
parent 4198f126a9
commit b65452c7c3
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/lang/zh-cn.php
View File

@ -95,6 +95,8 @@ return [
'Flag' => '标志', 'Flag' => '标志',
'Drag to sort' => '拖动进行排序', 'Drag to sort' => '拖动进行排序',
'Redirect now' => '立即跳转', 'Redirect now' => '立即跳转',
'Key' => '键',
'Value' => '值',
'Common search' => '普通搜索', 'Common search' => '普通搜索',
'Search %s' => '搜索 %s', 'Search %s' => '搜索 %s',
'View %s' => '查看 %s', 'View %s' => '查看 %s',

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

@ -178,14 +178,15 @@
if (obj.size() == 0) if (obj.size() == 0)
return true; return true;
var vObjCol = ColumnsForSearch[i]; var vObjCol = ColumnsForSearch[i];
var process = !that.options.searchFormTemplate && vObjCol && typeof vObjCol.process == 'function' ? vObjCol.process : null;
if (obj.size() > 1) { if (obj.size() > 1) {
if (/BETWEEN$/.test(sym)) { if (/BETWEEN$/.test(sym)) {
var value_begin = $.trim($("[name='" + name + "']:first", that.$commonsearch).val()), var value_begin = $.trim($("[name='" + name + "']:first", that.$commonsearch).val()),
value_end = $.trim($("[name='" + name + "']:last", that.$commonsearch).val()); value_end = $.trim($("[name='" + name + "']:last", that.$commonsearch).val());
if (value_begin.length || value_end.length) { if (value_begin.length || value_end.length) {
if (typeof vObjCol.process === 'function') { if (process) {
value_begin = vObjCol.process(value_begin, 'begin'); value_begin = process(value_begin, 'begin');
value_end = vObjCol.process(value_end, 'end'); value_end = process(value_end, 'end');
} }
value = value_begin + ',' + value_end; value = value_begin + ',' + value_end;
} else { } else {
@ -197,10 +198,10 @@
} }
} else { } else {
value = $("[name='" + name + "']:checked", that.$commonsearch).val(); value = $("[name='" + name + "']:checked", that.$commonsearch).val();
value = (vObjCol && typeof vObjCol.process === 'function') ? vObjCol.process(value) : value; value = process ? process(value) : value;
} }
} else { } else {
value = (vObjCol && typeof vObjCol.process === 'function') ? vObjCol.process(obj.val()) : obj.val(); value = process ? process(obj.val()) : obj.val();
} }
if (removeempty && (value == '' || value == null || ($.isArray(value) && value.length == 0)) && !sym.match(/null/i)) { if (removeempty && (value == '' || value == null || ($.isArray(value) && value.length == 0)) && !sym.match(/null/i)) {
return true; return true;

11
public/assets/js/require-backend.min.js vendored
View File

@ -9068,14 +9068,15 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
if (obj.size() == 0) if (obj.size() == 0)
return true; return true;
var vObjCol = ColumnsForSearch[i]; var vObjCol = ColumnsForSearch[i];
var process = !that.options.searchFormTemplate && vObjCol && typeof vObjCol.process == 'function' ? vObjCol.process : null;
if (obj.size() > 1) { if (obj.size() > 1) {
if (/BETWEEN$/.test(sym)) { if (/BETWEEN$/.test(sym)) {
var value_begin = $.trim($("[name='" + name + "']:first", that.$commonsearch).val()), var value_begin = $.trim($("[name='" + name + "']:first", that.$commonsearch).val()),
value_end = $.trim($("[name='" + name + "']:last", that.$commonsearch).val()); value_end = $.trim($("[name='" + name + "']:last", that.$commonsearch).val());
if (value_begin.length || value_end.length) { if (value_begin.length || value_end.length) {
if (typeof vObjCol.process === 'function') { if (process) {
value_begin = vObjCol.process(value_begin, 'begin'); value_begin = process(value_begin, 'begin');
value_end = vObjCol.process(value_end, 'end'); value_end = process(value_end, 'end');
} }
value = value_begin + ',' + value_end; value = value_begin + ',' + value_end;
} else { } else {
@ -9087,10 +9088,10 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
} }
} else { } else {
value = $("[name='" + name + "']:checked", that.$commonsearch).val(); value = $("[name='" + name + "']:checked", that.$commonsearch).val();
value = (vObjCol && typeof vObjCol.process === 'function') ? vObjCol.process(value) : value; value = process ? process(value) : value;
} }
} else { } else {
value = (vObjCol && typeof vObjCol.process === 'function') ? vObjCol.process(obj.val()) : obj.val(); value = process ? process(obj.val()) : obj.val();
} }
if (removeempty && (value == '' || value == null || ($.isArray(value) && value.length == 0)) && !sym.match(/null/i)) { if (removeempty && (value == '' || value == null || ($.isArray(value) && value.length == 0)) && !sym.match(/null/i)) {
return true; return true;