diff --git a/app/admin/service/TriggerService.php b/app/admin/service/TriggerService.php index b415310c..7192a238 100644 --- a/app/admin/service/TriggerService.php +++ b/app/admin/service/TriggerService.php @@ -43,7 +43,7 @@ public static function updateNode($adminId = null) */ public static function updatesysConfig() { - Cache::tag('sysconfig')->clear(); + Cache::tag('sysConfig')->clear(); return true; } diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index 9c8da3ed..a3a6ab9d 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -631,8 +631,19 @@ define(["jquery", "tableSelect"], function ($, tableSelect) { operat.title = data[operat.extra] + ' - ' + operat.title; } + const show_obj = operat.show || false; + let can_show = 1; + if (show_obj) { + $.each(show_obj, function (j, show_item) { + if (data[show_item.name] !== show_item.value) { + can_show = 0; + return false; + } + }) + } + operat.url = admin.table.toolSpliceUrl(operat.url, operat.field, data); - if (admin.checkAuth(operat.auth, elem)) { + if (admin.checkAuth(operat.auth, elem) && can_show === 1) { html += admin.table.buildOperatHtml(operat); } });