From 3938f1bdda73b6f3e84486ea9c4b466c8b388a54 Mon Sep 17 00:00:00 2001
From: chenminjie <943130926@qq.com>
Date: Fri, 29 Nov 2024 02:50:36 +0800
Subject: [PATCH 1/6] style: improve layout and styling of action-buttons
 component

---
 .../src/components/action-buttons/action-buttons.vue   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/components/action-buttons/action-buttons.vue b/apps/web-antd/src/components/action-buttons/action-buttons.vue
index 45f725b6..64b83318 100644
--- a/apps/web-antd/src/components/action-buttons/action-buttons.vue
+++ b/apps/web-antd/src/components/action-buttons/action-buttons.vue
@@ -160,22 +160,24 @@ const handleMenuClick = (e: any) => {
         </Button>
       </slot>
       <template #overlay>
-        <Menu @click="handleMenuClick">
+        <Menu class="w-full" @click="handleMenuClick">
           <MenuItem v-for="(action, index) in getDropdownList" :key="index">
             <template v-if="action.popConfirm">
               <Popconfirm v-bind="getPopConfirmProps(action.popConfirm)">
                 <template v-if="action.popConfirm.icon" #icon>
                   <IconifyIcon :icon="action.popConfirm.icon" />
                 </template>
-                <div>
+                <div class="flex items-center">
                   <IconifyIcon v-if="action.icon" :icon="action.icon" />
                   <span class="ml-1">{{ action.text }}</span>
                 </div>
               </Popconfirm>
             </template>
             <template v-else>
-              <IconifyIcon v-if="action.icon" :icon="action.icon" />
-              <span class="ml-1">{{ action.label }}</span>
+              <div class="flex items-center">
+                <IconifyIcon v-if="action.icon" :icon="action.icon" />
+                <span class="ml-1">{{ action.text }}</span>
+              </div>
             </template>
           </MenuItem>
         </Menu>

From 9f649b9565753b88c5517b5004d857f0a2b60069 Mon Sep 17 00:00:00 2001
From: chenminjie <943130926@qq.com>
Date: Fri, 29 Nov 2024 18:32:26 +0800
Subject: [PATCH 2/6] refactor: replace requestClient with useDictStore for
 fetching dictionary options in api-dict component

---
 .../web-antd/src/components/form/components/api-dict.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/components/form/components/api-dict.vue b/apps/web-antd/src/components/form/components/api-dict.vue
index 6b9f80db..109760ac 100644
--- a/apps/web-antd/src/components/form/components/api-dict.vue
+++ b/apps/web-antd/src/components/form/components/api-dict.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, type PropType } from 'vue';
 
-import { requestClient } from '#/api/request';
+import { useDictStore } from '@vben/stores';
 
 import { ApiCheckboxGroup, ApiRadioGroup, ApiSelect } from '..';
 
@@ -42,9 +42,10 @@ const DictComponent = computed(() => {
   return ApiSelect;
 });
 const fetch = () => {
-  return requestClient.post('/sys/dict/getByDictType', {
-    dictType: props.code,
-    ...props.params,
+  return new Promise<OptionsItem[]>((resolve) => {
+    const dict = useDictStore().getDictOptions(props.code!);
+    const options: OptionsItem[] = dict as OptionsItem[];
+    resolve(options);
   });
 };
 </script>

From 07c741f124d06cdf51f8255cd7dfa07a4e7c828d Mon Sep 17 00:00:00 2001
From: chenminjie <943130926@qq.com>
Date: Fri, 29 Nov 2024 18:34:00 +0800
Subject: [PATCH 3/6] feat: add number-to-string conversion in mValue watcher
 for api components

---
 .../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 +++++++++
 3 files changed, 27 insertions(+)

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 d87e7445..08f54347 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,6 +123,15 @@ 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 4e6f1772..8e4dbd98 100644
--- a/apps/web-antd/src/components/form/components/api-select.vue
+++ b/apps/web-antd/src/components/form/components/api-select.vue
@@ -125,6 +125,15 @@ 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 776ce772..978cdca7 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,6 +119,15 @@ watch(
   },
   { deep: true },
 );
+
+watch(
+  () => mValue.value,
+  (newValue) => {
+    if (typeof newValue === 'number') {
+      mValue.value = `${newValue}`;
+    }
+  },
+);
 </script>
 
 <template>

From 3e0c0af1195ea462f20acd56901f25f15de2fffa Mon Sep 17 00:00:00 2001
From: chenminjie <943130926@qq.com>
Date: Fri, 29 Nov 2024 18:34:24 +0800
Subject: [PATCH 4/6] refactor: change Select component to ApiDict for improved
 dictionary handling in post data schema

---
 apps/web-antd/src/views/system/post/post.data.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web-antd/src/views/system/post/post.data.ts b/apps/web-antd/src/views/system/post/post.data.ts
index 05e94fef..618e165c 100644
--- a/apps/web-antd/src/views/system/post/post.data.ts
+++ b/apps/web-antd/src/views/system/post/post.data.ts
@@ -79,9 +79,9 @@ export const modalSchema: VbenFormSchema[] = [
     rules: 'required',
   },
   {
-    component: 'Select',
+    component: 'ApiDict',
     componentProps: {
-      options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      code: DICT_TYPE.COMMON_STATUS,
     },
     fieldName: 'status',
     label: '状态',

From 2b04e1e4ef3855b384e996dfb1e2740d26e43e9d Mon Sep 17 00:00:00 2001
From: chenminjie <943130926@qq.com>
Date: Fri, 29 Nov 2024 18:37:15 +0800
Subject: [PATCH 5/6] feat: add CodegenOptionsModal for editing code generation
 configurations

- Introduced a new modal component for modifying code generation settings.
- Updated codegen.data.ts to include form schema for the new modal.
---
 .../src/views/infra/codegen/codegen.data.ts   | 133 +++++++++++++++++-
 .../components/codegen-options-modal.vue      |  37 +++++
 .../src/views/infra/codegen/index.vue         |  25 ++--
 3 files changed, 185 insertions(+), 10 deletions(-)
 create mode 100644 apps/web-antd/src/views/infra/codegen/components/codegen-options-modal.vue

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 6eab7731..81db25aa 100644
--- a/apps/web-antd/src/views/infra/codegen/codegen.data.ts
+++ b/apps/web-antd/src/views/infra/codegen/codegen.data.ts
@@ -1,10 +1,11 @@
-import type { VbenFormProps } from '@vben/common-ui';
-
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { CodegenApi } from '#/api/infra/codegen';
 
+import { type VbenFormProps, z } from '@vben/common-ui';
+
 import { getDataSourceConfigList } from '#/api/infra/data-source-config';
 import { $t } from '#/locales';
+import { DICT_TYPE } from '#/utils/dict';
 
 export namespace CodegenDefaultData {
   /**
@@ -114,3 +115,131 @@ export namespace CodegenImportTableModalData {
     },
   ];
 }
+
+//* ****************************** CodegenOptionsModal.vue *******************************//
+export namespace CodegenOptionsModalData {
+  export const formSchema: VbenFormProps['schema'] = [
+    {
+      label: '表名称',
+      fieldName: 'tableName',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入表名称',
+      },
+      rules: z.string().min(1, { message: '表名称不能为空' }),
+    },
+    {
+      label: '表描述',
+      fieldName: 'tableComment',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入表描述',
+      },
+      rules: z.string().min(1, { message: '表描述不能为空' }),
+    },
+    {
+      label: '实体类名',
+      fieldName: 'className',
+      component: 'Input',
+      rules: z.string().min(1, { message: '实体类名不能为空' }),
+      componentProps: {
+        tooltip:
+          '默认去除表名的前缀。如果存在重复，则需要手动添加前缀，避免 MyBatis 报 Alias 重复的问题。',
+        placeholder: '请输入实体类名',
+      },
+    },
+    {
+      label: '作者',
+      fieldName: 'author',
+      component: 'Input',
+      rules: z.string().min(1, { message: '作者不能为空' }),
+      componentProps: {
+        placeholder: '请输入作者',
+      },
+    },
+    {
+      label: '备注',
+      fieldName: 'remark',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入备注',
+      },
+    },
+    {
+      label: '生成模版',
+      fieldName: 'template',
+      component: 'ApiDict',
+      componentProps: {
+        code: DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE,
+        class: 'w-full',
+        placeholder: '请选择生成模版',
+      },
+      rules: z.string().min(1, { message: '生成模版不能为空' }),
+      defaultValue: '1',
+    },
+    {
+      label: '前端类型',
+      fieldName: 'frontType',
+      component: 'ApiDict',
+      componentProps: {
+        code: DICT_TYPE.INFRA_CODEGEN_FRONT_TYPE,
+        class: 'w-full',
+        placeholder: '请选择前端类型',
+      },
+      rules: z.string().min(1, { message: '前端类型不能为空' }),
+      defaultValue: '31',
+    },
+    {
+      label: '生成场景',
+      fieldName: 'scene',
+      component: 'ApiDict',
+      componentProps: {
+        code: DICT_TYPE.INFRA_CODEGEN_SCENE,
+        class: 'w-full',
+        placeholder: '请选择生成场景',
+      },
+      rules: z.string().min(1, { message: '生成场景不能为空' }),
+      defaultValue: '1',
+    },
+    {
+      label: '上级菜单',
+      fieldName: 'parentMenuId',
+      component: 'ApiTreeSelect',
+      componentProps: {
+        class: 'w-full',
+        placeholder: '请选择上级菜单',
+      },
+      rules: z.string().min(1, { message: '上级菜单不能为空' }),
+    },
+    {
+      label: '模块名',
+      fieldName: 'moduleName',
+      component: 'Input',
+      rules: z.string().min(1, { message: '模块名不能为空' }),
+      componentProps: {
+        placeholder: '请输入模块名',
+      },
+    },
+    {
+      label: '业务名',
+      fieldName: 'businessName',
+      component: 'Input',
+      rules: z.string().min(1, { message: '业务名不能为空' }),
+      componentProps: {
+        placeholder: '请输入业务名',
+      },
+    },
+    {
+      label: '类名',
+      fieldName: 'className',
+      component: 'Input',
+      rules: z.string().min(1, { message: '类名不能为空' }),
+    },
+    {
+      label: '类描述',
+      fieldName: 'classComment',
+      component: 'Input',
+      rules: z.string().min(1, { message: '类描述不能为空' }),
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/infra/codegen/components/codegen-options-modal.vue b/apps/web-antd/src/views/infra/codegen/components/codegen-options-modal.vue
new file mode 100644
index 00000000..415c973e
--- /dev/null
+++ b/apps/web-antd/src/views/infra/codegen/components/codegen-options-modal.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { useVbenForm, useVbenModal } from '@vben/common-ui';
+
+import { CodegenOptionsModalData } from '../codegen.data';
+
+defineOptions({
+  name: 'CodegenOptionsModal',
+});
+
+// 使用表单组件
+const [Form] = useVbenForm({
+  commonConfig: {
+    labelWidth: 120,
+    wrapperClass: 'w-full',
+  },
+  schema: CodegenOptionsModalData.formSchema,
+  // 大屏一行显示3个，中屏一行显示2个，小屏一行显示1个
+  wrapperClass: 'grid-cols-1 md:grid-cols-2',
+});
+
+// 使用弹窗组件
+const [Modal] = useVbenModal({
+  title: '修改代码生成配置',
+  class: 'w-[90%] h-[90%]',
+  onOpenChange(isOpen) {
+    if (isOpen) {
+      // TODO: 打开弹窗
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal>
+    <Form />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/infra/codegen/index.vue b/apps/web-antd/src/views/infra/codegen/index.vue
index 67bf7cec..43959977 100644
--- a/apps/web-antd/src/views/infra/codegen/index.vue
+++ b/apps/web-antd/src/views/infra/codegen/index.vue
@@ -16,13 +16,6 @@ import { CodegenDefaultData } from './codegen.data';
 // checked
 const checkedStatus = ref<boolean>(false);
 
-/**
- * 编辑
- */
-const handleEdit = (_row: CodegenApi.CodegenTableRespVO) => {
-  // console.log('编辑', row);
-};
-
 /**
  * 删除
  */
@@ -145,6 +138,13 @@ const [PreviewCodeModal, previewCodeModalApi] = useVbenModal({
   ),
 });
 
+// 使用修改代码生成配置弹窗组件
+const [CodegenOptionsModal, codegenOptionsModalApi] = useVbenModal({
+  connectedComponent: defineAsyncComponent(
+    () => import('./components/codegen-options-modal.vue'),
+  ),
+});
+
 /**
  * 打开导入表弹窗
  */
@@ -159,6 +159,14 @@ const handleOpenPreviewCodeModal = (row: CodegenApi.CodegenTableRespVO) => {
   previewCodeModalApi.setData(row);
   previewCodeModalApi.open();
 };
+
+/**
+ * 打开修改代码生成配置弹窗
+ */
+const handleOpenCodegenOptionsModal = (row: CodegenApi.CodegenTableRespVO) => {
+  codegenOptionsModalApi.setData(row);
+  codegenOptionsModalApi.open();
+};
 </script>
 
 <template>
@@ -214,7 +222,7 @@ const handleOpenPreviewCodeModal = (row: CodegenApi.CodegenTableRespVO) => {
               type: 'link',
               label: '编辑',
               icon: 'ant-design:edit-outlined',
-              onClick: handleEdit.bind(null, row),
+              onClick: handleOpenCodegenOptionsModal.bind(null, row),
             },
             {
               type: 'link',
@@ -241,5 +249,6 @@ const handleOpenPreviewCodeModal = (row: CodegenApi.CodegenTableRespVO) => {
     </Grid>
     <ImportTableModal />
     <PreviewCodeModal />
+    <CodegenOptionsModal />
   </Page>
 </template>

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 6/6] =?UTF-8?q?refactor:=20=20=E4=BD=BF=E7=94=A8accessMenu?=
 =?UTF-8?q?s=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: [],
   }),