Эх сурвалжийг харах

菜单数据,把meta的字段移动到上级平级

lichunlei 1 сар өмнө
parent
commit
266d950251

+ 20 - 2
Model/Base/SysMenu.cs

@@ -127,8 +127,8 @@ namespace Model
         [SugarColumn(ColumnDescription = "删除标志,0未删除,1已删除", Length = 1, ColumnName = "del_flag")]
         public string? DelFlag { get; set; }
 
-        [SugarColumn(IsIgnore = true)]
-        public TreeSelectMeta meta { get; set; }
+        // [SugarColumn(IsIgnore = true)]
+        // public TreeSelectMeta meta { get; set; }
 
         [SugarColumn(IsIgnore = true)]
         public long id { get; set; }
@@ -155,5 +155,23 @@ namespace Model
                 return subNum > 0 || children.Count > 0;
             }
         }
+
+
+
+        
+        [SugarColumn(IsIgnore = true)]
+        public string title { get; set; }
+        
+        [SugarColumn(IsIgnore = true)]
+        public List<string> roles { get; set; }
+        
+        [SugarColumn(IsIgnore = true)]
+        public List<string> auths { get; set; }
+        
+        [SugarColumn(IsIgnore = true)]
+        public bool isShow { get; set; }
+        
+        [SugarColumn(IsIgnore = true)]
+        public bool isKeepAlive { get; set; }
     }
 }

+ 14 - 7
Model/Vo/Base/LeftMenuVo.cs

@@ -20,8 +20,15 @@ namespace Vo
         public string MenuType { get; set; }
         public string Path { get; set; }
         public int SortOrder { get; set; }
-        public TreeSelectMeta meta { get; set; }
+        // public TreeSelectMeta meta { get; set; }
         public List<string> Permission { get; set; }
+        public string title { get; set; }
+        public string enName { get; set; }
+        public string icon { get; set; }
+        public List<string> roles { get; set; }
+        public List<string> auths { get; set; }
+        public bool isShow { get; set; }
+        public bool isKeepAlive { get; set; }
 
         public LeftMenuVo() { }
 
@@ -33,12 +40,12 @@ namespace Vo
             MenuType = menu.menuType;
             Path = menu.path;
             SortOrder = menu.sortOrder;
-            meta = new TreeSelectMeta();
-            meta.title = menu.name;
-            meta.enName = menu.enName;
-            meta.icon = menu.icon;
-            meta.isShow = menu.visible == "1";
-            meta.isKeepAlive = menu.keepAlive == "1";
+            // meta = new TreeSelectMeta();
+            title = menu.name;
+            enName = menu.enName;
+            icon = menu.icon;
+            isShow = menu.visible == "1";
+            isKeepAlive = menu.keepAlive == "1";
             Permission = new List<string>();
 
             List<LeftMenuVo> child = new List<LeftMenuVo>();

+ 24 - 17
Model/Vo/Base/TreeSelectVo.cs

@@ -20,8 +20,15 @@ namespace Vo
         public string MenuType { get; set; }
         public string Path { get; set; }
         public int SortOrder { get; set; }
-        public TreeSelectMeta meta { get; set; }
+        // public TreeSelectMeta meta { get; set; }
         public string Permission { get; set; }
+        public string title { get; set; }
+        public string enName { get; set; }
+        public string icon { get; set; }
+        public List<string> roles { get; set; }
+        public List<string> auths { get; set; }
+        public bool isShow { get; set; }
+        public bool isKeepAlive { get; set; }
 
         public TreeSelectVo() { }
 
@@ -33,12 +40,12 @@ namespace Vo
             MenuType = menu.menuType;
             Path = menu.path;
             SortOrder = menu.sortOrder;
-            meta = new TreeSelectMeta();
-            meta.title = menu.name;
-            meta.enName = menu.enName;
-            meta.icon = menu.icon;
-            meta.isShow = menu.visible == "1";
-            meta.isKeepAlive = menu.keepAlive == "1";
+            // meta = new TreeSelectMeta();
+            title = menu.name;
+            enName = menu.enName;
+            icon = menu.icon;
+            isShow = menu.visible == "1";
+            isKeepAlive = menu.keepAlive == "1";
             // Permission = new List<string>();
             Permission = menu.permission;
 
@@ -76,14 +83,14 @@ namespace Vo
         public List<TreeSelectVo> Children { get; set; }
     }
 
-    public class TreeSelectMeta
-    {
-        public string title { get; set; }
-        public string enName { get; set; }
-        public string icon { get; set; }
-        public List<string> roles { get; set; }
-        public List<string> auths { get; set; }
-        public bool isShow { get; set; }
-        public bool isKeepAlive { get; set; }
-    }
+    // public class TreeSelectMeta
+    // {
+    //     public string title { get; set; }
+    //     public string enName { get; set; }
+    //     public string icon { get; set; }
+    //     public List<string> roles { get; set; }
+    //     public List<string> auths { get; set; }
+    //     public bool isShow { get; set; }
+    //     public bool isKeepAlive { get; set; }
+    // }
 }

+ 3 - 3
Services/Base/SysMenuService.cs

@@ -439,9 +439,9 @@ namespace Services
             //得到子节点列表
             List<SysMenu> childList = GetChildList(list, t);
             t.children = childList;
-            t.meta = new TreeSelectMeta();
-            t.meta.title = t.name;
-            t.meta.icon = t.icon;
+            // t.meta = new TreeSelectMeta();
+            t.title = t.name;
+            t.icon = t.icon;
             t.id = t.menuId;
             foreach (var item in childList)
             {