From 9e7f0bca50b3ad1c953c1349915dddb0319dad1f Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Sun, 13 Aug 2023 10:39:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/menu/index.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index 1864380..a89de39 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -65,6 +65,15 @@
             </div>
           </span>
 
+          <span slot="visible" slot-scope="text">
+            <div v-if="text == 'Y'">
+              <a-tag color="green">可视</a-tag>
+            </div>
+            <div v-if="text == 'N'">
+              <a-tag color="#808080">隐藏</a-tag>
+            </div>
+          </span>
+
           <span slot="action" slot-scope="text, record">
             <template>
               <a v-if="hasPerm('sysMenu:edit')" @click="$refs.editForm.edit(record)">编辑</a>
@@ -126,6 +135,11 @@
                         width: '20%',
                         ellipsis: true
                     },
+                    {
+                        title: '可视',
+                        dataIndex: 'visible',
+                        scopedSlots: { customRender: 'visible' }
+                    },
                     {
                         title: '路由地址',
                         dataIndex: 'router',
-- 
Gitee


From 4c45c80e9a6532962dc7f9b62a4baad680310007 Mon Sep 17 00:00:00 2001
From: yzp <yzp0755@qq.com>
Date: Sun, 13 Aug 2023 10:58:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/Magic.Core/Service/Menu/SysMenuService.cs |  8 ++++----
 frontend/src/views/system/menu/index.vue          | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/Magic.Core/Service/Menu/SysMenuService.cs b/backend/Magic.Core/Service/Menu/SysMenuService.cs
index 4885bb3..e6eabf3 100644
--- a/backend/Magic.Core/Service/Menu/SysMenuService.cs
+++ b/backend/Magic.Core/Service/Menu/SysMenuService.cs
@@ -1,4 +1,4 @@
-
+
 
 using Furion.DependencyInjection;
 using Furion.DynamicApiController;
@@ -104,8 +104,8 @@ public class SysMenuService : ISysMenuService
                 sysMenuList = await _sysMenuRep
                                                .Where(u => u.Status == (int)CommonStatus.ENABLE)
                                                .WhereIF(!string.IsNullOrWhiteSpace(appCode), u => u.Application == appCode)
-                                               .Where(u => u.Type != (int)MenuType.BTN)
-                                               //.Where(u => u.Weight != (int)MenuWeight.DEFAULT_WEIGHT)
+                                               .Where(u => u.Type != (int)MenuType.BTN && u.Type != (int)MenuType.API)
+                                               //.Where(u => u.Weight != (int)MenuWeight.DEFAULT_WEIGHT)
                                                .OrderBy(u => u.Sort).ToListAsync();
             }
             else
@@ -117,7 +117,7 @@ public class SysMenuService : ISysMenuService
                                                .Where(u => menuIdList.Contains(u.Id))
                                                .Where(u => u.Status == (int)CommonStatus.ENABLE)
                                                .WhereIF(!string.IsNullOrWhiteSpace(appCode), u => u.Application == appCode)
-                                               .Where(u => u.Type != (int)MenuType.BTN)
+                                               .Where(u => u.Type != (int)MenuType.BTN && u.Type != (int)MenuType.API)
                                                .OrderBy(u => u.Sort).ToListAsync();
             }
             // 转换成登录菜单
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index a89de39..92c2316 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -135,11 +135,6 @@
                         width: '20%',
                         ellipsis: true
                     },
-                    {
-                        title: '可视',
-                        dataIndex: 'visible',
-                        scopedSlots: { customRender: 'visible' }
-                    },
                     {
                         title: '路由地址',
                         dataIndex: 'router',
@@ -149,7 +144,12 @@
                     {
                         title: '排序',
                         dataIndex: 'sort'
-                    }
+                    },
+                    {
+                        title: '可视',
+                        dataIndex: 'visible',
+                        scopedSlots: { customRender: 'visible' }
+                    },
                 ],
                 appColumns: [{
                     title: '应用名称',
-- 
Gitee