From 42b4f42210568a3f73f800f4fa77edf1f6c582b6 Mon Sep 17 00:00:00 2001 From: Qazink Date: Mon, 8 Jul 2024 09:16:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8E=E7=BC=93=E5=AD=98=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/TriggerService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 07e864af97fc0d3970a46fab85410ec572634fdf Mon Sep 17 00:00:00 2001 From: Qazink Date: Mon, 8 Jul 2024 09:25:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E2=9C=A8=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=A7=E5=88=B6=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=9A=84=E9=80=89=E9=A1=B9=20{=20=20=20=20=20text:=20'?= =?UTF-8?q?=E5=88=86=E9=85=8D',=20=20=20=20=20url:=20init.allocation=5Furl?= =?UTF-8?q?,=20=20=20=20=20method:=20'open',=20=20=20=20=20auth:=20'alloca?= =?UTF-8?q?tion',=20=20=20=20=20show:=20[{name:=20'status',=20value:=201}]?= =?UTF-8?q?,=20=20=20=20=20class:=20'layui-btn=20layui-btn-success=20layui?= =?UTF-8?q?-btn-xs',=20}=20=E5=A2=9E=E5=8A=A0show=20=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=EF=BC=8C=E4=B8=8A=E8=BF=B0=E4=BB=A3=E7=A0=81=E4=B8=AD=E5=BD=93?= =?UTF-8?q?=20data.status=20=3D=3D=3D=201=20=E6=97=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=AF=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/plugs/easy-admin/easy-admin.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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); } });