From 658339047ce77f975c2d945ea8e8b08d95774de9 Mon Sep 17 00:00:00 2001
From: Dev Po <448443959@qq.com>
Date: Sat, 5 Oct 2024 20:19:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?.gitignore=E6=8E=92=E9=99=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=9B=AE=E5=BD=95=E5=92=8Cdb=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b8bc0399..247d64e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,3 +271,5 @@ dist
 /Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Production.json
 database_backup
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Staging.json
+/Yi.Abp.Net8/src/Yi.Abp.Web/logs/all
+/Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db

From 09b0bd8b09f5edbe4106a6bb686fe383e43979f3 Mon Sep 17 00:00:00 2001
From: Po <448443959@qq.com>
Date: Sun, 6 Oct 2024 22:40:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Pure=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=8B=E4=BA=88=E6=9D=83=E9=99=90=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                        | 3 ++-
 Yi.Pure.Vue3/src/api/system/menu.ts               | 4 ++--
 Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 247d64e7..400cf6c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -271,5 +271,6 @@ dist
 /Yi.Abp.Net8/test/Yi.Abp.Test/appsettings.Production.json
 database_backup
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Staging.json
-/Yi.Abp.Net8/src/Yi.Abp.Web/logs/all
+/Yi.Abp.Net8/src/Yi.Abp.Web/logs/
 /Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db
+
diff --git a/Yi.Pure.Vue3/src/api/system/menu.ts b/Yi.Pure.Vue3/src/api/system/menu.ts
index a808153b..5d164f36 100644
--- a/Yi.Pure.Vue3/src/api/system/menu.ts
+++ b/Yi.Pure.Vue3/src/api/system/menu.ts
@@ -2,8 +2,8 @@
 import type { Result, ResultPage } from "@/api/result";
 
 /** 查询菜单下拉树结构 */
-export const getMenuOption = () => {
-  return http.request<ResultPage>("get", `/menu`, {});
+export const getMenuOption = menusource => {
+  return http.request<ResultPage>("get", `/menu`, { params: menusource });
 };
 
 /** 查询菜单列表 */
diff --git a/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx b/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx
index 6945190a..d94ccc27 100644
--- a/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx
+++ b/Yi.Pure.Vue3/src/views/system/role/utils/hook.tsx
@@ -294,7 +294,7 @@ export function useRole(treeRef: Ref) {
 
   onMounted(async () => {
     onSearch();
-    const data = (await getMenuOption()).data.items;
+    const data = (await getMenuOption({ menusource: "pure" })).data.items;
     treeIds.value = getKeyList(data, "id");
     treeData.value = handleTree(data);
   });