From 7b20b68b6a00925ee7d79f738a0aa0e6da5d3354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BF=97=E7=A6=8F?= <fu5201314fu@qq.com>
Date: Tue, 15 Oct 2024 18:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=87=8C=E9=9D=A2=EF=BC=8C=E7=BC=96=E8=BE=91=E5=90=8E?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E6=96=B0=E5=A2=9E=E6=B2=A1=E6=9C=89=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0routerName=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=B8=BB=E8=8F=9C=E5=8D=95=E5=AF=BC=E8=88=AA=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/Menu/MenuGetListOutputDto.cs         |  2 +-
 .../Dtos/Menu/MenuGetOutputDto.cs             |  2 ++
 Yi.Pure.Vue3/src/views/system/menu/form.vue   | 19 +++++++++++++++++--
 .../src/views/system/menu/utils/hook.tsx      |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetListOutputDto.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetListOutputDto.cs
index a97c34af..261d7e00 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetListOutputDto.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetListOutputDto.cs
@@ -20,7 +20,7 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Menu
         public string? Remark { get; set; }
         public string? Component { get; set; }
         public string? Query { get; set; }
-
+        public string? RouterName { get; set; }
         public int OrderNum { get; set; }
         //public List<MenuEntity>? Children { get; set; }
     }
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetOutputDto.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetOutputDto.cs
index 764bdeda..9fba4947 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetOutputDto.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Menu/MenuGetOutputDto.cs
@@ -24,6 +24,8 @@ namespace Yi.Framework.Rbac.Application.Contracts.Dtos.Menu
 
         public int OrderNum { get; set; }
 
+        public string? RouterName { get; set; }
+
         //public List<MenuEntity>? Children { get; set; }
     }
 }
diff --git a/Yi.Pure.Vue3/src/views/system/menu/form.vue b/Yi.Pure.Vue3/src/views/system/menu/form.vue
index c00a71e1..cad2f4f3 100644
--- a/Yi.Pure.Vue3/src/views/system/menu/form.vue
+++ b/Yi.Pure.Vue3/src/views/system/menu/form.vue
@@ -91,13 +91,28 @@ defineExpose({ getRef });
       <re-col
         v-show="newFormInline.menuType !== 2"
         :value="24"
-        :xs="24"
-        :sm="24"
+        :xs="12"
+        :sm="12"
       >
         <el-form-item label="菜单图标">
           <IconSelect v-model="newFormInline.menuIcon" class="w-full" />
         </el-form-item>
       </re-col>
+      <re-col
+        v-show="newFormInline.menuType !== 2"
+        :value="24"
+        :xs="12"
+        :sm="12"
+      >
+        <el-form-item label="路由名称">
+          <el-input
+            v-model="newFormInline.routerName"
+            clearable
+            placeholder="请输入菜单名称"
+            class="w-full"
+          />
+        </el-form-item>
+      </re-col>
       <re-col :value="12" :xs="24" :sm="24">
         <el-form-item label="菜单名称" prop="menuName">
           <el-input
diff --git a/Yi.Pure.Vue3/src/views/system/menu/utils/hook.tsx b/Yi.Pure.Vue3/src/views/system/menu/utils/hook.tsx
index f2ef1cc5..69e9e18f 100644
--- a/Yi.Pure.Vue3/src/views/system/menu/utils/hook.tsx
+++ b/Yi.Pure.Vue3/src/views/system/menu/utils/hook.tsx
@@ -89,7 +89,7 @@ export function useMenu() {
     {
       label: "显示",
       prop: "isShow",
-      formatter: ({ isShow }) => (isShow ? "否" : "是"),
+      formatter: ({ isShow }) => (isShow ? "是" : "否"),
       width: 100
     },
     {