diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index b2c0b02..339b8fd 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -638,8 +638,7 @@ } if (d.field !== false) { - if(d.search !== false){ - + if (d.search !== false) { switch (d.search) { case true: formHtml += '\t
\n' + @@ -652,7 +651,7 @@ case 'select': d.searchOp = '='; var selectHtml = ''; - + $.each(d.selectList, function (sI, sV) { var selected = ''; if (sI === d.searchValue) { @@ -710,9 +709,9 @@ break; } newCols.push(d); - }else{ + } else { // TODO:支持更多种类型的初始化,比如number_limit、time_limit - formHtml += '' + formHtml += ''; } } }); @@ -2073,16 +2072,35 @@ if (tableId === undefined || tableId === '' || tableId == null) { tableId = init.tableRenderId; } - var where = { - filter: '{}', - op: '{}' - }; - table.reloadData(tableId, { - page: { - curr: 1 - } - , where: where - }, 'data'); + + setTimeout(() => { + var searchVals = form.val(tableId + '_filter_form'); + var dataField = searchVals; + var formatFilter = {}, + formatOp = {}; + $.each(dataField, function (key, val) { + if (val !== '') { + formatFilter[key] = val; + + var elemId = admin.table.renderSearchFormItemElementId(key); + + var op = $('#c-' + elemId).attr('data-search-op'); + op = op || '%*%'; + formatOp[key] = op; + } + }); + + var where = { + filter: JSON.stringify(formatFilter), + op: JSON.stringify(formatOp) + }; + table.reloadData(tableId, { + page: { + curr: 1 + } + , where: where + }, 'data'); + }, 100); }); // 监听请求