diff --git a/public/static/admin/js/system/menu.js b/public/static/admin/js/system/menu.js index 2640e9d..7c68cd0 100644 --- a/public/static/admin/js/system/menu.js +++ b/public/static/admin/js/system/menu.js @@ -69,7 +69,7 @@ define(["jquery", "easy-admin", "treetable", "iconPickerFa", "autocomplete"], fu auth: 'add', class: 'layui-btn layui-btn-xs layui-btn-normal', extend: 'data-full="true"', - if: function (data) { + _if: function (data) { if (data.pid == 99999999) { return false; } @@ -84,7 +84,7 @@ define(["jquery", "easy-admin", "treetable", "iconPickerFa", "autocomplete"], fu auth: 'edit', class: 'layui-btn layui-btn-xs layui-btn-success', extend: 'data-full="true"', - if: 'status' + _if: 'status' }, { text: '删除', method: 'none', diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index de4a38c..4e5dc80 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -751,17 +751,17 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick operat.titleField = operat.titleField || 'title'; operat.title = operat.title || operat.text; operat.text = operat.text || operat.title; - operat.if = operat.if || function () { return true }; + operat._if = operat._if || function () { return true }; - if (typeof operat.if == 'function') { + if (typeof operat._if == 'function') { - if (operat.if(data, operat) !== true) { + if (operat._if(data, operat) !== true) { return ''; } - } else if (typeof operat.if == 'string') { + } else if (typeof operat._if == 'string') { - var ifValue = admin.table.returnColumnValue(data, operat.if, false); + var ifValue = admin.table.returnColumnValue(data, operat._if, false); if (!ifValue) { return ''