From 0d17a86c107d20ea93d373024f02bef6790a0d60 Mon Sep 17 00:00:00 2001
From: chenminjie <943130926@qq.com>
Date: Fri, 29 Nov 2024 19:33:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=20=E4=BD=BF=E7=94=A8accessMenus?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E7=94=A8=E6=88=B7=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-更新了用户存储以包含新的状态属性“accessMenus”，并添加了相应的操作来设置它。
-修改了codegen.data.ts，以利用ApiTreeSelect组件中的新accessMenus来改进菜单处理。
---
 .../src/components/form/components/api-radio-group.vue |  9 ---------
 .../src/components/form/components/api-select.vue      |  9 ---------
 .../src/components/form/components/api-tree-select.vue |  9 ---------
 apps/web-antd/src/store/auth.ts                        |  1 +
 apps/web-antd/src/views/infra/codegen/codegen.data.ts  | 10 +++++++++-
 packages/stores/src/modules/user.ts                    |  8 ++++++++
 6 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/apps/web-antd/src/components/form/components/api-radio-group.vue b/apps/web-antd/src/components/form/components/api-radio-group.vue
index 08f54347..d87e7445 100644
--- a/apps/web-antd/src/components/form/components/api-radio-group.vue
+++ b/apps/web-antd/src/components/form/components/api-radio-group.vue
@@ -123,15 +123,6 @@ watch(
   },
   { deep: true },
 );
-
-watch(
-  () => mValue.value,
-  (newValue) => {
-    if (typeof newValue === 'number') {
-      mValue.value = `${newValue}`;
-    }
-  },
-);
 </script>
 
 <template>
diff --git a/apps/web-antd/src/components/form/components/api-select.vue b/apps/web-antd/src/components/form/components/api-select.vue
index 8e4dbd98..4e6f1772 100644
--- a/apps/web-antd/src/components/form/components/api-select.vue
+++ b/apps/web-antd/src/components/form/components/api-select.vue
@@ -125,15 +125,6 @@ watch(
   },
   { deep: true },
 );
-
-watch(
-  () => mValue.value,
-  (newValue) => {
-    if (typeof newValue === 'number') {
-      mValue.value = `${newValue}`;
-    }
-  },
-);
 </script>
 
 <template>
diff --git a/apps/web-antd/src/components/form/components/api-tree-select.vue b/apps/web-antd/src/components/form/components/api-tree-select.vue
index 978cdca7..776ce772 100644
--- a/apps/web-antd/src/components/form/components/api-tree-select.vue
+++ b/apps/web-antd/src/components/form/components/api-tree-select.vue
@@ -119,15 +119,6 @@ watch(
   },
   { deep: true },
 );
-
-watch(
-  () => mValue.value,
-  (newValue) => {
-    if (typeof newValue === 'number') {
-      mValue.value = `${newValue}`;
-    }
-  },
-);
 </script>
 
 <template>
diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts
index c85f2404..aab24b20 100644
--- a/apps/web-antd/src/store/auth.ts
+++ b/apps/web-antd/src/store/auth.ts
@@ -111,6 +111,7 @@ export const useAuthStore = defineStore('auth', () => {
     authPermissionInfo = await getAuthPermissionInfoApi();
     userStore.setUserInfo(authPermissionInfo.user);
     userStore.setUserRoles(authPermissionInfo.roles);
+    userStore.setAccessMenus(authPermissionInfo.menus as []);
     accessStore.setAccessCodes(authPermissionInfo.permissions);
     return authPermissionInfo;
   }
diff --git a/apps/web-antd/src/views/infra/codegen/codegen.data.ts b/apps/web-antd/src/views/infra/codegen/codegen.data.ts
index 81db25aa..bc10fe24 100644
--- a/apps/web-antd/src/views/infra/codegen/codegen.data.ts
+++ b/apps/web-antd/src/views/infra/codegen/codegen.data.ts
@@ -2,6 +2,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { CodegenApi } from '#/api/infra/codegen';
 
 import { type VbenFormProps, z } from '@vben/common-ui';
+import { useUserStore } from '@vben/stores';
 
 import { getDataSourceConfigList } from '#/api/infra/data-source-config';
 import { $t } from '#/locales';
@@ -207,9 +208,16 @@ export namespace CodegenOptionsModalData {
       component: 'ApiTreeSelect',
       componentProps: {
         class: 'w-full',
+        api: () => {
+          const { accessMenus } = useUserStore();
+          return accessMenus;
+        },
+        labelField: 'name',
+        valueField: 'id',
         placeholder: '请选择上级菜单',
       },
-      rules: z.string().min(1, { message: '上级菜单不能为空' }),
+      rules: z.number().min(1, { message: '上级菜单不能为空' }),
+      defaultValue: null,
     },
     {
       label: '模块名',
diff --git a/packages/stores/src/modules/user.ts b/packages/stores/src/modules/user.ts
index ed88b9ff..90a82e5a 100644
--- a/packages/stores/src/modules/user.ts
+++ b/packages/stores/src/modules/user.ts
@@ -25,6 +25,10 @@ interface BasicUserInfo {
 }
 
 interface AccessState {
+  /**
+   * 用户菜单
+   */
+  accessMenus: [];
   /**
    * 用户信息
    */
@@ -40,6 +44,9 @@ interface AccessState {
  */
 export const useUserStore = defineStore('core-user', {
   actions: {
+    setAccessMenus(menus: []) {
+      this.accessMenus = menus;
+    },
     setUserInfo(userInfo: BasicUserInfo | null) {
       // 设置用户信息
       this.userInfo = userInfo;
@@ -56,6 +63,7 @@ export const useUserStore = defineStore('core-user', {
     pick: ['userInfo', 'userRoles'],
   },
   state: (): AccessState => ({
+    accessMenus: [],
     userInfo: null,
     userRoles: [],
   }),