From 854a05cd5d30eeb483b9bf159e5ca40b9a05ad6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 6 May 2022 22:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E=E5=A4=9A?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/System/Dto/MenuDto.cs      | 4 ++++
 ZR.Model/System/SysMenu.cs          | 6 +++++-
 ZR.Model/System/Vo/RouterVo.cs      | 8 ++++++++
 ZR.Service/System/SysMenuService.cs | 4 ++--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ZR.Model/System/Dto/MenuDto.cs b/ZR.Model/System/Dto/MenuDto.cs
index 76714b8..9b7492d 100644
--- a/ZR.Model/System/Dto/MenuDto.cs
+++ b/ZR.Model/System/Dto/MenuDto.cs
@@ -68,5 +68,9 @@ namespace ZR.Model.System.Dto
         /// 菜单图标
         /// </summary>
         public string icon { get; set; } = string.Empty;
+        /// <summary>
+        /// 翻译key
+        /// </summary>
+        public string MenuNameKey { get; set; }
     }
 }
diff --git a/ZR.Model/System/SysMenu.cs b/ZR.Model/System/SysMenu.cs
index b44da88..1a61890 100644
--- a/ZR.Model/System/SysMenu.cs
+++ b/ZR.Model/System/SysMenu.cs
@@ -80,7 +80,11 @@ namespace ZR.Model.System
         /// 菜单图标
         /// </summary>
         public string icon { get; set; } = string.Empty;
-
+        /// <summary>
+        /// 菜单名key
+        /// </summary>
+        [SugarColumn(ColumnName = "menuName_key")]
+        public string MenuNameKey { get; set; }
         /// <summary>
         /// 子菜单
         /// </summary>
diff --git a/ZR.Model/System/Vo/RouterVo.cs b/ZR.Model/System/Vo/RouterVo.cs
index 73b7399..d55e653 100644
--- a/ZR.Model/System/Vo/RouterVo.cs
+++ b/ZR.Model/System/Vo/RouterVo.cs
@@ -39,6 +39,7 @@ namespace ZR.Model.System.Vo
         /// 设置为true，则不会被 <keep-alive>缓存
         /// </summary>
         public bool NoCache { get; set; }
+        public string TitleKey { get; set; } = string.Empty;
 
         public Meta(string title, string icon, bool noCache)
         {
@@ -46,5 +47,12 @@ namespace ZR.Model.System.Vo
             Icon = icon;
             NoCache = noCache;
         }
+        public Meta(string title, string icon, bool noCache, string titleKey)
+        {
+            Title = title;
+            Icon = icon;
+            NoCache = noCache;
+            TitleKey = string.IsNullOrEmpty(titleKey) ? title : titleKey;
+        }
     }
 }
diff --git a/ZR.Service/System/SysMenuService.cs b/ZR.Service/System/SysMenuService.cs
index ac6da4e..a9fa525 100644
--- a/ZR.Service/System/SysMenuService.cs
+++ b/ZR.Service/System/SysMenuService.cs
@@ -273,7 +273,7 @@ namespace ZR.Service
                     Name = GetRouteName(menu),
                     Path = GetRoutePath(menu),
                     Component = GetComponent(menu),
-                    Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache))
+                    Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
                 };
 
                 List<SysMenu> cMenus = menu.children;
@@ -292,7 +292,7 @@ namespace ZR.Service
                         Path = menu.path,
                         Component = menu.component,
                         Name = string.IsNullOrEmpty(menu.path) ? "" : menu.path.ToLower(),
-                        Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache))
+                        Meta = new Meta(menu.MenuName, menu.icon, "1".Equals(menu.isCache), menu.MenuNameKey)
                     };
                     childrenList.Add(children);
                     router.Children = childrenList;