From f4eac7b8042f7e940ecc7794aa9e2951e46837fa Mon Sep 17 00:00:00 2001
From: wangziqi <wangziqi@gongxue100.com>
Date: Mon, 6 Jul 2026 16:10:33 +0800
Subject: [PATCH] fix: add scroll.x='max-content' to 15 tables, widen narrow
 columns to prevent header wrapping

---
 apps/admin/src/pages/Attendance/index.tsx       | 2 +-
 apps/admin/src/pages/Bills/index.tsx            | 2 +-
 apps/admin/src/pages/Classes/index.tsx          | 3 ++-
 apps/admin/src/pages/ClassroomRentals/index.tsx | 2 +-
 apps/admin/src/pages/Classrooms/index.tsx       | 2 +-
 apps/admin/src/pages/Departments/index.tsx      | 1 +
 apps/admin/src/pages/Deposits/index.tsx         | 4 ++--
 apps/admin/src/pages/Expenses/index.tsx         | 4 ++--
 apps/admin/src/pages/Occupancies/index.tsx      | 4 ++--
 apps/admin/src/pages/OperationLogs/index.tsx    | 8 ++++----
 apps/admin/src/pages/Roles/index.tsx            | 2 +-
 apps/admin/src/pages/Rooms/index.tsx            | 8 ++++----
 apps/admin/src/pages/Students/index.tsx         | 6 +++---
 apps/admin/src/pages/Teachers/index.tsx         | 6 +++---
 apps/admin/src/pages/Tenants/index.tsx          | 2 +-
 apps/admin/src/pages/Users/index.tsx            | 2 +-
 16 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/apps/admin/src/pages/Attendance/index.tsx b/apps/admin/src/pages/Attendance/index.tsx
index be6bd79..85b0d68 100644
--- a/apps/admin/src/pages/Attendance/index.tsx
+++ b/apps/admin/src/pages/Attendance/index.tsx
@@ -691,7 +691,7 @@ const AttendancePage: React.FC = () => {
                     columns={columns}
                     dataSource={records}
                     loading={loading}
-                    scroll={{ x: 1100 }}
+                    scroll={{ x: 'max-content' }}
                     pagination={{
                       current: page,
                       pageSize,
diff --git a/apps/admin/src/pages/Bills/index.tsx b/apps/admin/src/pages/Bills/index.tsx
index d0304e7..cbfb8fe 100644
--- a/apps/admin/src/pages/Bills/index.tsx
+++ b/apps/admin/src/pages/Bills/index.tsx
@@ -392,7 +392,7 @@ const BillsPage: React.FC = () => {
         </Space>
       </div>
       <Table
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
         columns={columns}
         dataSource={filteredBills}
         rowKey="id"
diff --git a/apps/admin/src/pages/Classes/index.tsx b/apps/admin/src/pages/Classes/index.tsx
index 9a981b4..f13abdb 100644
--- a/apps/admin/src/pages/Classes/index.tsx
+++ b/apps/admin/src/pages/Classes/index.tsx
@@ -169,7 +169,7 @@ const ClassesPage: React.FC = () => {
       render: (_: unknown, r: ClassItem) => `${r.studentCount || 0}/${r.maxStudents || '-'}`,
     },
     {
-      title: '状态', dataIndex: 'status', width: 90,
+        title: '状态', dataIndex: 'status', width: 100,
       render: (v: string) => {
         const cfg = STATUS_MAP[v] || { color: 'default', text: v };
         return <Tag color={cfg.color}>{cfg.text}</Tag>;
@@ -231,6 +231,7 @@ const ClassesPage: React.FC = () => {
         rowKey="id"
         loading={loading}
         pagination={{ pageSize: 20 }}
+        scroll={{ x: 'max-content' }}
       />
 
       <Modal
diff --git a/apps/admin/src/pages/ClassroomRentals/index.tsx b/apps/admin/src/pages/ClassroomRentals/index.tsx
index 2cdc49e..6e9f786 100644
--- a/apps/admin/src/pages/ClassroomRentals/index.tsx
+++ b/apps/admin/src/pages/ClassroomRentals/index.tsx
@@ -319,7 +319,7 @@ const ClassroomRentalsPage: React.FC = () => {
         rowKey="id"
         loading={loading}
         pagination={{ pageSize: 15, showTotal: (total) => `共 ${total} 条` }}
-        scroll={{ x: 1200 }}
+        scroll={{ x: 'max-content' }}
       />
 
       <Modal
diff --git a/apps/admin/src/pages/Classrooms/index.tsx b/apps/admin/src/pages/Classrooms/index.tsx
index 76dbe0c..1e0e767 100644
--- a/apps/admin/src/pages/Classrooms/index.tsx
+++ b/apps/admin/src/pages/Classrooms/index.tsx
@@ -277,7 +277,7 @@ const ClassroomsPage: React.FC = () => {
         </Space>
       </div>
       <Table
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
         columns={columns}
         dataSource={filteredData}
         rowKey="id"
diff --git a/apps/admin/src/pages/Departments/index.tsx b/apps/admin/src/pages/Departments/index.tsx
index 0572b0f..cf0d736 100644
--- a/apps/admin/src/pages/Departments/index.tsx
+++ b/apps/admin/src/pages/Departments/index.tsx
@@ -345,6 +345,7 @@ const DepartmentsPage: React.FC = () => {
                   loading={membersLoading}
                   pagination={false}
                   size="small"
+                  scroll={{ x: 'max-content' }}
                   locale={{ emptyText: '暂无成员' }}
                 />
               </Card>
diff --git a/apps/admin/src/pages/Deposits/index.tsx b/apps/admin/src/pages/Deposits/index.tsx
index 564c688..aa8a7cd 100644
--- a/apps/admin/src/pages/Deposits/index.tsx
+++ b/apps/admin/src/pages/Deposits/index.tsx
@@ -414,7 +414,7 @@ const DepositsPage: React.FC = () => {
                   dataSource={filteredData}
                   rowKey="id"
                   loading={loading}
-                  scroll={{ x: 1300 }}
+                  scroll={{ x: 'max-content' }}
                   pagination={{ pageSize: 15, showTotal: (total) => `共 ${total} 条` }}
                 />
               </>
@@ -429,7 +429,7 @@ const DepositsPage: React.FC = () => {
                 dataSource={pendingRefunds}
                 rowKey="id"
                 loading={pendingLoading}
-                scroll={{ x: 800 }}
+                scroll={{ x: 'max-content' }}
                 pagination={{ pageSize: 15, showTotal: (total) => `共 ${total} 条` }}
               />
             ),
diff --git a/apps/admin/src/pages/Expenses/index.tsx b/apps/admin/src/pages/Expenses/index.tsx
index 5cd14c7..512340a 100644
--- a/apps/admin/src/pages/Expenses/index.tsx
+++ b/apps/admin/src/pages/Expenses/index.tsx
@@ -441,7 +441,7 @@ const ExpensesPage: React.FC = () => {
                   dataSource={filteredRoomExpenses}
                   rowKey="id"
                   loading={loading}
-                  scroll={{ x: 800 }}
+                  scroll={{ x: 'max-content' }}
                   pagination={{ pageSize: 15, showTotal: (total) => `共 ${total} 条` }}
                   rowSelection={{
                     selectedRowKeys: selectedRoomKeys,
@@ -591,7 +591,7 @@ const ExpensesPage: React.FC = () => {
                   dataSource={filteredPersonalExpenses}
                   rowKey="id"
                   loading={loading}
-                  scroll={{ x: 800 }}
+                  scroll={{ x: 'max-content' }}
                   pagination={{ pageSize: 15, showTotal: (total) => `共 ${total} 条` }}
                   rowSelection={{
                     selectedRowKeys: selectedPersonalKeys,
diff --git a/apps/admin/src/pages/Occupancies/index.tsx b/apps/admin/src/pages/Occupancies/index.tsx
index bbbc895..d9b1c1a 100644
--- a/apps/admin/src/pages/Occupancies/index.tsx
+++ b/apps/admin/src/pages/Occupancies/index.tsx
@@ -187,7 +187,7 @@ const OccupanciesPage: React.FC = () => {
     { title: '退宿原因', dataIndex: 'checkOutReason', render: (v: any) => v || '-' },
     {
       title: '操作',
-      width: 200,
+      width: 220,
       render: (_: any, record: any) =>
         !record.checkOutDate ? (
           <Space>
@@ -451,7 +451,7 @@ const OccupanciesPage: React.FC = () => {
         dataSource={filteredData}
         rowKey="id"
         loading={loading}
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
         pagination={{ pageSize: 15, showTotal: (total) => `共 ${total} 条` }}
         rowSelection={rowSelection}
       />
diff --git a/apps/admin/src/pages/OperationLogs/index.tsx b/apps/admin/src/pages/OperationLogs/index.tsx
index d61bcf6..1fe7dc1 100644
--- a/apps/admin/src/pages/OperationLogs/index.tsx
+++ b/apps/admin/src/pages/OperationLogs/index.tsx
@@ -61,14 +61,14 @@ const OperationLogsPage: React.FC = () => {
     {
       title: '模块',
       dataIndex: 'module',
-      width: 80,
+      width: 100,
       render: (v: string) => <Tag color={moduleColorMap[v] || 'default'}>{v}</Tag>,
     },
     { title: '操作', dataIndex: 'action', width: 150 },
     {
       title: '状态',
       dataIndex: 'status',
-      width: 70,
+      width: 80,
       render: (v: string) => {
         const s = statusMap[v] || statusMap['success'];
         return <Tag color={s.color}>{s.text}</Tag>;
@@ -91,7 +91,7 @@ const OperationLogsPage: React.FC = () => {
     {
       title: '终端',
       dataIndex: 'userAgent',
-      width: 100,
+      width: 120,
       ellipsis: true,
       render: (v: string) => {
         if (!v) return '-';
@@ -153,7 +153,7 @@ const OperationLogsPage: React.FC = () => {
         dataSource={data}
         rowKey="id"
         loading={loading}
-        scroll={{ x: 1000 }}
+        scroll={{ x: 'max-content' }}
         pagination={{
           current: page,
           total,
diff --git a/apps/admin/src/pages/Roles/index.tsx b/apps/admin/src/pages/Roles/index.tsx
index d2f7743..c7b9b91 100644
--- a/apps/admin/src/pages/Roles/index.tsx
+++ b/apps/admin/src/pages/Roles/index.tsx
@@ -225,7 +225,7 @@ const RolesPage: React.FC = () => {
         dataSource={data}
         rowKey="id"
         loading={loading}
-        scroll={{ x: 800 }}
+        scroll={{ x: 'max-content' }}
         pagination={false}
       />
 
diff --git a/apps/admin/src/pages/Rooms/index.tsx b/apps/admin/src/pages/Rooms/index.tsx
index 56e138d..aecdc70 100644
--- a/apps/admin/src/pages/Rooms/index.tsx
+++ b/apps/admin/src/pages/Rooms/index.tsx
@@ -194,7 +194,7 @@ const RoomsPage: React.FC = () => {
     {
       title: '租赁类型',
       dataIndex: 'rentalCategory',
-      width: 80,
+      width: 100,
       render: (v: string) => {
         if (v === 'long') return <Tag color="blue">长租</Tag>;
         if (v === 'short') return <Tag color="green">短租</Tag>;
@@ -204,7 +204,7 @@ const RoomsPage: React.FC = () => {
     {
       title: '月租金',
       dataIndex: 'monthlyRate',
-      width: 80,
+      width: 100,
       render: (v: number) => (v ? `¥${v}` : '-'),
     },
     { title: '额定人数', dataIndex: 'capacity' },
@@ -225,7 +225,7 @@ const RoomsPage: React.FC = () => {
     {
       title: '性别',
       dataIndex: 'gender',
-      width: 60,
+      width: 80,
       render: (v: any) => (v ? <Tag color={v === '男' ? 'blue' : 'pink'}>{v}</Tag> : '-'),
     },
     {
@@ -392,7 +392,7 @@ const RoomsPage: React.FC = () => {
         columns={columns}
         dataSource={filteredData}
         rowKey="id"
-        scroll={{ x: 900 }}
+        scroll={{ x: 'max-content' }}
         loading={loading}
         pagination={{ pageSize: 20, showTotal: (total) => `共 ${total} 间` }}
         rowClassName={(record) => (record.status === 'archived' ? 'archived-row' : '')}
diff --git a/apps/admin/src/pages/Students/index.tsx b/apps/admin/src/pages/Students/index.tsx
index 6fb458a..6bd09e3 100644
--- a/apps/admin/src/pages/Students/index.tsx
+++ b/apps/admin/src/pages/Students/index.tsx
@@ -221,9 +221,9 @@ const StudentsPage: React.FC = () => {
   };
 
   const columns = [
-    { title: 'ID', dataIndex: 'id', width: 60 },
+    { title: 'ID', dataIndex: 'id', width: 70 },
     { title: '姓名', dataIndex: 'name', ellipsis: true },
-    { title: '性别', dataIndex: 'gender', width: 60 },
+    { title: '性别', dataIndex: 'gender', width: 70 },
     {
       title: '电话',
       dataIndex: 'phone',
@@ -265,7 +265,7 @@ const StudentsPage: React.FC = () => {
         );
       },
     },
-    { title: '民族', dataIndex: 'ethnicity', width: 80 },
+    { title: '民族', dataIndex: 'ethnicity', width: 90 },
     { title: '紧急联系人', dataIndex: 'emergencyContact', ellipsis: true },
     { title: '紧急联系人电话', dataIndex: 'emergencyPhone', ellipsis: true },
     {
diff --git a/apps/admin/src/pages/Teachers/index.tsx b/apps/admin/src/pages/Teachers/index.tsx
index 8ad8c51..0fb49ff 100644
--- a/apps/admin/src/pages/Teachers/index.tsx
+++ b/apps/admin/src/pages/Teachers/index.tsx
@@ -92,7 +92,7 @@ const TeachersPage: React.FC = () => {
   };
 
   const columns = [
-    { title: '姓名', dataIndex: 'name', key: 'name', width: 100 },
+    { title: '姓名', dataIndex: 'name', key: 'name', width: 120 },
     { title: '用户名', dataIndex: 'username', key: 'username', width: 130 },
     {
       title: '角色',
@@ -135,7 +135,7 @@ const TeachersPage: React.FC = () => {
       title: '状态',
       dataIndex: 'isActive',
       key: 'status',
-      width: 80,
+      width: 90,
       render: (v: boolean) => <Tag color={v ? 'green' : 'red'}>{v ? '在职' : '停用'}</Tag>,
     },
     {
@@ -148,7 +148,7 @@ const TeachersPage: React.FC = () => {
     {
       title: '操作',
       key: 'actions',
-      width: 80,
+      width: 100,
       render: (_: unknown, r: TeacherRow) => (
         <Button
           size="small"
diff --git a/apps/admin/src/pages/Tenants/index.tsx b/apps/admin/src/pages/Tenants/index.tsx
index 9a6fbc3..5edcee2 100644
--- a/apps/admin/src/pages/Tenants/index.tsx
+++ b/apps/admin/src/pages/Tenants/index.tsx
@@ -186,7 +186,7 @@ const TenantsPage: React.FC = () => {
         </PermissionButton>
       </div>
       <Table
-        scroll={{ x: 700 }}
+        scroll={{ x: 'max-content' }}
         columns={columns}
         dataSource={filteredData}
         rowKey="id"
diff --git a/apps/admin/src/pages/Users/index.tsx b/apps/admin/src/pages/Users/index.tsx
index 191bb98..369fbc0 100644
--- a/apps/admin/src/pages/Users/index.tsx
+++ b/apps/admin/src/pages/Users/index.tsx
@@ -248,7 +248,7 @@ const UsersPage: React.FC = () => {
         dataSource={data}
         rowKey="id"
         loading={loading}
-        scroll={{ x: 1000 }}
+        scroll={{ x: 'max-content' }}
         pagination={false}
       />