From 013f1fcdf7e61218a0f4fd3e3c4fd7b8a0679940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Mon, 13 Dec 2021 15:57:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ErrorException=E7=B1=BB=E7=9A=84=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exceptions/Handler.php           | 7 ++++++-
 app/Models/SoftDelete/SoftDelete.php | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index d3e7c0f..9f0d349 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -77,7 +77,12 @@ class Handler extends ExceptionHandler
             }
 
             // Exception类的错误监听
-            if($exception instanceof \Exception){
+            if($exception instanceof Exception){
+                return $this->setJsonReturn($exception);
+            }
+
+            // ErrorException类的监听
+            if($exception instanceof \ErrorException){
                 return $this->setJsonReturn($exception);
             }
         }
diff --git a/app/Models/SoftDelete/SoftDelete.php b/app/Models/SoftDelete/SoftDelete.php
index ec54f0c..8f38e53 100644
--- a/app/Models/SoftDelete/SoftDelete.php
+++ b/app/Models/SoftDelete/SoftDelete.php
@@ -4,8 +4,6 @@ declare(strict_types = 1);
 
 namespace App\Models\SoftDelete;
 
-use http\Env\Request;
-
 trait SoftDelete
 {
     public function getIsDelete()
-- 
Gitee


From 5409720af82f7fbfa62c0ed93179979744aee535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Thu, 23 Dec 2021 11:00:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E7=BC=96=E8=BE=91vue=E7=9A=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admin_menus/components/detail.vue                 | 3 +++
 .../Resources/vue-element-admin/views/admin_menus/index.vue | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
index 5d868b8..de38cac 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
@@ -25,6 +25,9 @@
             <el-form-item label="菜单名称" prop="menu_name">
                 <el-input v-model="form.menu_name" autocomplete="off"></el-input>
             </el-form-item>
+            <el-form-item label="Vue名称" prop="vue_name">
+                <el-input v-model="form.vue_name" autocomplete="off"></el-input>
+            </el-form-item>
             <el-form-item label="Vue路由路径" prop="vue_path">
                 <el-input v-model="form.vue_path" autocomplete="off"></el-input>
             </el-form-item>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
index 014c730..20292dd 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
@@ -25,6 +25,12 @@
                 label="菜单名称"
             ></el-table-column>
 
+            <el-table-column
+                show-overflow-tooltip
+                prop="vue_name"
+                label="Vue名称"
+            ></el-table-column>
+
             <el-table-column
                 show-overflow-tooltip
                 prop="vue_path"
-- 
Gitee