diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php index c156754..478aaf8 100644 --- a/extend/base/common/command/admin/VersionBase.php +++ b/extend/base/common/command/admin/VersionBase.php @@ -12,12 +12,12 @@ use think\console\Output; class VersionBase extends Command { - public const VERSION = 'v2.0.77'; + public const VERSION = 'v2.0.78'; public const LAYUI_VERSION = '2.8.17'; public const COMMENT = [ - '修复更新逻辑创建目录', + 'number_limit增加默认参数', '发布新版本', ]; diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index 12e8e0e..cc520e5 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -34,7 +34,7 @@ tableRenderId: 'currentTableRenderId', uploadUrl: 'ajax/upload', uploadExts: '', - extGroup:{} + extGroup: {} }; var table; @@ -79,7 +79,7 @@ } } - + extGroup['office'] = [].concat(extGroup['word'], extGroup['excel'], extGroup['ppt'], extGroup['pdf']); extGroup['media'] = [].concat(extGroup['image'], extGroup['music'], extGroup['video']); @@ -512,8 +512,25 @@ d.searchValue = d.defaultSearchValue; } - formatFilter[d.field] = d.defaultSearchValue; - formatOp[d.field] = d.searchOp; + if (d.search == 'number_limit') { + var a = ''; + var b = ''; + 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; + } + }