xiongyuxing/gongxue-base
1
0
Fork 0
forked from wangziqi/gongxue-base
Code Pull Requests Activity

fix: remove nested button patterns across all pages, remove Dashboard gantt

Browse Source
This commit is contained in:
wangziqi
2026-07-05 21:35:03 +08:00
parent 1b49d971ae
commit 940b587df9
11 changed files with 214 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apps/admin/src/pages/Bills/index.tsx
View File

@@ -285,18 +285,16 @@ const BillsPage: React.FC = () => {
>
PDF
</PermissionButton>
<PermissionButton permission="bill:delete">
<Popconfirm
title="确定删除此账单？"
onConfirm={() => handleDelete(record.id)}
okText="删除"
cancelText="取消"
>
<Button size="small" danger icon={<DeleteOutlined />}>
删除
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定删除此账单？"
onConfirm={() => handleDelete(record.id)}
okText="删除"
cancelText="取消"
>
<PermissionButton permission="bill:delete" size="small" danger icon={<DeleteOutlined />}>
删除
</PermissionButton>
</Popconfirm>
</Space>
),
},
@@ -350,19 +348,22 @@ const BillsPage: React.FC = () => {
>
批量标记已付
</PermissionButton>
<PermissionButton permission="bill:delete">
<Popconfirm
title={`确定删除选中的 ${selectedRows.length} 条账单？`}
onConfirm={batchDelete}
okText="删除"
cancelText="取消"
<Popconfirm
title={`确定删除选中的 ${selectedRows.length} 条账单？`}
onConfirm={batchDelete}
okText="删除"
cancelText="取消"
disabled={selectedRows.length === 0}
>
<PermissionButton
permission="bill:delete"
danger
disabled={selectedRows.length === 0}
icon={<DeleteOutlined />}
>
<Button danger disabled={selectedRows.length === 0} icon={<DeleteOutlined />}>
批量删除
</Button>
</Popconfirm>
</PermissionButton>
批量删除
</PermissionButton>
</Popconfirm>
</Space>
<Space>
<PermissionButton

18
apps/admin/src/pages/ClassroomRentals/index.tsx
View File

@@ -257,16 +257,14 @@ const ClassroomRentalsPage: React.FC = () => {
<PermissionButton permission="rental:edit" size="small" onClick={() => openEdit(record)}>
编辑
</PermissionButton>
<PermissionButton permission="rental:delete">
<Popconfirm
title="确定删除该租赁订单？合同文件将一并删除。"
onConfirm={() => handleDelete(record.id)}
>
<Button size="small" danger>
删除
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定删除该租赁订单？合同文件将一并删除。"
onConfirm={() => handleDelete(record.id)}
>
<PermissionButton permission="rental:delete" size="small" danger>
删除
</PermissionButton>
</Popconfirm>
</Space>
),
},

34
apps/admin/src/pages/Classrooms/index.tsx
View File

@@ -150,13 +150,11 @@ const ClassroomsPage: React.FC = () => {
render: (_: any, record: any) => (
<Space>
{record.status === 'archived' ? (
<PermissionButton permission="classroom:edit">
<Popconfirm title="确定恢复此教室？" onConfirm={() => handleRestore(record.id)}>
<Button size="small" icon={<UndoOutlined />} type="link">
恢复
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm title="确定恢复此教室？" onConfirm={() => handleRestore(record.id)}>
<PermissionButton permission="classroom:edit" size="small" icon={<UndoOutlined />} type="link">
恢复
</PermissionButton>
</Popconfirm>
) : (
<>
<PermissionButton
@@ -170,18 +168,16 @@ const ClassroomsPage: React.FC = () => {
>
编辑
</PermissionButton>
<PermissionButton permission="classroom:delete">
<Popconfirm
title="归档后数据保留，可随时恢复。存在进行中的租赁将无法归档。"
onConfirm={() => handleArchive(record.id)}
okText="归档"
cancelText="取消"
>
<Button size="small" icon={<InboxOutlined />}>
归档
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm
title="归档后数据保留，可随时恢复。存在进行中的租赁将无法归档。"
onConfirm={() => handleArchive(record.id)}
okText="归档"
cancelText="取消"
>
<PermissionButton permission="classroom:delete" size="small" icon={<InboxOutlined />}>
归档
</PermissionButton>
</Popconfirm>
</>
)}
</Space>

66
apps/admin/src/pages/Dashboard/index.tsx
View File

@@ -22,7 +22,6 @@ const DashboardPage: React.FC = () => {
const screens = Grid.useBreakpoint();
const isMobile = !screens.sm;
const [stats, setStats] = useState<any>(null);
const [ganttData, setGanttData] = useState<any[]>([]);
const [expenseStats, setExpenseStats] = useState<any[]>([]);
const [roomRanking, setRoomRanking] = useState<any[]>([]);
const [loading, setLoading] = useState(true);
@@ -34,9 +33,8 @@ const DashboardPage: React.FC = () => {
const fetchData = async () => {
setLoading(true);
try {
const [s, g, e, r] = await Promise.all([
const [s, e, r] = await Promise.all([
api.get('/dashboard/stats'),
api.get('/dashboard/gantt', { params: { periodStart: period[0], periodEnd: period[1] } }),
api.get('/dashboard/expense-stats', {
params: { periodStart: period[0], periodEnd: period[1] },
}),
@@ -45,7 +43,6 @@ const DashboardPage: React.FC = () => {
}),
]);
setStats(s);
setGanttData(g as any);
setExpenseStats(e as any);
setRoomRanking(r as any);
} catch (e) {
@@ -70,56 +67,6 @@ const DashboardPage: React.FC = () => {
other: '其他',
};
// 甘特图配置
const ganttOption = () => {
if (!ganttData.length) return {};
const rooms = ganttData.map((d) => d.roomNumber);
const pStart = new Date(period[0]).getTime();
const pEnd = new Date(period[1]).getTime();
const data: any[] = [];
ganttData.forEach((room, roomIdx) => {
room.occupancies.forEach((occ: any, i: number) => {
const start = Math.max(new Date(occ.checkInDate).getTime(), pStart);
const end = occ.checkOutDate ? Math.min(new Date(occ.checkOutDate).getTime(), pEnd) : pEnd;
data.push({
name: occ.studentName,
value: [roomIdx, start, end, occ.studentName],
itemStyle: { color: COLORS[(occ.studentId || i) % COLORS.length] },
});
});
});
return {
tooltip: {
formatter: (p: any) => {
const v = p.value;
return `${p.name}<br/>宿舍: ${rooms[v[0]]}<br/>入住: ${dayjs(v[1]).format('MM-DD')} ~ ${dayjs(v[2]).format('MM-DD')}`;
},
},
grid: { left: 80, right: 30, top: 20, bottom: 30 },
xAxis: { type: 'time', min: pStart, max: pEnd },
yAxis: { type: 'category', data: rooms, inverse: true },
series: [
{
type: 'custom',
renderItem: (_params: any, api: any) => {
const catIdx = api.value(0);
const start = api.coord([api.value(1), catIdx]);
const end = api.coord([api.value(2), catIdx]);
const height = api.size([0, 1])[1] * 0.6;
return {
type: 'rect',
shape: { x: start[0], y: start[1] - height / 2, width: end[0] - start[0], height },
style: { ...api.style(), fill: api.visual('color'), stroke: '#fff', lineWidth: 1 },
};
},
encode: { x: [1, 2], y: 0 },
data,
},
],
};
};
// 费用饼图
const pieOption = {
@@ -298,17 +245,6 @@ const DashboardPage: React.FC = () => {
</Col>
</Row>
<Card title="入住时间线（甘特图）" style={{ marginBottom: 24 }}>
{ganttData.length > 0 ? (
<ReactECharts
option={ganttOption()}
style={{ width: '100%', height: Math.max(300, ganttData.length * 40) }}
/>
) : (
<div style={{ textAlign: 'center', padding: 40, color: '#999' }}>暂无入住数据</div>
)}
</Card>
<Row gutter={[16, 16]} style={{ marginBottom: 24 }}>
<Col xs={24} sm={12}>
<Card title="考勤趋势（近30天）">

49
apps/admin/src/pages/Deposits/index.tsx
View File

@@ -256,22 +256,25 @@ const DepositsPage: React.FC = () => {
</PermissionButton>
</>
)}
<PermissionButton permission="deposit:delete">
<Popconfirm
title="确定删除？"
onConfirm={async () => {
try {
await api.delete(`/deposits/${record.id}`);
message.success('删除成功');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
}
}}
>
<Button size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定删除？"
onConfirm={async () => {
try {
await api.delete(`/deposits/${record.id}`);
message.success('删除成功');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
}
}}
>
<PermissionButton
permission="deposit:delete"
size="small"
danger
icon={<DeleteOutlined />}
/>
</Popconfirm>
</Space>
),
},
@@ -529,14 +532,12 @@ const DepositsPage: React.FC = () => {
标记已缴
</PermissionButton>
),
<PermissionButton key="del" permission="deposit:delete">
<Popconfirm
title="确定删除？"
onConfirm={() => handleDeleteInstallment(item.id)}
>
<Button size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</PermissionButton>,
<Popconfirm
title="确定删除？"
onConfirm={() => handleDeleteInstallment(item.id)}
>
<PermissionButton key="del" permission="deposit:delete" size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
].filter(Boolean)}
>
<List.Item.Meta

112
apps/admin/src/pages/Expenses/index.tsx
View File

@@ -239,18 +239,21 @@ const ExpensesPage: React.FC = () => {
>
{''}
</PermissionButton>
<PermissionButton permission="expense:delete">
<Popconfirm
title="确定删除？"
onConfirm={async () => {
await api.delete(`/expenses/room/${record.id}`);
message.success('删除成功');
fetchData();
}}
>
<Button size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定删除？"
onConfirm={async () => {
await api.delete(`/expenses/room/${record.id}`);
message.success('删除成功');
fetchData();
}}
>
<PermissionButton
permission="expense:delete"
size="small"
danger
icon={<DeleteOutlined />}
/>
</Popconfirm>
</Space>
),
},
@@ -290,18 +293,21 @@ const ExpensesPage: React.FC = () => {
>
{''}
</PermissionButton>
<PermissionButton permission="expense:delete">
<Popconfirm
title="确定删除？"
onConfirm={async () => {
await api.delete(`/expenses/personal/${record.id}`);
message.success('删除成功');
fetchData();
}}
>
<Button size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定删除？"
onConfirm={async () => {
await api.delete(`/expenses/personal/${record.id}`);
message.success('删除成功');
fetchData();
}}
>
<PermissionButton
permission="expense:delete"
size="small"
danger
icon={<DeleteOutlined />}
/>
</Popconfirm>
</Space>
),
},
@@ -401,23 +407,22 @@ const ExpensesPage: React.FC = () => {
</PermissionButton>
</Space>
<Space>
<PermissionButton permission="expense:delete">
<Popconfirm
title={`确定删除选中的 ${selectedRoomKeys.length} 条费用？`}
onConfirm={handleBatchDeleteRoom}
okText="删除"
cancelText="取消"
<Popconfirm
title={`确定删除选中的 ${selectedRoomKeys.length} 条费用？`}
onConfirm={handleBatchDeleteRoom}
okText="删除"
cancelText="取消"
disabled={selectedRoomKeys.length === 0}
>
<PermissionButton
permission="expense:delete"
danger
icon={<DeleteOutlined />}
disabled={selectedRoomKeys.length === 0}
>
<Button
danger
icon={<DeleteOutlined />}
disabled={selectedRoomKeys.length === 0}
>
批量删除
</Button>
</Popconfirm>
</PermissionButton>
批量删除
</PermissionButton>
</Popconfirm>
<PermissionButton
permission="expense:create"
type="primary"
@@ -554,23 +559,22 @@ const ExpensesPage: React.FC = () => {
</PermissionButton>
</Space>
<Space>
<PermissionButton permission="expense:delete">
<Popconfirm
title={`确定删除选中的 ${selectedPersonalKeys.length} 条个人费用？`}
onConfirm={handleBatchDeletePersonal}
okText="删除"
cancelText="取消"
<Popconfirm
title={`确定删除选中的 ${selectedPersonalKeys.length} 条个人费用？`}
onConfirm={handleBatchDeletePersonal}
okText="删除"
cancelText="取消"
disabled={selectedPersonalKeys.length === 0}
>
<PermissionButton
permission="expense:delete"
danger
icon={<DeleteOutlined />}
disabled={selectedPersonalKeys.length === 0}
>
<Button
danger
icon={<DeleteOutlined />}
disabled={selectedPersonalKeys.length === 0}
>
批量删除
</Button>
</Popconfirm>
</PermissionButton>
批量删除
</PermissionButton>
</Popconfirm>
<PermissionButton
permission="expense:create"
type="primary"

61
apps/admin/src/pages/Occupancies/index.tsx
View File

@@ -215,22 +215,20 @@ const OccupanciesPage: React.FC = () => {
) : (
<Space>
<Tag>已退宿</Tag>
<PermissionButton permission="occupancy:delete">
<Popconfirm
title="确定删除此记录？"
onConfirm={async () => {
try {
await api.delete(`/occupancies/${record.id}`);
message.success('删除成功');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
}
}}
>
<Button size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定删除此记录？"
onConfirm={async () => {
try {
await api.delete(`/occupancies/${record.id}`);
message.success('删除成功');
fetchData();
} catch (e: any) {
message.error(e?.message || '删除失败');
}
}}
>
<PermissionButton permission="occupancy:delete" size="small" danger icon={<DeleteOutlined />} />
</Popconfirm>
</Space>
),
},
@@ -419,23 +417,22 @@ const OccupanciesPage: React.FC = () => {
批量退宿
</PermissionButton>
) : (
<PermissionButton permission="occupancy:delete">
<Popconfirm
title={`确定删除选中的 ${selectedRowKeys.length} 条入住记录？在住记录会自动跳过`}
onConfirm={handleBatchDelete}
okText="删除"
cancelText="取消"
<Popconfirm
title={`确定删除选中的 ${selectedRowKeys.length} 条入住记录？在住记录会自动跳过`}
onConfirm={handleBatchDelete}
okText="删除"
cancelText="取消"
>
<PermissionButton
permission="occupancy:delete"
danger
size="small"
icon={<DeleteOutlined />}
style={{ marginLeft: 12 }}
>
<Button
danger
size="small"
icon={<DeleteOutlined />}
style={{ marginLeft: 12 }}
>
批量删除
</Button>
</Popconfirm>
</PermissionButton>
批量删除
</PermissionButton>
</Popconfirm>
)}
<Button size="small" onClick={() => setSelectedRowKeys([])} style={{ marginLeft: 8 }}>
取消选择

12
apps/admin/src/pages/Roles/index.tsx
View File

@@ -165,13 +165,11 @@ const RolesPage: React.FC = () => {
编辑
</PermissionButton>
{!record.isSystem && (
<PermissionButton permission="role:delete">
<Popconfirm title="确认删除该角色？" onConfirm={() => handleDelete(record.id)}>
<Button type="link" size="small" danger icon={<DeleteOutlined />}>
删除
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm title="确认删除该角色？" onConfirm={() => handleDelete(record.id)}>
<PermissionButton permission="role:delete" type="link" size="small" danger icon={<DeleteOutlined />}>
删除
</PermissionButton>
</Popconfirm>
)}
</Space>
),

69
apps/admin/src/pages/Students/index.tsx
View File

@@ -187,18 +187,16 @@ const StudentsPage: React.FC = () => {
render: (_: any, record: any) => (
<Space>
{record.status === 'archived' ? (
<PermissionButton permission="student:edit">
<Popconfirm
title="确定恢复此学生？恢复后将重新出现在学生列表中。"
onConfirm={() => handleRestore(record.id)}
okText="恢复"
cancelText="取消"
>
<Button size="small" icon={<UndoOutlined />} type="link">
恢复
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm
title="确定恢复此学生？恢复后将重新出现在学生列表中。"
onConfirm={() => handleRestore(record.id)}
okText="恢复"
cancelText="取消"
>
<PermissionButton permission="student:edit" size="small" icon={<UndoOutlined />} type="link">
恢复
</PermissionButton>
</Popconfirm>
) : (
<>
<PermissionButton
@@ -212,18 +210,16 @@ const StudentsPage: React.FC = () => {
>
编辑
</PermissionButton>
<PermissionButton permission="student:delete">
<Popconfirm
title="归档后不会删除数据，可随时恢复。确定归档？"
onConfirm={() => handleArchive(record.id)}
okText="归档"
cancelText="取消"
>
<Button size="small" icon={<InboxOutlined />}>
归档
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm
title="归档后不会删除数据，可随时恢复。确定归档？"
onConfirm={() => handleArchive(record.id)}
okText="归档"
cancelText="取消"
>
<PermissionButton permission="student:delete" size="small" icon={<InboxOutlined />}>
归档
</PermissionButton>
</Popconfirm>
</>
)}
</Space>
@@ -251,19 +247,22 @@ const StudentsPage: React.FC = () => {
</Button>
</Space>
<Space wrap>
<PermissionButton permission="student:delete">
<Popconfirm
title={`确定批量归档选中的 ${selectedRowKeys.length} 名学生？（数据保留，可恢复）`}
onConfirm={handleBatchDelete}
okText="归档"
cancelText="取消"
<Popconfirm
title={`确定批量归档选中的 ${selectedRowKeys.length} 名学生？（数据保留，可恢复）`}
onConfirm={handleBatchDelete}
okText="归档"
cancelText="取消"
disabled={selectedRowKeys.length === 0}
>
<PermissionButton
permission="student:delete"
danger
icon={<DeleteOutlined />}
disabled={selectedRowKeys.length === 0}
>
<Button danger icon={<DeleteOutlined />} disabled={selectedRowKeys.length === 0}>
批量归档
</Button>
</Popconfirm>
</PermissionButton>
批量归档
</PermissionButton>
</Popconfirm>
<PermissionButton
permission="student:create"
type="primary"

22
apps/admin/src/pages/Tenants/index.tsx
View File

@@ -130,18 +130,16 @@ const TenantsPage: React.FC = () => {
>
编辑
</PermissionButton>
<PermissionButton permission="tenant:delete">
<Popconfirm
title="归档后仍可查看历史租赁"
onConfirm={() => handleArchive(record.id)}
okText="归档"
cancelText="取消"
>
<Button size="small" icon={<InboxOutlined />}>
归档
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm
title="归档后仍可查看历史租赁"
onConfirm={() => handleArchive(record.id)}
okText="归档"
cancelText="取消"
>
<PermissionButton permission="tenant:delete" size="small" icon={<InboxOutlined />}>
归档
</PermissionButton>
</Popconfirm>
</Space>
),
},

12
apps/admin/src/pages/Users/index.tsx
View File

@@ -180,13 +180,11 @@ const UsersPage: React.FC = () => {
重置密码
</PermissionButton>
{record.username !== 'admin' && (
<PermissionButton permission="user:delete">
<Popconfirm title="确认删除该用户？" onConfirm={() => handleDelete(record.id)}>
<Button type="link" size="small" danger icon={<DeleteOutlined />}>
删除
</Button>
</Popconfirm>
</PermissionButton>
<Popconfirm title="确认删除该用户？" onConfirm={() => handleDelete(record.id)}>
<PermissionButton permission="user:delete" type="link" size="small" danger icon={<DeleteOutlined />}>
删除
</PermissionButton>
</Popconfirm>
)}
</Space>
),