diff --git a/extend/base/admin/view/debug/log/index.js b/extend/base/admin/view/debug/log/index.js index e4dac83..e0961b3 100644 --- a/extend/base/admin/view/debug/log/index.js +++ b/extend/base/admin/view/debug/log/index.js @@ -36,7 +36,7 @@ $(function () { return '
' + data.content + '
'; } }, - { field: 'create_time', title: '记录时间', minWidth: 160, search: 'time_limit' }, + { field: 'create_time', title: '记录时间', minWidth: 160, search: 'time_limit', defaultSearchValue: ua.getQueryVariable('create_time') }, { field: 'app_name', title: 'app_name' }, { field: 'controller_name', title: 'controller_name', }, { field: 'action_name', title: 'action_name' }, diff --git a/extend/base/admin/view/index/welcome.html b/extend/base/admin/view/index/welcome.html index 75441d9..325992e 100644 --- a/extend/base/admin/view/index/welcome.html +++ b/extend/base/admin/view/index/welcome.html @@ -156,6 +156,12 @@ PHP {:PHP_VERSION} + + 日志 + +
今日日志
+ + diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php index add1764..266e7f4 100644 --- a/extend/base/common/command/admin/VersionBase.php +++ b/extend/base/common/command/admin/VersionBase.php @@ -12,13 +12,12 @@ use think\console\Output; class VersionBase extends Command { - public const VERSION = 'v2.0.83'; + public const VERSION = 'v2.0.84'; public const LAYUI_VERSION = '2.8.17'; public const COMMENT = [ - '增加表格done的回调参数', - '增加require的扩展事件', + '完成timer_limit的预搜索传值', '发布新版本', ]; diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index bd3652e..74a8ff1 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -509,31 +509,43 @@ d.elemIdName = d.elemIdName.replace('.', '-'); } - if (d.defaultSearchValue != undefined) { if (d.searchValue.length == 0) { d.searchValue = d.defaultSearchValue; } - if (d.search == 'number_limit') { - if (d.searchValue) { - var paramsArr = d.searchValue.split(','); - a = paramsArr[0]; - b = paramsArr[1]; - } - - formatFilter['[' + d.field + ']min'] = a; - formatOp['[' + d.field + ']min'] = 'min'; - - formatFilter['[' + d.field + ']max'] = b; - formatOp['[' + d.field + ']max'] = 'max'; - } else { - formatFilter[d.field] = d.defaultSearchValue; - formatOp[d.field] = d.searchOp; - } } + console.log(d.defaultSearchValue); + if (d.search == 'number_limit') { + if (d.searchValue) { + var paramsArr = d.searchValue.split(','); + a = paramsArr[0]; + b = paramsArr[1]; + } + + 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) { + var paramsArr = d.searchValue.split(','); + a = paramsArr[0]; + b = paramsArr[1]; + } + + 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 = ''; @@ -595,8 +607,8 @@ formHtml += '\t
\n' + '\n' + '
\n' + - '\n' + - '\n' + + '\n' + + '\n' + '
\n' + '
'; break; @@ -2389,10 +2401,13 @@ } var query = window.location.search.substring(1); + query = query.replace(/\+/g, ' '); var vars = query.split("&"); for (var i = 0; i < vars.length; i++) { var pair = vars[i].split("="); - if (pair[0] == variable) { return decodeURIComponent(pair[1]); } + if (pair[0] == variable) { + return decodeURIComponent(pair[1]); + } } return defaultValue; },