diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index ac22f6a9..a2161c7c 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -277,6 +277,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine $.each(cols, function (i, d) { d.field = d.field || false; d.fieldAlias = admin.parame(d.fieldAlias, d.field); + d.id = d.fieldAlias!==false?d.fieldAlias.replace(/\./g,"-"):d.fieldAlias; d.title = d.title || d.field || ''; d.selectList = d.selectList || {}; d.search = admin.parame(d.search, true); @@ -290,7 +291,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine formHtml += '\t
\n' + '\n' + '
\n' + - '\n' + + '\n' + '
\n' + '
'; break; @@ -307,7 +308,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine formHtml += '\t
\n' + '\n' + '
\n' + - '\n' + ' \n' + selectHtml + '\n' + @@ -319,7 +320,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine formHtml += '\t
\n' + '\n' + '
\n' + - '\n' + + '\n' + '
\n' + '
'; break; @@ -328,7 +329,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine formHtml += '\t
\n' + '\n' + '
\n' + - '\n' + + '\n' + '
\n' + '
'; break; @@ -695,7 +696,7 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine $.each(dataField, function (key, val) { if (val !== '') { formatFilter[key] = val; - var op = $('#c-' + key).attr('data-search-op'); + var op = $('#c-' + key.replce(/\./g,'-')).attr('data-search-op'); op = op || '%*%'; formatOp[key] = op; }