ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-08 02:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化搜索查询构造逻辑

Browse Source
This commit is contained in:
augushong
2023-12-11 16:13:24 +08:00
parent bb2e485713
commit 1c6f2aa96b
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extend/base/common/controller/AdminControllerBase.php
View File

@@ -272,10 +272,6 @@ class AdminControllerBase extends BaseController
continue; continue;
} }
if ($val === '') {
continue;
}
$op = isset($ops[$key]) && !empty($ops[$key]) ? $ops[$key] : '%*%'; $op = isset($ops[$key]) && !empty($ops[$key]) ? $ops[$key] : '%*%';
if (strpos($key, '[') === 0) { if (strpos($key, '[') === 0) {

55
public/static/plugs/ulthon-admin/ulthon-admin.js
View File

@@ -486,7 +486,7 @@
d.selectList = d.selectList || {}; d.selectList = d.selectList || {};
d.search = admin.parame(d.search, true); d.search = admin.parame(d.search, true);
d.searchTip = d.searchTip || '请输入' + d.title || ''; d.searchTip = d.searchTip || '请输入' + d.title || '';
d.searchValue = d.searchValue || ''; d.searchValue = d.searchValue || undefined;
d.searchHide = d.searchHide || ''; d.searchHide = d.searchHide || '';
d.defaultSearchValue = d.defaultSearchValue; d.defaultSearchValue = d.defaultSearchValue;
d.searchOp = d.searchOp || '%*%'; d.searchOp = d.searchOp || '%*%';
@@ -510,38 +510,47 @@
} }
if (d.defaultSearchValue != undefined) { if (d.defaultSearchValue != undefined) {
if (d.searchValue.length == 0) { if (!d.searchValue || d.searchValue.length == 0) {
d.searchValue = d.defaultSearchValue; d.searchValue = d.defaultSearchValue;
} }
} }
if (d.search == 'number_limit') { if (d.searchValue !== undefined) {
if (d.searchValue) {
if (d.search == 'number_limit') {
var paramsArr = d.searchValue.split(','); var paramsArr = d.searchValue.split(',');
a = paramsArr[0]; a = paramsArr[0];
b = paramsArr[1]; b = paramsArr[1];
}
formatFilter['[' + d.field + ']min'] = a; if (a) {
formatOp['[' + d.field + ']min'] = 'min'; formatFilter['[' + d.field + ']min'] = a;
formatOp['[' + d.field + ']min'] = 'min';
}
formatFilter['[' + d.field + ']max'] = b; if (b) {
formatOp['[' + d.field + ']max'] = 'max'; formatFilter['[' + d.field + ']max'] = b;
} else if (d.search == 'time_limit') { formatOp['[' + d.field + ']max'] = 'max';
if (d.searchValue) { }
} else if (d.search == 'time_limit') {
var paramsArr = d.searchValue.split(','); var paramsArr = d.searchValue.split(',');
a = paramsArr[0]; a = paramsArr[0];
b = paramsArr[1]; 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 = ''; var formSearchHideClass = '';
@@ -550,6 +559,10 @@
formSearchHideClass = ' search-hide-item'; formSearchHideClass = ' search-hide-item';
} }
if (d.searchValue === undefined) {
d.searchValue = '';
}
if (d.field !== false && d.search !== false) { if (d.field !== false && d.search !== false) {
switch (d.search) { switch (d.search) {
case true: case true:
@@ -623,6 +636,8 @@
newCols.push(d); newCols.push(d);
} }
}); });
if (formHtml !== '') { if (formHtml !== '') {
$(elem).before('<fieldset id="searchFieldset_' + tableId + '" class="table-search-fieldset layui-hide">\n' + $(elem).before('<fieldset id="searchFieldset_' + tableId + '" class="table-search-fieldset layui-hide">\n' +