From 85f941fceff3f3a097184ced7f26f9c70e9b832b Mon Sep 17 00:00:00 2001
From: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
Date: Fri, 20 Jan 2023 14:14:45 +0000
Subject: [PATCH 1/2] =?UTF-8?q?update=20ZR.Service/System/SysMenuService.c?=
 =?UTF-8?q?s.=20=E5=BD=93=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9Enull=E5=80=BC?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9C=A8SysMenuController=E7=9A=8445?=
 =?UTF-8?q?=E8=A1=8C=20SUCCESS(sysMenuService.SelectTreeMenuList(menu,=20u?=
 =?UTF-8?q?serId),=20"yyyy-MM-dd=20HH:mm:ss");=20=E5=81=9Ajson=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E4=BC=9A=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
---
 ZR.Service/System/SysMenuService.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index ca28efc0..caaeb11f 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -1,4 +1,4 @@
-using Infrastructure.Attribute;
+using Infrastructure.Attribute;
 using Infrastructure.Extensions;
 using SqlSugar;
 using System;
@@ -41,7 +41,7 @@ namespace ZR.Service
                 var userRoles = SysRoleService.SelectUserRoles(userId);
                 menuList = SelectTreeMenuListByRoles(menu, userRoles);
             }
-            return menuList;
+            return menuList ?? new List<SysMenu>();
         }
 
         /// <summary>
-- 
Gitee


From c90e76bac82be0ba58419a5872dc6938302312a4 Mon Sep 17 00:00:00 2001
From: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
Date: Sat, 21 Jan 2023 01:07:42 +0000
Subject: [PATCH 2/2] =?UTF-8?q?update=20ZR.Vue/src/views/system/menu/index?=
 =?UTF-8?q?.vue.=20=E5=A2=9E=E5=8A=A0=E4=BA=86table=20=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E5=90=8E=E5=88=B7=E6=96=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
---
 ZR.Vue/src/views/system/menu/index.vue | 32 ++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/ZR.Vue/src/views/system/menu/index.vue b/ZR.Vue/src/views/system/menu/index.vue
index 92f97895..b0799504 100644
--- a/ZR.Vue/src/views/system/menu/index.vue
+++ b/ZR.Vue/src/views/system/menu/index.vue
@@ -27,6 +27,7 @@
 
     <el-table v-if="refreshTable" v-loading="loading" :data="menuList" :default-expand-all="isExpandAll"
       row-key="menuId"
+      node-key="menuId"
       border
       lazy
       :load="loadMenu"
@@ -276,6 +277,8 @@ export default {
           { required: true, message: "路由地址不能为空", trigger: "blur" },
         ],
       },
+      // table树节点
+      tableTreeNodeMap: new Map(),
     };
   },
   created() {
@@ -397,13 +400,21 @@ export default {
             updateMenu(this.form).then((response) => {
               this.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              if (this.form.parentId == 0) {
+                this.getList();
+              } else {
+                this.refreshTableTree(this.form.parentId);
+              }
             });
           } else {
             addMenu(this.form).then((response) => {
               this.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              if (this.form.parentId == 0) {
+                this.getList();
+              } else {
+                this.refreshTableTree(this.form.parentId);
+              }
             });
           }
         }
@@ -424,7 +435,11 @@ export default {
           return delMenu(row.menuId);
         })
         .then(() => {
-          this.getList();
+          if (row.parentId == 0) {
+            this.getList();
+          } else {
+            this.refreshTableTree(row.parentId);
+          }
           this.msgSuccess("删除成功");
         });
     },
@@ -465,7 +480,16 @@ export default {
       listMenuById(row.menuId).then((res) => {
         resolve(res.data)
       })
-    }
+    },
+    //新增/修改/删除子节点时刷新子节点
+    refreshTableTree(key) {
+      const node = this.tableTreeNodeMap.get(key)
+      if (!node) {
+        return
+      }
+      const { row, treeNode, resolve } = node
+      this.loadMenu(row, treeNode, resolve)
+    },
   },
 };
 </script>
-- 
Gitee