v3.5.8和v3.5.9版本更新
CI / verify (pull_request) Waiting to run

This commit is contained in:
2026-08-25 09:20:32 +08:00
parent 7304c7a8e1
commit 5935024ea8
101 changed files with 7640 additions and 5364 deletions
@@ -7,6 +7,8 @@ import { PARTNER_PERMISSION_KEYS, PARTNER_PERMISSION_LABELS, PARTNER_STAFF_ROLE_
import { request, type Paginated } from '../lib/api';
import { AdminCellLine } from '../components/AdminCellLine';
import { ACCOUNT_STATUS_LABELS, ADMIN_OPTIONS_PAGE_SIZE, ORDER_STATUS_LABELS, PARTNER_BILL_STATUS_LABELS, fmtTime } from '../lib/constants';
import { useAdminListColumns } from '../lib/useAdminListColumns';
type PartnerOption = { id: string; companyName: string };
type ParentAccount = { id: string; name: string; phone: string };
@@ -169,11 +171,10 @@ export default function PartnerAccountsPage() {
return keys;
}
const columns: ColumnsType<AccountTreeRow> = [
const baseColumns: ColumnsType<AccountTreeRow> = [
{
title: '姓名 / 类型',
width: 200,
ellipsis: true,
render: (_, row) => (
<AdminCellLine
primary={row.name}
@@ -189,7 +190,6 @@ export default function PartnerAccountsPage() {
{
title: '开城合伙人',
width: 140,
ellipsis: true,
render: (_, row) => row.companyName || row.parent?.name || '—',
},
{
@@ -254,11 +254,18 @@ export default function PartnerAccountsPage() {
{ title: '下单', dataIndex: 'createdAt', width: 160, render: fmtTime },
];
const { columns, settingsButton, settingsModal } = useAdminListColumns('partner-accounts', baseColumns, {
page: 1,
pageSize: treeData.length || 20,
});
return (
<div>
{settingsModal}
<Space style={{ marginBottom: 16, width: '100%', justifyContent: 'space-between' }}>
<div>
<Typography.Title level={4} style={{ margin: 0 }}></Typography.Title>
{settingsButton}
<Typography.Text type="secondary">
</Typography.Text>
@@ -305,7 +312,7 @@ export default function PartnerAccountsPage() {
loading={loading}
columns={columns}
dataSource={treeData}
scroll={{ x: 1200 }}
scroll={{ x: 'max-content' }}
pagination={false}
expandable={{
expandedRowKeys,
@@ -399,7 +406,7 @@ export default function PartnerAccountsPage() {
label: `账单 (${detail.bills?.length ?? 0})`,
children: (
<Table rowKey="id" className="admin-table-nowrap" size="small" columns={billColumns}
dataSource={detail.bills ?? []} pagination={false} scroll={{ x: 700 }} />
dataSource={detail.bills ?? []} pagination={false} scroll={{ x: 'max-content' }} />
),
},
{
@@ -407,7 +414,7 @@ export default function PartnerAccountsPage() {
label: `名下订单 (${detail.orders?.length ?? 0})`,
children: (
<Table rowKey="id" className="admin-table-nowrap" size="small" columns={orderColumns}
dataSource={detail.orders ?? []} pagination={false} scroll={{ x: 650 }} />
dataSource={detail.orders ?? []} pagination={false} scroll={{ x: 'max-content' }} />
),
},
]} />