From e17eca274f31ea5a91732d1090df618c3c24d232 Mon Sep 17 00:00:00 2001 From: augushong Date: Fri, 9 Dec 2022 17:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/plugs/easy-admin/easy-admin.js | 28 +++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index aa56a77..1e7806d 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -1200,15 +1200,7 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick if (val !== '') { formatFilter[key] = val; - var elemId = key; - - if (key.indexOf('[') == 0) { - var keyArr = key.replace('[', '').split(']'); - - elemId = keyArr[0] + '-' + keyArr[1]; - } - - elemId = elemId.replace('.', '-'); + var elemId = admin.table.renderSearchFormItemElementId(key) var op = $('#c-' + elemId).attr('data-search-op'); op = op || '%*%'; @@ -1404,7 +1396,10 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick $.each(dataField, function (key, val) { if (val !== '') { formatFilter[key] = val; - var op = $('#c-' + key).attr('data-search-op'); + + var elemId = admin.table.renderSearchFormItemElementId(key) + + var op = $('#c-' + elemId).attr('data-search-op'); op = op || '%*%'; formatOp[key] = op; } @@ -1436,6 +1431,19 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick layer.close(index); }); }); + }, + renderSearchFormItemElementId(key) { + + var elemId = key; + if (key.indexOf('[') == 0) { + var keyArr = key.replace('[', '').split(']'); + + elemId = keyArr[0] + '-' + keyArr[1]; + } + + elemId = elemId.replace('.', '-'); + + return elemId; } }, checkMobile: function () {