From b6d352f3b8a62521796f0f37404a9954337e956d Mon Sep 17 00:00:00 2001 From: augushong Date: Fri, 8 Dec 2023 17:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=95=88=E6=9E=9C=EF=BC=9B=E5=8F=91=E5=B8=83=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/base/common/command/admin/VersionBase.php | 4 ++-- extend/base/common/controller/AdminControllerBase.php | 5 +++++ public/static/plugs/ulthon-admin/ulthon-admin.js | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php index fed0348..a52d342 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.81'; + public const VERSION = 'v2.0.82'; public const LAYUI_VERSION = '2.8.17'; public const COMMENT = [ - '优化更新逻辑', + '优化查询参数效果', '发布新版本', ]; diff --git a/extend/base/common/controller/AdminControllerBase.php b/extend/base/common/controller/AdminControllerBase.php index 2cbd82e..8ff5265 100644 --- a/extend/base/common/controller/AdminControllerBase.php +++ b/extend/base/common/controller/AdminControllerBase.php @@ -271,6 +271,11 @@ class AdminControllerBase extends BaseController $excludes[$key] = $val; 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 63916a1..f44f317 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -494,6 +494,9 @@ d.elemIdName = d.fieldAlias; + var a = ''; + var b = ''; + if (typeof d.fieldAlias == 'string') { if (d.fieldAlias.indexOf('[') == 0) { @@ -513,8 +516,6 @@ } if (d.search == 'number_limit') { - var a = ''; - var b = ''; if (d.searchValue) { var paramsArr = d.searchValue.split(','); a = paramsArr[0];