From eb0f3ac0fb8c1b4e850cb1fddd2f4cfb4e067425 Mon Sep 17 00:00:00 2001 From: augushong Date: Tue, 10 May 2022 16:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=B9fieldAlias=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A1=A8=E5=8D=95=E7=9A=84=E5=AD=97=E7=AC=A6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/plugs/easy-admin/easy-admin.js | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index ec875e1..3e64375 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -373,12 +373,18 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine d.elemIdName = d.fieldAlias; - if (typeof d.fieldAlias == 'string' && d.fieldAlias.indexOf('[') == 0) { + if (typeof d.fieldAlias == 'string' ) { - var fieldPlusArr = d.fieldAlias.replace('[').split(']'); + if(d.fieldAlias.indexOf('[') == 0){ - d.elemIdName = fieldPlusArr.join('-') + var fieldPlusArr = d.fieldAlias.replace('[').split(']'); + + d.elemIdName = fieldPlusArr.join('-') + } + + d.elemIdName = d.elemIdName.replace('.', '-'); } + if (d.defaultSearchValue.length > 0) { if (d.searchValue.length == 0) { @@ -714,7 +720,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine } } - + } } @@ -1073,28 +1079,28 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine options.cols[0].forEach(col => { if (col.field) { - + exportFields[col.field] = col.title; - + switch (col.fieldFormat) { case 'image': imageFields.push(col.field) break; - + case 'select': if (Object.keys(col.selectList).length > 0) { selectFields[col.field] = col.selectList; } break; case 'date': - + dateFields.push(col.field) break; - + default: break; } - + } });