From 659acb02cd37b69ad840493e5fe50caecd452b2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=8B=E6=96=97=E4=B8=BA=E9=92=B1?= <674211704@qq.com> Date: Sat, 14 Dec 2024 07:48:11 +0000 Subject: [PATCH 1/3] =?UTF-8?q?update=20app/Extends/Validates/System/MenuV?= =?UTF-8?q?alidate.php.=20=E4=BF=AE=E5=A4=8D=20=E8=8F=9C=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E7=9B=AE=E5=BD=95=E6=97=B6=EF=BC=8C=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E5=A1=AB=E5=86=99=20=E6=9D=83=E9=99=90=E6=A0=87?= =?UTF-8?q?=E8=AF=86=20=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 奋斗为钱 <674211704@qq.com> --- app/Extends/Validates/System/MenuValidate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Extends/Validates/System/MenuValidate.php b/app/Extends/Validates/System/MenuValidate.php index 24439fd..3b4e338 100644 --- a/app/Extends/Validates/System/MenuValidate.php +++ b/app/Extends/Validates/System/MenuValidate.php @@ -19,7 +19,7 @@ public function rules():array return [ 'name' => 'required|min:2|max:30', 'perms'=>[ - 'required', + 'required_unless:type,M', Rule::unique(Menu::tableName())->where(function($query){ if(isset($this->data['id'])){ return $query->where('id','<>',$this->data['id']); -- Gitee From ae10026fbb9810cd9c6fc75a8a040ff02187fd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=8B=E6=96=97=E4=B8=BA=E9=92=B1?= <674211704@qq.com> Date: Sat, 14 Dec 2024 07:49:13 +0000 Subject: [PATCH 2/3] =?UTF-8?q?update=20app/Extends/Validates/System/MenuV?= =?UTF-8?q?alidate.php.=20=E4=BF=AE=E5=A4=8D=20=20=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E7=9B=AE=E5=BD=95=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=A1=AB=E5=86=99=20=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=A0=87=E8=AF=86=20=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 奋斗为钱 <674211704@qq.com> --- app/Extends/Validates/System/MenuValidate.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Extends/Validates/System/MenuValidate.php b/app/Extends/Validates/System/MenuValidate.php index 3b4e338..8cf8691 100644 --- a/app/Extends/Validates/System/MenuValidate.php +++ b/app/Extends/Validates/System/MenuValidate.php @@ -36,7 +36,8 @@ public function attributes():array return [ 'name' => '菜单名称', 'perms' => '权限标识', - 'listsort' => '显示顺序' + 'listsort' => '显示顺序', + 'type' => '菜单类型' ]; } } -- Gitee From ac96bce23bfe5124bc233909b24dc33922480fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=8B=E6=96=97=E4=B8=BA=E9=92=B1?= <674211704@qq.com> Date: Sat, 14 Dec 2024 07:50:50 +0000 Subject: [PATCH 3/3] =?UTF-8?q?update=20lang/zh=5Fcn/validation.php.=20=20?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=BA=E9=9D=9E=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=86=99=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A0=87=E8=AF=86=E7=9A=84=E4=B8=AD=E6=96=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 奋斗为钱 <674211704@qq.com> --- lang/zh_cn/validation.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lang/zh_cn/validation.php b/lang/zh_cn/validation.php index 35f5b8b..681069f 100644 --- a/lang/zh_cn/validation.php +++ b/lang/zh_cn/validation.php @@ -160,4 +160,9 @@ 'attributes' => [], + 'values' => [ + 'type' => [ + 'M' => '目录' + ], + ], ]; -- Gitee