diff --git a/client/src/composables/useTableScroll.ts b/client/src/composables/useTableScroll.ts
index 875ee2e..12b6dcd 100644
--- a/client/src/composables/useTableScroll.ts
+++ b/client/src/composables/useTableScroll.ts
@@ -1,49 +1,56 @@
-import { ref, onMounted, onBeforeUnmount } from 'vue';
+import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue';
 
 /**
- * 监听表格父容器高度，动态计算 a-table 的 scroll.y。
- * 自动测量 a-table 内部的分页器高度，从而得到准确的 tbody 高度。
+ * 正确计算 AntDV a-table 的 scroll.y 高度。
+ * 核心逻辑：scroll.y = 外层容器总高 - 表头真实高度 - 分页器真实高度
  */
-export function useTableScroll(minHeight = 120) {
+export function useTableScroll(minHeight = 100) {
 	const wrapperRef = ref<HTMLElement | null>(null);
 	const tableHeight = ref<number>(minHeight);
 	let observer: ResizeObserver | null = null;
 
 	function update() {
 		if (!wrapperRef.value) return;
+
 		const wrapperHeight = wrapperRef.value.clientHeight;
 
-		// 动态获取分页器高度（如果存在）
+		// 动态获取表头和分页器的真实高度
+		const headerEl = wrapperRef.value.querySelector('.ant-table-thead') as HTMLElement | null;
 		const paginationEl = wrapperRef.value.querySelector('.ant-table-pagination') as HTMLElement | null;
+
+		const headerHeight = headerEl ? headerEl.offsetHeight : 55; // 55 为兜底
 		const paginationHeight = paginationEl ? paginationEl.offsetHeight : 0;
 
-		// scroll.y = 容器总高 - 分页器高度（表头由 a-table 自动固定，无需扣除）
-		const tbodyHeight = wrapperHeight - paginationHeight;
+		// 计算 tbody 的高度
+		const tbodyHeight = wrapperHeight - headerHeight - paginationHeight;
 		tableHeight.value = Math.max(tbodyHeight, minHeight);
 	}
 
-	onMounted(() => {
+	onMounted(async () => {
 		if (!wrapperRef.value) return;
+		
+		// 等待 DOM 渲染完成后再测量
+		await nextTick();
+		
 		observer = new ResizeObserver(update);
 		observer.observe(wrapperRef.value);
-
-		// 初始测量
+		
+		// 初始计算
 		update();
-
-		// MutationObserver 用于监听分页器的动态添加/移除
+		
+		// 使用 MutationObserver 监听 DOM 变化（比如数据加载后表头/分页器出现）
 		const mutationObserver = new MutationObserver(() => {
 			update();
 		});
 		mutationObserver.observe(wrapperRef.value, { childList: true, subtree: true });
-		// 保存以便卸载时使用
-		(wrapperRef.value as any).__mutationObserver = mutationObserver;
+		(wrapperRef.value as any).__mo = mutationObserver;
 	});
 
 	onBeforeUnmount(() => {
 		observer?.disconnect();
 		observer = null;
-		if (wrapperRef.value && (wrapperRef.value as any).__mutationObserver) {
-			(wrapperRef.value as any).__mutationObserver.disconnect();
+		if (wrapperRef.value && (wrapperRef.value as any).__mo) {
+			(wrapperRef.value as any).__mo.disconnect();
 		}
 	});
 
diff --git a/client/src/views/system/menu/index.vue b/client/src/views/system/menu/index.vue
index 7809b26..bb51dd0 100644
--- a/client/src/views/system/menu/index.vue
+++ b/client/src/views/system/menu/index.vue
@@ -3,86 +3,59 @@
 		<a-card title="菜单管理">
 			<template #extra>
 				<a-button type="primary" @click="handleAdd()">
-					<template #icon><PlusOutlined /></template>
+					<template #icon>
+						<PlusOutlined />
+					</template>
 					新增菜单
 				</a-button>
 			</template>
 
 			<div class="table-wrapper" ref="wrapperRef">
-			<a-table
-				:columns="columns"
-				:data-source="menuList"
-				:loading="loading"
-				:pagination="false"
-				row-key="id"
-				:scroll="{ x: 'max-content', y: tableHeight }"
-				:expandable="{
-					defaultExpandAllRows: false,
-					showExpandColumn: true,
-				}"
-			>
-				<template #bodyCell="{ column, record }">
-					<template v-if="column.dataIndex === 'menuType'">
-						<a-tag :color="record.menuType === 1 ? 'blue' : 'green'">
-							{{ record.menuType === 1 ? '目录' : '菜单' }}
-						</a-tag>
-					</template>
+				<a-table :columns="columns" :data-source="menuList" :loading="loading" :pagination="false" row-key="id"
+					:scroll="{ x: 'max-content', y: tableHeight }" :expandable="{
+						defaultExpandAllRows: false,
+						showExpandColumn: true,
+					}">
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'menuType'">
+							<a-tag :color="record.menuType === 1 ? 'blue' : 'green'">
+								{{ record.menuType === 1 ? '目录' : '菜单' }}
+							</a-tag>
+						</template>
 
-					<template v-else-if="column.dataIndex === 'visible'">
-						<a-tag :color="record.visible === 1 ? 'success' : 'default'">
-							{{ record.visible === 1 ? '显示' : '隐藏' }}
-						</a-tag>
-					</template>
+						<template v-else-if="column.dataIndex === 'visible'">
+							<a-tag :color="record.visible === 1 ? 'success' : 'default'">
+								{{ record.visible === 1 ? '显示' : '隐藏' }}
+							</a-tag>
+						</template>
 
-					<template v-else-if="column.key === 'action'">
-						<a-space>
-							<a-button type="link" size="small" @click="handleAdd(record)">
-								<PlusOutlined />新增子菜单
-							</a-button>
-							<a-button type="link" size="small" @click="handleEdit(record)">
-								<EditOutlined />编辑
-							</a-button>
-							<a-popconfirm
-								title="确定删除该菜单？"
-								ok-text="确定"
-								cancel-text="取消"
-								@confirm="handleDelete(record)"
-							>
-								<a-button type="link" size="small" danger>
-									<DeleteOutlined />删除
+						<template v-else-if="column.key === 'action'">
+							<a-space>
+								<a-button type="link" size="small" @click="handleAdd(record)">
+									<PlusOutlined />新增子菜单
 								</a-button>
-							</a-popconfirm>
-						</a-space>
+								<a-button type="link" size="small" @click="handleEdit(record)">
+									<EditOutlined />编辑
+								</a-button>
+								<a-popconfirm title="确定删除该菜单？" ok-text="确定" cancel-text="取消" @confirm="handleDelete(record)">
+									<a-button type="link" size="small" danger>
+										<DeleteOutlined />删除
+									</a-button>
+								</a-popconfirm>
+							</a-space>
+						</template>
 					</template>
-				</template>
-			</a-table>
+				</a-table>
 			</div>
 		</a-card>
 
-		<a-modal
-			v-model:open="modalVisible"
-			:title="modalTitle"
-			:confirm-loading="modalLoading"
-			width="640px"
-			@ok="handleSubmit"
-			@cancel="handleCancel"
-		>
-			<a-form
-				ref="formRef"
-				:model="formData"
-				:rules="formRules"
-				:label-col="{ span: 6 }"
-				:wrapper-col="{ span: 16 }"
-			>
+		<a-modal v-model:open="modalVisible" :title="modalTitle" :confirm-loading="modalLoading" width="640px"
+			@ok="handleSubmit" @cancel="handleCancel">
+			<a-form ref="formRef" :model="formData" :rules="formRules" :label-col="{ span: 6 }" :wrapper-col="{ span: 16 }">
 				<a-form-item label="上级菜单" name="parentId">
-					<a-tree-select
-						v-model:value="formData.parentId"
-						:tree-data="parentOptions"
-						:field-names="{ label: 'menuName', value: 'id', children: 'children' }"
-						allow-clear
-						tree-default-expand-all
-						placeholder="请选择上级菜单"
-					/>
+					<a-tree-select v-model:value="formData.parentId" :tree-data="parentOptions"
+						:field-names="{ label: 'menuName', value: 'id', children: 'children' }" allow-clear tree-default-expand-all
+						placeholder="请选择上级菜单" />
 				</a-form-item>
 
 				<a-form-item label="菜单类型" name="menuType">
@@ -117,12 +90,8 @@
 				</a-form-item>
 
 				<a-form-item label="可见性" name="visible">
-					<a-switch
-						:checked="formData.visible === 1"
-						checked-children="显示"
-						un-checked-children="隐藏"
-						@change="(checked: boolean) => (formData.visible = checked ? 1 : 0)"
-					/>
+					<a-switch :checked="formData.visible === 1" checked-children="显示" un-checked-children="隐藏"
+						@change="(checked: boolean) => (formData.visible = checked ? 1 : 0)" />
 				</a-form-item>
 			</a-form>
 		</a-modal>
@@ -136,7 +105,7 @@ import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vu
 import { menuApi } from '@/api/menu';
 import { useTableScroll } from '@/composables/useTableScroll';
 
-const { wrapperRef, tableHeight } = useTableScroll({ paginationHeight: 0 });
+const { wrapperRef, tableHeight } = useTableScroll();
 
 interface MenuItem {
 	id: number;