From 69b1a133b1a7c4123f0e10019ce583afbdd1a954 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Sat, 5 Oct 2024 21:04:44 +0800
Subject: [PATCH] chore: menu

---
 apps/web-antd/src/views/system/menu/data.tsx  | 10 +++++++++-
 apps/web-antd/src/views/system/menu/index.vue |  7 +++++--
 apps/web-antd/src/views/system/role/index.vue |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/web-antd/src/views/system/menu/data.tsx b/apps/web-antd/src/views/system/menu/data.tsx
index d81c7a0e..8c964a77 100644
--- a/apps/web-antd/src/views/system/menu/data.tsx
+++ b/apps/web-antd/src/views/system/menu/data.tsx
@@ -82,7 +82,15 @@ export const columns: VxeGridProps['columns'] = [
     slots: {
       default: ({ row }) => {
         const current = menuTypes[row.menuType as 'C' | 'F' | 'M'];
-        return current as any;
+        if (!current) {
+          return '未知';
+        }
+        return (
+          <span class={['flex', 'items-center', 'justify-center']}>
+            {renderIcon(current.icon)}
+            <span style={{ marginLeft: '2px' }}>{current.value}</span>
+          </span>
+        );
       },
     },
   },
diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue
index b9e68991..c8da8694 100644
--- a/apps/web-antd/src/views/system/menu/index.vue
+++ b/apps/web-antd/src/views/system/menu/index.vue
@@ -13,6 +13,9 @@ import { columns, querySchema } from './data';
 import menuDrawer from './menu-drawer.vue';
 
 const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+  },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
 };
@@ -70,7 +73,7 @@ async function handleEdit(record: Recordable<any>) {
 
 async function handleDelete(row: Recordable<any>) {
   await menuRemove(row.menuId);
-  await tableApi.reload();
+  await tableApi.query();
 }
 
 function expandAll() {
@@ -133,6 +136,6 @@ function collapseAll() {
         </Space>
       </template>
     </BasicTable>
-    <MenuDrawer @reload="tableApi.reload()" />
+    <MenuDrawer @reload="tableApi.query()" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/system/role/index.vue b/apps/web-antd/src/views/system/role/index.vue
index ba120f9d..44c54b3d 100644
--- a/apps/web-antd/src/views/system/role/index.vue
+++ b/apps/web-antd/src/views/system/role/index.vue
@@ -38,6 +38,9 @@ import roleAuthModal from './role-auth-modal.vue';
 import roleDrawer from './role-drawer.vue';
 
 const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+  },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
 };