diff --git a/extend/base/common/controller/AdminControllerBase.php b/extend/base/common/controller/AdminControllerBase.php index 8ff5265..f130510 100644 --- a/extend/base/common/controller/AdminControllerBase.php +++ b/extend/base/common/controller/AdminControllerBase.php @@ -272,10 +272,6 @@ class AdminControllerBase extends BaseController continue; } - if ($val === '') { - continue; - } - $op = isset($ops[$key]) && !empty($ops[$key]) ? $ops[$key] : '%*%'; if (strpos($key, '[') === 0) { diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index 9fee1d6..5584672 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -486,7 +486,7 @@ d.selectList = d.selectList || {}; d.search = admin.parame(d.search, true); d.searchTip = d.searchTip || '请输入' + d.title || ''; - d.searchValue = d.searchValue || ''; + d.searchValue = d.searchValue || undefined; d.searchHide = d.searchHide || ''; d.defaultSearchValue = d.defaultSearchValue; d.searchOp = d.searchOp || '%*%'; @@ -510,38 +510,47 @@ } if (d.defaultSearchValue != undefined) { - if (d.searchValue.length == 0) { + if (!d.searchValue || d.searchValue.length == 0) { d.searchValue = d.defaultSearchValue; } } - if (d.search == 'number_limit') { - if (d.searchValue) { + if (d.searchValue !== undefined) { + + if (d.search == 'number_limit') { var paramsArr = d.searchValue.split(','); + a = paramsArr[0]; b = paramsArr[1]; - } - formatFilter['[' + d.field + ']min'] = a; - formatOp['[' + d.field + ']min'] = 'min'; + if (a) { + formatFilter['[' + d.field + ']min'] = a; + formatOp['[' + d.field + ']min'] = 'min'; + } - formatFilter['[' + d.field + ']max'] = b; - formatOp['[' + d.field + ']max'] = 'max'; - } else if (d.search == 'time_limit') { - if (d.searchValue) { + if (b) { + formatFilter['[' + d.field + ']max'] = b; + formatOp['[' + d.field + ']max'] = 'max'; + } + } else if (d.search == 'time_limit') { var paramsArr = d.searchValue.split(','); + a = paramsArr[0]; b = paramsArr[1]; + + if (a) { + formatFilter['[' + d.field + ']min_date'] = a; + formatOp['[' + d.field + ']min_date'] = 'min_date'; + } + + if (b) { + formatFilter['[' + d.field + ']max_date'] = b; + formatOp['[' + d.field + ']max_date'] = 'max_date'; + } + } else { + formatFilter[d.field] = d.searchValue; + formatOp[d.field] = d.searchOp; } - - formatFilter['[' + d.field + ']min_date'] = a; - formatOp['[' + d.field + ']min_date'] = 'min_date'; - - formatFilter['[' + d.field + ']max_date'] = b; - formatOp['[' + d.field + ']max_date'] = 'max_date'; - } else { - formatFilter[d.field] = d.defaultSearchValue; - formatOp[d.field] = d.searchOp; } var formSearchHideClass = ''; @@ -550,6 +559,10 @@ formSearchHideClass = ' search-hide-item'; } + if (d.searchValue === undefined) { + d.searchValue = ''; + } + if (d.field !== false && d.search !== false) { switch (d.search) { case true: @@ -623,6 +636,8 @@ newCols.push(d); } }); + + if (formHtml !== '') { $(elem).before('
\n' +