wangziqi/gongxue-base
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

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"