refactor: 统一管理页面布局 — FilterToolbar + usePageSearchParams + parseListParams

This commit is contained in:
2026-06-04 17:25:36 +08:00
parent 61b479e2be
commit 6f547560d1
40 changed files with 1805 additions and 628 deletions

View File

@@ -1,8 +1,8 @@
import type Database from "bun:sqlite";
import { desc, eq, like, or, sql } from "drizzle-orm";
import { asc, desc, eq, like, or, sql } from "drizzle-orm";
import type { CreateModelRequest, Model, ModelCapability, UpdateModelRequest } from "../../shared/api";
import type { CreateModelRequest, Model, ModelCapability, SortOrder, UpdateModelRequest } from "../../shared/api";
import type { Logger } from "../logger";
import { paginateQuery, wrap } from "./connection";
@@ -124,7 +124,15 @@ export function getModelWithProvider(
export function listModels(
raw: Database,
options: { keyword?: string; page: number; pageSize: number; providerId?: string },
options: {
capabilities?: string;
keyword?: string;
page: number;
pageSize: number;
providerId?: string;
sortBy?: string;
sortOrder?: SortOrder;
},
): { items: Model[]; page: number; pageSize: number; total: number } {
const conditions = [];
@@ -137,10 +145,16 @@ export function listModels(
conditions.push(or(like(models.name, pattern), like(models.modelId, pattern))!);
}
if (options.capabilities) {
conditions.push(like(models.capabilities, `%"${options.capabilities}"%`));
}
const orderByFn = buildModelOrderBy(options.sortBy, options.sortOrder);
return paginateQuery(raw, models, {
conditions,
mapRow: toModel,
orderBy: () => desc(models.createdAt),
orderBy: orderByFn,
page: options.page,
pageSize: options.pageSize,
});
@@ -212,6 +226,17 @@ export function updateModel(
return { model: toModel(updated!) };
}
function buildModelOrderBy(
sortBy: string | undefined,
sortOrder: SortOrder | undefined,
): ((table: typeof models) => ReturnType<typeof desc>) | undefined {
if (!sortBy) return (t) => desc(t.createdAt);
return sortOrder === "asc"
? (t) => asc(t[sortBy as keyof typeof t] as Parameters<typeof asc>[0])
: (t) => desc(t[sortBy as keyof typeof t] as Parameters<typeof desc>[0]);
}
function toModel(row: typeof models.$inferSelect): Model {
return {
capabilities: JSON.parse(row.capabilities) as ModelCapability[],

View File

@@ -1,8 +1,8 @@
import type Database from "bun:sqlite";
import { desc, eq, like, or } from "drizzle-orm";
import { asc, desc, eq, like, or } from "drizzle-orm";
import type { CreateProjectRequest, Project, ProjectStatus, UpdateProjectRequest } from "../../shared/api";
import type { CreateProjectRequest, Project, ProjectStatus, SortOrder, UpdateProjectRequest } from "../../shared/api";
import type { Logger } from "../logger";
import { paginateQuery, wrap } from "./connection";
@@ -88,7 +88,14 @@ export function getProject(raw: Database, id: string): { error: string; status:
export function listProjects(
raw: Database,
options: { keyword?: string; page: number; pageSize: number; status?: ProjectStatus },
options: {
keyword?: string;
page: number;
pageSize: number;
sortBy?: string;
sortOrder?: SortOrder;
status?: ProjectStatus;
},
): { items: Project[]; page: number; pageSize: number; total: number } {
const conditions = [];
@@ -101,10 +108,12 @@ export function listProjects(
conditions.push(or(like(projects.name, pattern), like(projects.description, pattern))!);
}
const orderByFn = buildProjectOrderBy(options.sortBy, options.sortOrder);
return paginateQuery(raw, projects, {
conditions,
mapRow: toProject,
orderBy: () => desc(projects.createdAt),
orderBy: orderByFn,
page: options.page,
pageSize: options.pageSize,
});
@@ -174,6 +183,17 @@ export function updateProject(
return { project: toProject(updated!) };
}
function buildProjectOrderBy(
sortBy: string | undefined,
sortOrder: SortOrder | undefined,
): ((table: typeof projects) => ReturnType<typeof desc>) | undefined {
if (!sortBy) return (t) => desc(t.createdAt);
return sortOrder === "asc"
? (t) => asc(t[sortBy as keyof typeof t] as Parameters<typeof asc>[0])
: (t) => desc(t[sortBy as keyof typeof t] as Parameters<typeof desc>[0]);
}
function toProject(row: typeof projects.$inferSelect): Project {
return {
archivedAt: row.archivedAt,

View File

@@ -1,8 +1,14 @@
import type Database from "bun:sqlite";
import { desc, eq, like } from "drizzle-orm";
import { asc, desc, eq, like } from "drizzle-orm";
import type { CreateProviderRequest, Provider, ProviderOption, UpdateProviderRequest } from "../../shared/api";
import type {
CreateProviderRequest,
Provider,
ProviderOption,
SortOrder,
UpdateProviderRequest,
} from "../../shared/api";
import type { Logger } from "../logger";
import { paginateQuery, wrap } from "./connection";
@@ -85,7 +91,7 @@ export function listProviderOptions(raw: Database): ProviderOption[] {
export function listProviders(
raw: Database,
options: { keyword?: string; page: number; pageSize: number },
options: { keyword?: string; page: number; pageSize: number; sortBy?: string; sortOrder?: SortOrder; type?: string },
): { items: Provider[]; page: number; pageSize: number; total: number } {
const conditions = [];
@@ -94,10 +100,16 @@ export function listProviders(
conditions.push(like(providers.name, pattern));
}
if (options.type) {
conditions.push(eq(providers.type, options.type as Provider["type"]));
}
const orderByFn = buildProviderOrderBy(options.sortBy, options.sortOrder);
return paginateQuery(raw, providers, {
conditions,
mapRow: toProvider,
orderBy: () => desc(providers.createdAt),
orderBy: orderByFn,
page: options.page,
pageSize: options.pageSize,
});
@@ -158,6 +170,17 @@ export function updateProvider(
return { provider: toProvider(updated!) };
}
function buildProviderOrderBy(
sortBy: string | undefined,
sortOrder: SortOrder | undefined,
): ((table: typeof providers) => ReturnType<typeof desc>) | undefined {
if (!sortBy) return (t) => desc(t.createdAt);
return sortOrder === "asc"
? (t) => asc(t[sortBy as keyof typeof t] as Parameters<typeof asc>[0])
: (t) => desc(t[sortBy as keyof typeof t] as Parameters<typeof desc>[0]);
}
function toProvider(row: typeof providers.$inferSelect): Provider {
return {
apiKey: row.apiKey,

View File

@@ -1,2 +1,4 @@
export type { ParsedListParams } from "./list-params";
export { parseListParams } from "./list-params";
export { createApiError, createHeaders, createMetaResponse, formatDuration, jsonResponse } from "./response";
export { parseIdFromUrl } from "./url";

View File

@@ -0,0 +1,59 @@
import type { RuntimeMode, SortOrder } from "../../shared/api";
import { createApiError, jsonResponse } from "./index";
export interface ParsedListParams {
keyword?: string;
page: number;
pageSize: number;
sortBy?: string;
sortOrder?: SortOrder;
}
export function parseListParams(
url: URL,
mode: RuntimeMode,
options?: { allowedSortBy?: string[] },
): ParsedListParams | Response {
const pageParam = url.searchParams.get("page");
const pageSizeParam = url.searchParams.get("pageSize");
let page = 1;
let pageSize = 20;
if (pageParam !== null) {
page = Number(pageParam);
if (!Number.isInteger(page) || page <= 0) {
return jsonResponse(createApiError("无效的 page 参数", 400), { mode, status: 400 });
}
}
if (pageSizeParam !== null) {
pageSize = Number(pageSizeParam);
if (!Number.isInteger(pageSize) || pageSize <= 0) {
return jsonResponse(createApiError("无效的 pageSize 参数", 400), { mode, status: 400 });
}
if (pageSize > 200) {
return jsonResponse(createApiError("pageSize 不能超过 200", 400), { mode, status: 400 });
}
}
const keyword = url.searchParams.get("keyword") ?? undefined;
const sortBy = url.searchParams.get("sortBy") ?? undefined;
const sortOrderParam = url.searchParams.get("sortOrder") ?? undefined;
if (sortBy && options?.allowedSortBy && !options.allowedSortBy.includes(sortBy)) {
return jsonResponse(createApiError("无效的 sortBy 参数", 400), { mode, status: 400 });
}
let sortOrder: SortOrder | undefined;
if (sortOrderParam) {
if (sortOrderParam !== "asc" && sortOrderParam !== "desc") {
return jsonResponse(createApiError("无效的 sortOrder 参数", 400), { mode, status: 400 });
}
sortOrder = sortOrderParam;
}
return { keyword, page, pageSize, sortBy, sortOrder };
}

View File

@@ -4,24 +4,26 @@ import type { RuntimeMode } from "../../../shared/api";
import type { Logger } from "../../logger";
import { listModels } from "../../db/models";
import { jsonResponse } from "../../helpers";
import { validatePagination } from "../../middleware";
import { jsonResponse, parseListParams } from "../../helpers";
const ALLOWED_SORT_BY = ["createdAt", "name"];
export function handleListModels(req: Request, db: Database, mode: RuntimeMode, _logger: Logger): Response {
const url = new URL(req.url);
const pageParam = url.searchParams.get("page");
const pageSizeParam = url.searchParams.get("pageSize");
const keyword = url.searchParams.get("keyword");
const providerId = url.searchParams.get("providerId");
const capabilities = url.searchParams.get("capabilities");
const pagination = validatePagination(pageParam, pageSizeParam, mode);
if (pagination instanceof Response) return pagination;
const parsed = parseListParams(url, mode, { allowedSortBy: ALLOWED_SORT_BY });
if (parsed instanceof Response) return parsed;
const result = listModels(db, {
keyword: keyword ?? undefined,
page: pagination.page,
pageSize: pagination.pageSize,
capabilities: capabilities ?? undefined,
keyword: parsed.keyword,
page: parsed.page,
pageSize: parsed.pageSize,
providerId: providerId ?? undefined,
sortBy: parsed.sortBy,
sortOrder: parsed.sortOrder,
});
return jsonResponse(result, { mode });

View File

@@ -4,27 +4,27 @@ import type { RuntimeMode } from "../../../shared/api";
import type { Logger } from "../../logger";
import { listProjects } from "../../db/projects";
import { createApiError, jsonResponse } from "../../helpers";
import { validatePagination } from "../../middleware";
import { createApiError, jsonResponse, parseListParams } from "../../helpers";
const ALLOWED_SORT_BY = ["createdAt", "name", "updatedAt"];
export function handleListProjects(req: Request, db: Database, mode: RuntimeMode, _logger: Logger): Response {
const url = new URL(req.url);
const pageParam = url.searchParams.get("page");
const pageSizeParam = url.searchParams.get("pageSize");
const keyword = url.searchParams.get("keyword");
const statusParam = url.searchParams.get("status");
const pagination = validatePagination(pageParam, pageSizeParam, mode);
if (pagination instanceof Response) return pagination;
if (statusParam && statusParam !== "active" && statusParam !== "archived") {
return jsonResponse(createApiError("Invalid status parameter", 400), { mode, status: 400 });
}
const parsed = parseListParams(url, mode, { allowedSortBy: ALLOWED_SORT_BY });
if (parsed instanceof Response) return parsed;
const result = listProjects(db, {
keyword: keyword ?? undefined,
page: pagination.page,
pageSize: pagination.pageSize,
keyword: parsed.keyword,
page: parsed.page,
pageSize: parsed.pageSize,
sortBy: parsed.sortBy,
sortOrder: parsed.sortOrder,
status: (statusParam as "active" | "archived") ?? undefined,
});

View File

@@ -4,22 +4,24 @@ import type { RuntimeMode } from "../../../shared/api";
import type { Logger } from "../../logger";
import { listProviders } from "../../db/providers";
import { jsonResponse } from "../../helpers";
import { validatePagination } from "../../middleware";
import { jsonResponse, parseListParams } from "../../helpers";
const ALLOWED_SORT_BY = ["createdAt", "name"];
export function handleListProviders(req: Request, db: Database, mode: RuntimeMode, _logger: Logger): Response {
const url = new URL(req.url);
const pageParam = url.searchParams.get("page");
const pageSizeParam = url.searchParams.get("pageSize");
const keyword = url.searchParams.get("keyword");
const typeParam = url.searchParams.get("type");
const pagination = validatePagination(pageParam, pageSizeParam, mode);
if (pagination instanceof Response) return pagination;
const parsed = parseListParams(url, mode, { allowedSortBy: ALLOWED_SORT_BY });
if (parsed instanceof Response) return parsed;
const result = listProviders(db, {
keyword: keyword ?? undefined,
page: pagination.page,
pageSize: pagination.pageSize,
keyword: parsed.keyword,
page: parsed.page,
pageSize: parsed.pageSize,
sortBy: parsed.sortBy,
sortOrder: parsed.sortOrder,
type: typeParam ?? undefined,
});
return jsonResponse(result, { mode });

View File

@@ -59,6 +59,11 @@ export interface CreateProviderRequest {
// 前后端共享的类型都放在这个文件中
// ==========================================
export interface ListSortParams {
sortBy?: string;
sortOrder?: SortOrder;
}
export interface Material {
associatedDate: string;
createdAt: string;
@@ -127,6 +132,8 @@ export type ModelCapability =
| "video-generation"
| "video-recognition";
export type SortOrder = "asc" | "desc";
export interface UpdateConversationRequest {
modelId?: string;
title?: string;

View File

@@ -1,8 +1,10 @@
import { Space } from "antd";
import { useState } from "react";
import { PlusOutlined } from "@ant-design/icons";
import { Button, Space } from "antd";
import { useCallback, useMemo, useState } from "react";
import type { Model, TestModelRequest } from "../../../shared/api";
import { FilterToolbar } from "../../shared/components/FilterToolbar";
import {
useCreateModel,
useDeleteModel,
@@ -11,21 +13,46 @@ import {
useUpdateModel,
} from "../../shared/hooks/use-models";
import { useProviderOptions } from "../../shared/hooks/use-providers";
import { useConfirmAction } from "../../shared/hooks/useConfirmAction";
import { usePageSearchParams } from "../../shared/hooks/usePageSearchParams";
import { ModelFormModal } from "./components/ModelFormModal";
import { ModelTable } from "./components/ModelTable";
import { ModelToolbar } from "./components/ModelToolbar";
const CAPABILITY_OPTIONS = [
{ label: "文本", value: "text" },
{ label: "推理", value: "reasoning" },
{ label: "图片识别", value: "image-recognition" },
{ label: "图片生成", value: "image-generation" },
{ label: "音频识别", value: "audio-recognition" },
{ label: "音频生成", value: "audio-generation" },
{ label: "视频识别", value: "video-recognition" },
{ label: "视频生成", value: "video-generation" },
];
export function ModelListPage() {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(20);
const [keyword, setKeyword] = useState("");
const { confirmAction } = useConfirmAction();
const { params, resetAll, setParams } = usePageSearchParams({
defaults: { page: "1", pageSize: "20" },
});
const [dialogOpen, setDialogOpen] = useState(false);
const [editingModel, setEditingModel] = useState<Model | null>(null);
const { data: modelData, isLoading: modelLoading } = useModelList({
keyword: keyword || undefined,
page,
pageSize,
const apiPage = Number(params["page"]) || 1;
const apiPageSize = Number(params["pageSize"]) || 20;
const keyword = params["keyword"] ?? "";
const providerIdFilter = params["providerId"];
const capabilitiesFilter = params["capabilities"];
const sortBy = params["sortBy"];
const sortOrder = params["sortOrder"];
const { data: modelData, isFetching: modelLoading } = useModelList({
capabilities: capabilitiesFilter ?? undefined,
keyword: keyword ?? undefined,
page: apiPage,
pageSize: apiPageSize,
providerId: providerIdFilter ?? undefined,
sortBy: sortBy ?? undefined,
sortOrder: sortOrder,
});
const {
@@ -41,42 +68,107 @@ export function ModelListPage() {
const testModelMutation = useTestModelConnection();
const isSubmitting = createModelMutation.isPending || updateModelMutation.isPending;
const isActionPending = deleteModelMutation.isPending;
const modelProviders = providerOptionsData?.items ?? [];
const modelProviders = useMemo(() => providerOptionsData?.items ?? [], [providerOptionsData?.items]);
const providerOptions = useMemo(() => modelProviders.map((p) => ({ label: p.name, value: p.id })), [modelProviders]);
const handleSearch = useCallback(
(value: string) => {
setParams({ keyword: value || undefined, page: "1" });
},
[setParams],
);
const handleReset = useCallback(() => {
resetAll();
}, [resetAll]);
const handleTableChange = useCallback(
(
pagination: { current?: number; pageSize?: number },
sorter: { columnKey?: string; field?: string | string[]; order?: string },
) => {
const patch: Record<string, string | undefined> = {
page: String(pagination.current ?? apiPage),
pageSize: String(pagination.pageSize ?? apiPageSize),
};
const sortField = sorter.columnKey! ?? (typeof sorter.field === "string" ? sorter.field : undefined);
if (sorter.order && sortField) {
patch["sortBy"] = sortField;
patch["sortOrder"] = sorter.order === "ascend" ? "asc" : "desc";
} else {
patch["sortBy"] = undefined;
patch["sortOrder"] = undefined;
}
setParams(patch);
},
[setParams, apiPage, apiPageSize],
);
const filters = useMemo(
() => [
{
key: "providerId",
label: "供应商",
onChange: (value: string | undefined) => {
setParams({ page: "1", providerId: value });
},
options: providerOptions,
placeholder: "供应商",
value: providerIdFilter,
},
{
key: "capabilities",
label: "能力",
onChange: (value: string | undefined) => {
setParams({ capabilities: value, page: "1" });
},
options: CAPABILITY_OPTIONS,
placeholder: "能力",
value: capabilitiesFilter,
},
],
[setParams, providerOptions, providerIdFilter, capabilitiesFilter],
);
const handleDelete = useCallback(
(id: string) => confirmAction(() => deleteModelMutation.mutateAsync(id), "模型已删除"),
[confirmAction, deleteModelMutation],
);
return (
<Space className="app-page-flex" orientation="vertical" size="large">
<ModelToolbar
keyword={keyword}
onSearch={(value) => {
setKeyword(value);
setPage(1);
}}
onSearchClear={() => {
setKeyword("");
setPage(1);
}}
openCreateDialog={() => {
setEditingModel(null);
setDialogOpen(true);
}}
<FilterToolbar
actions={
<Button
icon={<PlusOutlined />}
onClick={() => {
setEditingModel(null);
setDialogOpen(true);
}}
type="primary"
>
</Button>
}
filters={filters}
search={{ keyword, onReset: handleReset, onSearch: handleSearch, placeholder: "搜索模型名称或 ID" }}
/>
<ModelTable
data={modelData}
loading={modelLoading || providerOptionsLoading || isActionPending}
onDelete={(id) => deleteModelMutation.mutateAsync(id)}
loading={modelLoading || providerOptionsLoading}
onChange={handleTableChange}
onDelete={handleDelete}
onEdit={(model) => {
setEditingModel(model);
setDialogOpen(true);
}}
onPageChange={(p, ps) => {
setPage(p);
setPageSize(ps);
}}
page={page}
pageSize={pageSize}
page={apiPage}
pageSize={apiPageSize}
providers={modelProviders}
sortBy={sortBy}
sortOrder={sortOrder}
/>
<ModelFormModal

View File

@@ -1,8 +1,10 @@
import { Space } from "antd";
import { useState } from "react";
import { PlusOutlined } from "@ant-design/icons";
import { Button, Space } from "antd";
import { useCallback, useMemo, useState } from "react";
import type { Provider } from "../../../shared/api";
import { FilterToolbar } from "../../shared/components/FilterToolbar";
import {
useCreateProvider,
useDeleteProvider,
@@ -10,21 +12,39 @@ import {
useTestProviderConfig,
useUpdateProvider,
} from "../../shared/hooks/use-providers";
import { useConfirmAction } from "../../shared/hooks/useConfirmAction";
import { usePageSearchParams } from "../../shared/hooks/usePageSearchParams";
import { ProviderFormModal } from "./components/ProviderFormModal";
import { ProviderTable } from "./components/ProviderTable";
import { ProviderToolbar } from "./components/ProviderToolbar";
const TYPE_OPTIONS = [
{ label: "OpenAI", value: "openai" },
{ label: "OpenAI 兼容", value: "openai-compatible" },
{ label: "Anthropic", value: "anthropic" },
];
export function ProviderListPage() {
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(20);
const [keyword, setKeyword] = useState("");
const { confirmAction } = useConfirmAction();
const { params, resetAll, setParams } = usePageSearchParams({
defaults: { page: "1", pageSize: "20" },
});
const [dialogOpen, setDialogOpen] = useState(false);
const [editingProvider, setEditingProvider] = useState<null | Provider>(null);
const { data: providerData, isLoading: providerLoading } = useProviderList({
const apiPage = Number(params["page"]) || 1;
const apiPageSize = Number(params["pageSize"]) || 20;
const keyword = params["keyword"] ?? "";
const typeFilter = params["type"];
const sortBy = params["sortBy"];
const sortOrder = params["sortOrder"];
const { data: providerData, isFetching: providerLoading } = useProviderList({
keyword: keyword || undefined,
page,
pageSize,
page: apiPage,
pageSize: apiPageSize,
sortBy: sortBy ?? undefined,
sortOrder: sortOrder,
type: typeFilter ?? undefined,
});
const createProviderMutation = useCreateProvider();
@@ -33,40 +53,93 @@ export function ProviderListPage() {
const testProviderConfigMutation = useTestProviderConfig();
const isSubmitting = createProviderMutation.isPending || updateProviderMutation.isPending;
const isActionPending = deleteProviderMutation.isPending;
const handleSearch = useCallback(
(value: string) => {
setParams({ keyword: value || undefined, page: "1" });
},
[setParams],
);
const handleReset = useCallback(() => {
resetAll();
}, [resetAll]);
const handleTableChange = useCallback(
(
pagination: { current?: number; pageSize?: number },
sorter: { columnKey?: string; field?: string | string[]; order?: string },
) => {
const patch: Record<string, string | undefined> = {
page: String(pagination.current ?? apiPage),
pageSize: String(pagination.pageSize ?? apiPageSize),
};
const sortField = sorter.columnKey! ?? (typeof sorter.field === "string" ? sorter.field : undefined);
if (sorter.order && sortField) {
patch["sortBy"] = sortField;
patch["sortOrder"] = sorter.order === "ascend" ? "asc" : "desc";
} else {
patch["sortBy"] = undefined;
patch["sortOrder"] = undefined;
}
setParams(patch);
},
[setParams, apiPage, apiPageSize],
);
const filters = useMemo(
() => [
{
key: "type",
label: "类型",
onChange: (value: string | undefined) => {
setParams({ page: "1", type: value });
},
options: TYPE_OPTIONS,
placeholder: "类型",
value: typeFilter,
},
],
[setParams, typeFilter],
);
const handleDelete = useCallback(
(id: string) => confirmAction(() => deleteProviderMutation.mutateAsync(id), "供应商已删除"),
[confirmAction, deleteProviderMutation],
);
return (
<Space className="app-page-flex" orientation="vertical" size="large">
<ProviderToolbar
keyword={keyword}
onSearch={(value) => {
setKeyword(value);
setPage(1);
}}
onSearchClear={() => {
setKeyword("");
setPage(1);
}}
openCreateDialog={() => {
setEditingProvider(null);
setDialogOpen(true);
}}
<FilterToolbar
actions={
<Button
icon={<PlusOutlined />}
onClick={() => {
setEditingProvider(null);
setDialogOpen(true);
}}
type="primary"
>
</Button>
}
filters={filters}
search={{ keyword, onReset: handleReset, onSearch: handleSearch, placeholder: "搜索供应商名称" }}
/>
<ProviderTable
data={providerData}
loading={providerLoading || isActionPending}
onDelete={(id) => deleteProviderMutation.mutateAsync(id)}
loading={providerLoading}
onChange={handleTableChange}
onDelete={handleDelete}
onEdit={(provider) => {
setEditingProvider(provider);
setDialogOpen(true);
}}
onPageChange={(p, ps) => {
setPage(p);
setPageSize(ps);
}}
page={page}
pageSize={pageSize}
page={apiPage}
pageSize={apiPageSize}
sortBy={sortBy}
sortOrder={sortOrder}
/>
<ProviderFormModal

View File

@@ -1,20 +1,27 @@
import type { TableColumnsType } from "antd";
import type { TableColumnsType, TableProps } from "antd";
import { DeleteOutlined, EditOutlined } from "@ant-design/icons";
import { App as AntApp, Button, Popconfirm, Space, Table, Tag } from "antd";
import { useCallback, useMemo } from "react";
import { Button, Popconfirm, Space, Table, Tag } from "antd";
import { useMemo } from "react";
import type { Model, ModelListResponse, ProviderOption } from "../../../../shared/api";
import { formatDatetime } from "../../../shared/utils/format";
interface ModelTableProps {
data: ModelListResponse | undefined;
loading: boolean;
onDelete: (id: string) => Promise<unknown>;
onChange: (
pagination: { current?: number; pageSize?: number },
sorter: { columnKey?: string; field?: string | string[]; order?: string },
) => void;
onDelete: (id: string) => Promise<void>;
onEdit: (model: Model) => void;
onPageChange: (page: number, pageSize: number) => void;
page: number;
pageSize: number;
providers: ProviderOption[];
sortBy?: string;
sortOrder?: string;
}
const CAPABILITY_LABELS: Record<string, string> = {
@@ -28,110 +35,111 @@ const CAPABILITY_LABELS: Record<string, string> = {
"video-recognition": "视频识别",
};
function getProviderName(providerId: string, providers: ProviderOption[]): string {
return providers.find((p) => p.id === providerId)?.name ?? providerId;
}
const COLUMNS: TableColumnsType<Model> = [
{ dataIndex: "name", ellipsis: true, title: "名称", width: 180 },
{
dataIndex: "providerId",
ellipsis: true,
title: "供应商",
width: 120,
},
{
dataIndex: "capabilities",
render: (value: string[]) =>
value.length > 0 ? (
<Space size={[4, 4]} wrap>
{value.map((c) => (
<Tag key={c}>{CAPABILITY_LABELS[c] ?? c}</Tag>
))}
</Space>
) : null,
title: "能力",
},
];
export function ModelTable({
data,
loading,
onChange,
onDelete,
onEdit,
onPageChange,
page,
pageSize,
providers,
sortBy,
sortOrder,
}: ModelTableProps) {
const { message } = AntApp.useApp();
const handleDelete = useCallback(
async (id: string) => {
try {
await onDelete(id);
message.success("模型已删除");
} catch (err: unknown) {
message.error((err as Error).message);
}
},
[onDelete, message],
);
const columnsWithProvider = useMemo<TableColumnsType<Model>>(
() =>
COLUMNS.map((col) =>
"dataIndex" in col && col.dataIndex === "providerId"
? {
...col,
render: (_value: unknown, record: Model) => getProviderName(record.providerId, providers),
}
: col,
),
[providers],
);
const operationColumn = useMemo<TableColumnsType<Model>[number]>(
() => ({
dataIndex: "op",
render: (_value: unknown, record: Model) => (
<Space size="small">
<Button icon={<EditOutlined />} onClick={() => onEdit(record)} size="small" type="link">
</Button>
<Popconfirm
description="此操作不可恢复。"
onConfirm={() => void handleDelete(record.id)}
title="确认删除此模型?"
>
<Button danger icon={<DeleteOutlined />} size="small" type="link">
const columns = useMemo<TableColumnsType<Model>>(
() => [
{
dataIndex: "name",
ellipsis: true,
sorter: true,
sortOrder:
sortBy === "name" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "名称",
width: 180,
},
{
dataIndex: "providerId",
ellipsis: true,
render: (_value: unknown, record: Model) => getProviderName(record.providerId, providers),
title: "供应商",
width: 120,
},
{
dataIndex: "capabilities",
render: (value: string[]) =>
value.length > 0 ? (
<Space size={[4, 4]} wrap>
{value.map((c) => (
<Tag key={c}>{CAPABILITY_LABELS[c] ?? c}</Tag>
))}
</Space>
) : null,
title: "能力",
},
{
align: "center",
dataIndex: "createdAt",
render: (_value: unknown, record: Model) => formatDatetime(record.createdAt),
sorter: true,
sortOrder:
sortBy === "createdAt" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "创建时间",
width: 180,
},
{
dataIndex: "op",
render: (_value: unknown, record: Model) => (
<Space size="small">
<Button icon={<EditOutlined />} onClick={() => onEdit(record)} size="small" type="link">
</Button>
</Popconfirm>
</Space>
),
title: "操作",
width: 180,
}),
[onEdit, handleDelete],
<Popconfirm
description="此操作不可恢复。"
onConfirm={() => void onDelete(record.id)}
title="确认删除此模型?"
>
<Button danger icon={<DeleteOutlined />} size="small" type="link">
</Button>
</Popconfirm>
</Space>
),
title: "操作",
width: 180,
},
],
[onEdit, onDelete, providers, sortBy, sortOrder],
);
const columns = useMemo(() => [...columnsWithProvider, operationColumn], [columnsWithProvider, operationColumn]);
const handleTableChange: TableProps<Model>["onChange"] = (pagination, _filters, sorter) => {
const sortInfo =
sorter && typeof sorter === "object" && "columnKey" in sorter
? (sorter as { columnKey?: string; field?: string | string[]; order?: string })
: {};
onChange({ current: pagination.current, pageSize: pagination.pageSize }, sortInfo);
};
return (
<Table
columns={columns}
dataSource={data?.items ?? []}
loading={loading}
locale={{ emptyText: "暂无模型数据" }}
onChange={handleTableChange}
pagination={{
current: page,
hideOnSinglePage: false,
onChange: onPageChange,
pageSize,
showSizeChanger: true,
showTotal: (total) => `${total}`,
total: data?.total ?? 0,
}}
rowKey="id"
/>
);
}
function getProviderName(providerId: string, providers: ProviderOption[]): string {
return providers.find((p) => p.id === providerId)?.name ?? providerId;
}

View File

@@ -1,37 +0,0 @@
import { PlusOutlined } from "@ant-design/icons";
import { Button, Flex, Input, Space } from "antd";
import { useState } from "react";
interface ModelToolbarProps {
keyword: string;
onSearch: (value: string) => void;
onSearchClear: () => void;
openCreateDialog: () => void;
}
export function ModelToolbar({ keyword, onSearch, onSearchClear, openCreateDialog }: ModelToolbarProps) {
const [draftKeyword, setDraftKeyword] = useState(keyword);
return (
<Flex align="center" gap="large" justify="space-between" wrap="wrap">
<div />
<Space size="small">
<Input.Search
allowClear
enterButton="搜索"
onChange={(event) => setDraftKeyword(event.target.value)}
onClear={() => {
setDraftKeyword("");
onSearchClear();
}}
onSearch={(value) => onSearch(value)}
placeholder="搜索模型名称或 ID"
value={draftKeyword}
/>
<Button icon={<PlusOutlined />} onClick={openCreateDialog} type="primary">
</Button>
</Space>
</Flex>
);
}

View File

@@ -1,91 +1,120 @@
import type { TableColumnsType } from "antd";
import type { TableColumnsType, TableProps } from "antd";
import { DeleteOutlined, EditOutlined } from "@ant-design/icons";
import { App as AntApp, Button, Popconfirm, Space, Table } from "antd";
import { useCallback, useMemo } from "react";
import { Button, Popconfirm, Space, Table } from "antd";
import { useMemo } from "react";
import type { Provider, ProviderListResponse } from "../../../../shared/api";
import { formatDatetime } from "../../../shared/utils/format";
interface ProviderTableProps {
data: ProviderListResponse | undefined;
loading: boolean;
onDelete: (id: string) => Promise<unknown>;
onChange: (
pagination: { current?: number; pageSize?: number },
sorter: { columnKey?: string; field?: string | string[]; order?: string },
) => void;
onDelete: (id: string) => Promise<void>;
onEdit: (provider: Provider) => void;
onPageChange: (page: number, pageSize: number) => void;
page: number;
pageSize: number;
sortBy?: string;
sortOrder?: string;
}
const TYPE_LABELS: Record<Provider["type"], string> = {
anthropic: "Anthropic",
openai: "OpenAI",
"openai-compatible": "OpenAI 兼容",
};
const COLUMNS: TableColumnsType<Provider> = [
{ dataIndex: "name", ellipsis: true, title: "名称", width: 180 },
{
dataIndex: "type",
render: (value: Provider["type"]) => TYPE_LABELS[value] ?? value,
title: "类型",
width: 140,
},
{ dataIndex: "baseUrl", ellipsis: true, title: "Base URL" },
];
export function ProviderTable({ data, loading, onDelete, onEdit, onPageChange, page, pageSize }: ProviderTableProps) {
const { message } = AntApp.useApp();
const handleDelete = useCallback(
async (id: string) => {
try {
await onDelete(id);
message.success("供应商已删除");
} catch (err: unknown) {
message.error((err as Error).message);
}
},
[onDelete, message],
);
const operationColumn = useMemo<TableColumnsType<Provider>[number]>(
() => ({
dataIndex: "op",
render: (_value: unknown, record: Provider) => (
<Space size="small">
<Button icon={<EditOutlined />} onClick={() => onEdit(record)} size="small" type="link">
</Button>
<Popconfirm
description="该供应商下存在模型时无法删除,请先删除或迁移相关模型。"
onConfirm={() => void handleDelete(record.id)}
title="确认删除此供应商?"
>
<Button danger icon={<DeleteOutlined />} size="small" type="link">
export function ProviderTable({
data,
loading,
onChange,
onDelete,
onEdit,
page,
pageSize,
sortBy,
sortOrder,
}: ProviderTableProps) {
const columns = useMemo<TableColumnsType<Provider>>(
() => [
{
dataIndex: "name",
ellipsis: true,
sorter: true,
sortOrder:
sortBy === "name" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "名称",
width: 180,
},
{
dataIndex: "type",
render: (_value: unknown, record: Provider) => {
const labels: Record<string, string> = {
anthropic: "Anthropic",
openai: "OpenAI",
"openai-compatible": "OpenAI 兼容",
};
return labels[record.type] ?? record.type;
},
title: "类型",
width: 140,
},
{ dataIndex: "baseUrl", ellipsis: true, title: "Base URL" },
{
align: "center",
dataIndex: "createdAt",
render: (_value: unknown, record: Provider) => formatDatetime(record.createdAt),
sorter: true,
sortOrder:
sortBy === "createdAt" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "创建时间",
width: 180,
},
{
dataIndex: "op",
render: (_value: unknown, record: Provider) => (
<Space size="small">
<Button icon={<EditOutlined />} onClick={() => onEdit(record)} size="small" type="link">
</Button>
</Popconfirm>
</Space>
),
title: "操作",
width: 180,
}),
[onEdit, handleDelete],
<Popconfirm
description="删除后关联的模型将无法使用。"
onConfirm={() => void onDelete(record.id)}
title="确认删除此供应商?"
>
<Button danger icon={<DeleteOutlined />} size="small" type="link">
</Button>
</Popconfirm>
</Space>
),
title: "操作",
width: 180,
},
],
[onEdit, onDelete, sortBy, sortOrder],
);
const columns = useMemo(() => [...COLUMNS, operationColumn], [operationColumn]);
const handleTableChange: TableProps<Provider>["onChange"] = (pagination, _filters, sorter) => {
const sortInfo =
sorter && typeof sorter === "object" && "columnKey" in sorter
? (sorter as { columnKey?: string; field?: string | string[]; order?: string })
: {};
onChange({ current: pagination.current, pageSize: pagination.pageSize }, sortInfo);
};
return (
<Table
columns={columns}
dataSource={data?.items ?? []}
loading={loading}
locale={{ emptyText: "暂无供应商数据" }}
onChange={handleTableChange}
pagination={{
current: page,
hideOnSinglePage: false,
onChange: onPageChange,
pageSize,
showSizeChanger: true,
showTotal: (total) => `${total}`,
total: data?.total ?? 0,
}}
rowKey="id"

View File

@@ -1,37 +0,0 @@
import { PlusOutlined } from "@ant-design/icons";
import { Button, Flex, Input, Space } from "antd";
import { useState } from "react";
interface ProviderToolbarProps {
keyword: string;
onSearch: (value: string) => void;
onSearchClear: () => void;
openCreateDialog: () => void;
}
export function ProviderToolbar({ keyword, onSearch, onSearchClear, openCreateDialog }: ProviderToolbarProps) {
const [draftKeyword, setDraftKeyword] = useState(keyword);
return (
<Flex align="center" gap="large" justify="space-between" wrap="wrap">
<div />
<Space size="small">
<Input.Search
allowClear
enterButton="搜索"
onChange={(event) => setDraftKeyword(event.target.value)}
onClear={() => {
setDraftKeyword("");
onSearchClear();
}}
onSearch={(value) => onSearch(value)}
placeholder="搜索供应商名称"
value={draftKeyword}
/>
<Button icon={<PlusOutlined />} onClick={openCreateDialog} type="primary">
</Button>
</Space>
</Flex>
);
}

View File

@@ -1,184 +1,169 @@
import type { TableColumnsType } from "antd";
import type { TableColumnsType, TableProps } from "antd";
import { DeleteOutlined, EditOutlined, InboxOutlined, LoginOutlined, RedoOutlined } from "@ant-design/icons";
import { App as AntApp, Button, Popconfirm, Space, Table, Tag } from "antd";
import { useCallback, useMemo } from "react";
import { Button, Popconfirm, Space, Table, Tag } from "antd";
import { useMemo } from "react";
import { useNavigate } from "react-router";
import type { Project, ProjectListResponse, ProjectStatus } from "../../../../shared/api";
import type { Project, ProjectListResponse } from "../../../../shared/api";
import { formatDatetime } from "../../../shared/utils/format";
interface ProjectTableProps {
data: ProjectListResponse | undefined;
loading: boolean;
onArchive: (id: string) => Promise<unknown>;
onDelete: (id: string) => Promise<unknown>;
onArchive: (id: string) => Promise<void>;
onChange: (
pagination: { current?: number; pageSize?: number },
sorter: { columnKey?: string; field?: string | string[]; order?: string },
) => void;
onDelete: (id: string) => Promise<void>;
onEdit: (project: Project) => void;
onPageChange: (page: number, pageSize: number) => void;
onRestore: (id: string) => Promise<unknown>;
onRestore: (id: string) => Promise<void>;
page: number;
pageSize: number;
status: ProjectStatus;
sortBy?: string;
sortOrder?: string;
}
const COLUMNS: TableColumnsType<Project> = [
{ dataIndex: "name", ellipsis: true, title: "名称", width: 140 },
{ dataIndex: "description", ellipsis: true, title: "描述" },
{
align: "center",
dataIndex: "status",
render: (_value, record: Project) => {
if (record.status === "archived") {
return <Tag></Tag>;
}
return <Tag color="blue"></Tag>;
},
title: "状态",
width: 90,
},
{
align: "center",
dataIndex: "createdAt",
render: (_value, record: Project) => formatDatetime(record.createdAt),
title: "创建时间",
width: 180,
},
{
align: "center",
dataIndex: "updatedAt",
render: (_value, record: Project) => formatDatetime(record.updatedAt),
title: "更新时间",
width: 180,
},
];
export function ProjectTable({
data,
loading,
onArchive,
onChange,
onDelete,
onEdit,
onPageChange,
onRestore,
page,
pageSize,
status,
sortBy,
sortOrder,
}: ProjectTableProps) {
const { message } = AntApp.useApp();
const navigate = useNavigate();
const handleArchive = useCallback(
async (id: string) => {
try {
await onArchive(id);
message.success("项目已归档");
} catch (err: unknown) {
message.error((err as Error).message);
}
},
[onArchive, message],
);
const handleRestore = useCallback(
async (id: string) => {
try {
await onRestore(id);
message.success("项目已恢复");
} catch (err: unknown) {
message.error((err as Error).message);
}
},
[onRestore, message],
);
const handleDelete = useCallback(
async (id: string) => {
try {
await onDelete(id);
message.success("项目已永久删除");
} catch (err: unknown) {
message.error((err as Error).message);
}
},
[onDelete, message],
);
const operationColumn = useMemo<TableColumnsType<Project>[number]>(
() => ({
dataIndex: "op",
render: (_value, record: Project) => {
if (record.status === "active") {
const columns = useMemo<TableColumnsType<Project>>(
() => [
{
dataIndex: "name",
ellipsis: true,
sorter: true,
sortOrder:
sortBy === "name" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "名称",
width: 140,
},
{ dataIndex: "description", ellipsis: true, title: "描述" },
{
align: "center",
dataIndex: "status",
render: (_value: unknown, record: Project) => {
if (record.status === "archived") {
return <Tag></Tag>;
}
return <Tag color="blue"></Tag>;
},
title: "状态",
width: 90,
},
{
align: "center",
dataIndex: "createdAt",
render: (_value: unknown, record: Project) => formatDatetime(record.createdAt),
sorter: true,
sortOrder:
sortBy === "createdAt" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "创建时间",
width: 180,
},
{
align: "center",
dataIndex: "updatedAt",
render: (_value: unknown, record: Project) => formatDatetime(record.updatedAt),
sorter: true,
sortOrder:
sortBy === "updatedAt" ? (sortOrder === "asc" ? "ascend" : sortOrder === "desc" ? "descend" : null) : null,
title: "更新时间",
width: 180,
},
{
dataIndex: "op",
render: (_value: unknown, record: Project) => {
if (record.status === "active") {
return (
<Space size="small">
<Button
icon={<LoginOutlined />}
onClick={() => void navigate(`/workbench/${record.id}`)}
size="small"
type="link"
>
</Button>
<Button icon={<EditOutlined />} onClick={() => onEdit(record)} size="small" type="link">
</Button>
<Popconfirm
description="归档后项目将变为只读。"
onConfirm={() => void onArchive(record.id)}
title="确认归档此项目?"
>
<Button color="orange" icon={<InboxOutlined />} size="small" variant="link">
</Button>
</Popconfirm>
</Space>
);
}
return (
<Space size="small">
<Button
icon={<LoginOutlined />}
onClick={() => void navigate(`/workbench/${record.id}`)}
size="small"
type="link"
>
</Button>
<Button icon={<EditOutlined />} onClick={() => onEdit(record)} size="small" type="link">
</Button>
<Popconfirm onConfirm={() => void onRestore(record.id)} title="确认恢复此项目?">
<Button icon={<RedoOutlined />} size="small" type="link">
</Button>
</Popconfirm>
<Popconfirm
description="归档后项目将变为只读。"
onConfirm={() => void handleArchive(record.id)}
title="确认归档此项目?"
description="此操作不可恢复。"
onConfirm={() => void onDelete(record.id)}
title="确认永久删除此项目?"
>
<Button color="orange" icon={<InboxOutlined />} size="small" variant="link">
<Button danger icon={<DeleteOutlined />} size="small" type="link">
</Button>
</Popconfirm>
</Space>
);
}
return (
<Space size="small">
<Popconfirm onConfirm={() => void handleRestore(record.id)} title="确认恢复此项目?">
<Button icon={<RedoOutlined />} size="small" type="link">
</Button>
</Popconfirm>
<Popconfirm
description="此操作不可恢复。"
onConfirm={() => void handleDelete(record.id)}
title="确认永久删除此项目?"
>
<Button danger icon={<DeleteOutlined />} size="small" type="link">
</Button>
</Popconfirm>
</Space>
);
},
title: "操作",
width: 260,
},
title: "操作",
width: status === "active" ? 260 : 160,
}),
[navigate, onEdit, handleArchive, handleRestore, handleDelete, status],
],
[navigate, onEdit, onArchive, onRestore, onDelete, sortBy, sortOrder],
);
const columns = useMemo(() => [...COLUMNS, operationColumn], [operationColumn]);
const handleTableChange: TableProps<Project>["onChange"] = (pagination, _filters, sorter) => {
const sortInfo =
sorter && typeof sorter === "object" && "columnKey" in sorter
? (sorter as { columnKey?: string; field?: string | string[]; order?: string })
: {};
onChange({ current: pagination.current, pageSize: pagination.pageSize }, sortInfo);
};
return (
<Table
columns={columns}
dataSource={data?.items ?? []}
loading={loading}
locale={{ emptyText: "暂无项目数据" }}
onChange={handleTableChange}
pagination={{
current: page,
hideOnSinglePage: false,
onChange: onPageChange,
pageSize,
showSizeChanger: true,
showTotal: (total) => `${total}`,
total: data?.total ?? 0,
}}
rowKey="id"
/>
);
}
function formatDatetime(dateStr: string): string {
const d = new Date(dateStr);
const pad = (n: number) => String(n).padStart(2, "0");
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
}

View File

@@ -1,55 +0,0 @@
import { PlusOutlined } from "@ant-design/icons";
import { Button, Flex, Input, Space, Tabs } from "antd";
import { useState } from "react";
import type { ProjectStatus } from "../../../../shared/api";
interface ProjectToolbarProps {
activeTab: ProjectStatus;
keyword: string;
onSearch: (value: string) => void;
onSearchClear: () => void;
onTabChange: (key: string) => void;
openCreateDialog: () => void;
}
const STATUS_TAB_ITEMS = [
{ key: "active", label: "进行中" },
{ key: "archived", label: "已归档" },
];
export function ProjectToolbar({
activeTab,
keyword,
onSearch,
onSearchClear,
onTabChange,
openCreateDialog,
}: ProjectToolbarProps) {
const [draftKeyword, setDraftKeyword] = useState(keyword);
return (
<Flex align="center" gap="large" justify="space-between" wrap="wrap">
<Tabs activeKey={activeTab} items={STATUS_TAB_ITEMS} onChange={onTabChange} />
<Space size="small">
<Input.Search
allowClear
enterButton="搜索"
onChange={(event) => setDraftKeyword(event.target.value)}
onClear={() => {
setDraftKeyword("");
onSearchClear();
}}
onSearch={(value) => onSearch(value)}
placeholder="搜索名称或描述"
value={draftKeyword}
/>
{activeTab === "active" && (
<Button icon={<PlusOutlined />} onClick={openCreateDialog} type="primary">
</Button>
)}
</Space>
</Flex>
);
}

View File

@@ -1,8 +1,10 @@
import { Space } from "antd";
import { useState } from "react";
import { PlusOutlined } from "@ant-design/icons";
import { Button, Space } from "antd";
import { useCallback, useMemo, useState } from "react";
import type { Project, ProjectStatus } from "../../../shared/api";
import { FilterToolbar } from "../../shared/components/FilterToolbar";
import {
useArchiveProject,
useCreateProject,
@@ -11,20 +13,40 @@ import {
useRestoreProject,
useUpdateProject,
} from "../../shared/hooks/use-projects";
import { useConfirmAction } from "../../shared/hooks/useConfirmAction";
import { usePageSearchParams } from "../../shared/hooks/usePageSearchParams";
import { ProjectFormModal } from "./components/ProjectFormModal";
import { ProjectTable } from "./components/ProjectTable";
import { ProjectToolbar } from "./components/ProjectToolbar";
const STATUS_OPTIONS = [
{ label: "进行中", value: "active" },
{ label: "已归档", value: "archived" },
];
export function ProjectsPage() {
const [tabValue, setTabValue] = useState<ProjectStatus>("active");
const [page, setPage] = useState(1);
const [pageSize, setPageSize] = useState(20);
const [keyword, setKeyword] = useState("");
const { confirmAction } = useConfirmAction();
const { params, resetAll, setParams } = usePageSearchParams({
defaults: { page: "1", pageSize: "20" },
});
const [dialogOpen, setDialogOpen] = useState(false);
const [editingProject, setEditingProject] = useState<null | Project>(null);
const { data, isLoading } = useProjectList({ keyword: keyword || undefined, page, pageSize, status: tabValue });
const apiPage = Number(params["page"]) || 1;
const apiPageSize = Number(params["pageSize"]) || 20;
const keyword = params["keyword"] ?? "";
const statusFilter = params["status"] as ProjectStatus | undefined;
const sortBy = params["sortBy"];
const sortOrder = params["sortOrder"];
const { data, isFetching } = useProjectList({
keyword: keyword || undefined,
page: apiPage,
pageSize: apiPageSize,
sortBy: sortBy ?? undefined,
sortOrder: sortOrder,
status: statusFilter,
});
const createMutation = useCreateProject();
const updateMutation = useUpdateProject();
const archiveMutation = useArchiveProject();
@@ -32,54 +54,111 @@ export function ProjectsPage() {
const deleteMutation = useDeleteProject();
const isSubmitting = createMutation.isPending || updateMutation.isPending;
const isRowActionPending = archiveMutation.isPending || restoreMutation.isPending || deleteMutation.isPending;
const handleSearch = useCallback(
(value: string) => {
setParams({ keyword: value || undefined, page: "1" });
},
[setParams],
);
const handleReset = useCallback(() => {
resetAll();
}, [resetAll]);
const handleTableChange = useCallback(
(
pagination: { current?: number; pageSize?: number },
sorter: { columnKey?: string; field?: string | string[]; order?: string },
) => {
const patch: Record<string, string | undefined> = {
page: String(pagination.current ?? apiPage),
pageSize: String(pagination.pageSize ?? apiPageSize),
};
const sortField = sorter.columnKey! ?? (typeof sorter.field === "string" ? sorter.field : undefined);
if (sorter.order && sortField) {
patch["sortBy"] = sortField;
patch["sortOrder"] = sorter.order === "ascend" ? "asc" : "desc";
} else {
patch["sortBy"] = undefined;
patch["sortOrder"] = undefined;
}
setParams(patch);
},
[setParams, apiPage, apiPageSize],
);
const filters = useMemo(
() => [
{
key: "status",
label: "状态",
onChange: (value: string | undefined) => {
setParams({ page: "1", status: value });
},
options: STATUS_OPTIONS,
placeholder: "状态",
value: statusFilter,
},
],
[setParams, statusFilter],
);
const handleArchive = useCallback(
(id: string) => confirmAction(() => archiveMutation.mutateAsync(id), "项目已归档"),
[confirmAction, archiveMutation],
);
const handleRestore = useCallback(
(id: string) => confirmAction(() => restoreMutation.mutateAsync(id), "项目已恢复"),
[confirmAction, restoreMutation],
);
const handleDelete = useCallback(
(id: string) => confirmAction(() => deleteMutation.mutateAsync(id), "项目已永久删除"),
[confirmAction, deleteMutation],
);
return (
<Space className="app-page-flex" orientation="vertical" size="large">
<ProjectToolbar
activeTab={tabValue}
keyword={keyword}
onSearch={(value) => {
setKeyword(value);
setPage(1);
}}
onSearchClear={() => {
setKeyword("");
setPage(1);
}}
onTabChange={(key) => {
setTabValue(key as ProjectStatus);
setPage(1);
}}
openCreateDialog={() => {
setEditingProject(null);
setDialogOpen(true);
}}
<FilterToolbar
actions={
<Button
icon={<PlusOutlined />}
onClick={() => {
setEditingProject(null);
setDialogOpen(true);
}}
type="primary"
>
</Button>
}
filters={filters}
search={{ keyword, onReset: handleReset, onSearch: handleSearch, placeholder: "搜索名称或描述" }}
/>
<ProjectTable
data={data}
loading={isLoading || isRowActionPending}
onArchive={(id) => archiveMutation.mutateAsync(id)}
onDelete={(id) => deleteMutation.mutateAsync(id)}
loading={isFetching}
onArchive={handleArchive}
onChange={handleTableChange}
onDelete={handleDelete}
onEdit={(project) => {
setEditingProject(project);
setDialogOpen(true);
}}
onPageChange={(p, ps) => {
setPage(p);
setPageSize(ps);
}}
onRestore={(id) => restoreMutation.mutateAsync(id)}
page={page}
pageSize={pageSize}
status={tabValue}
onRestore={handleRestore}
page={apiPage}
pageSize={apiPageSize}
sortBy={sortBy}
sortOrder={sortOrder}
/>
<ProjectFormModal
editingProject={editingProject}
onCancel={() => setDialogOpen(false)}
onCreate={(data) => createMutation.mutateAsync(data)}
onCreate={(formData) => createMutation.mutateAsync(formData)}
onOpenChange={setDialogOpen}
onUpdate={(args) => updateMutation.mutateAsync(args)}
open={dialogOpen}

View File

@@ -0,0 +1,74 @@
import type { ReactNode } from "react";
import { SearchOutlined, UndoOutlined } from "@ant-design/icons";
import { Button, Flex, Input, Select, Space } from "antd";
import { useEffect, useRef, useState } from "react";
export interface FilterConfig {
key: string;
label: string;
onChange: (value: string | undefined) => void;
options: Array<{ label: string; value: string }>;
placeholder: string;
value?: string;
}
export interface FilterToolbarProps {
actions?: ReactNode;
filters?: FilterConfig[];
search?: SearchConfig;
}
export interface SearchConfig {
keyword?: string;
onReset: () => void;
onSearch: (value: string) => void;
placeholder: string;
}
export function FilterToolbar({ actions, filters, search }: FilterToolbarProps) {
const [draftKeyword, setDraftKeyword] = useState(search?.keyword ?? "");
const prevKeywordRef = useRef(search?.keyword);
useEffect(() => {
if (search?.keyword !== prevKeywordRef.current) {
prevKeywordRef.current = search?.keyword;
setDraftKeyword(search?.keyword ?? "");
}
}, [search?.keyword]);
return (
<Flex align="center" gap="large" justify="space-between" wrap="wrap">
<Space size="small" wrap>
{filters?.map((filter) => (
<Select
allowClear
key={filter.key}
onChange={filter.onChange}
options={filter.options}
placeholder={filter.placeholder}
style={{ minWidth: 120 }}
value={filter.value}
/>
))}
{search && (
<Input.Search
allowClear
enterButton={<Button icon={<SearchOutlined />} type="primary" />}
onChange={(e) => setDraftKeyword(e.target.value)}
onClear={() => {
setDraftKeyword("");
search.onSearch("");
}}
onSearch={(value) => search.onSearch(value)}
placeholder={search.placeholder}
style={{ width: 220 }}
value={draftKeyword}
/>
)}
<Button icon={<UndoOutlined />} onClick={search?.onReset} title="重置" />
</Space>
{actions && <Space size="small">{actions}</Space>}
</Flex>
);
}

View File

@@ -37,16 +37,22 @@ export async function fetchModel(id: string): Promise<Model> {
}
export async function fetchModelList(params: {
capabilities?: string;
keyword?: string;
page?: number;
pageSize?: number;
providerId?: string;
sortBy?: string;
sortOrder?: string;
}): Promise<ModelListResponse> {
const searchParams = new URLSearchParams();
if (params.page) searchParams.set("page", String(params.page));
if (params.pageSize) searchParams.set("pageSize", String(params.pageSize));
if (params.keyword) searchParams.set("keyword", params.keyword);
if (params.providerId) searchParams.set("providerId", params.providerId);
if (params.sortBy) searchParams.set("sortBy", params.sortBy);
if (params.sortOrder) searchParams.set("sortOrder", params.sortOrder);
if (params.capabilities) searchParams.set("capabilities", params.capabilities);
const qs = searchParams.toString();
const url = `/api/models${qs ? `?${qs}` : ""}`;
const response = await fetch(url);
@@ -110,7 +116,15 @@ export function useModel(id: string) {
});
}
export function useModelList(params: { keyword?: string; page?: number; pageSize?: number; providerId?: string }) {
export function useModelList(params: {
capabilities?: string;
keyword?: string;
page?: number;
pageSize?: number;
providerId?: string;
sortBy?: string;
sortOrder?: string;
}) {
return useQuery({
queryFn: () => fetchModelList(params),
queryKey: [...MODELS_KEY, "list", params],

View File

@@ -43,12 +43,16 @@ export async function fetchProjectList(params: {
keyword?: string;
page?: number;
pageSize?: number;
sortBy?: string;
sortOrder?: string;
status?: ProjectStatus;
}): Promise<ProjectListResponse> {
const searchParams = new URLSearchParams();
if (params.page) searchParams.set("page", String(params.page));
if (params.pageSize) searchParams.set("pageSize", String(params.pageSize));
if (params.keyword) searchParams.set("keyword", params.keyword);
if (params.sortBy) searchParams.set("sortBy", params.sortBy);
if (params.sortOrder) searchParams.set("sortOrder", params.sortOrder);
if (params.status) searchParams.set("status", params.status);
const qs = searchParams.toString();
const url = `/api/projects${qs ? `?${qs}` : ""}`;
@@ -115,7 +119,14 @@ export function useProject(id: string) {
});
}
export function useProjectList(params: { keyword?: string; page?: number; pageSize?: number; status?: ProjectStatus }) {
export function useProjectList(params: {
keyword?: string;
page?: number;
pageSize?: number;
sortBy?: string;
sortOrder?: string;
status?: ProjectStatus;
}) {
return useQuery({
queryFn: () => fetchProjectList(params),
queryKey: [...PROJECTS_KEY, "list", params],

View File

@@ -41,11 +41,17 @@ export async function fetchProviderList(params: {
keyword?: string;
page?: number;
pageSize?: number;
sortBy?: string;
sortOrder?: string;
type?: string;
}): Promise<ProviderListResponse> {
const searchParams = new URLSearchParams();
if (params.page) searchParams.set("page", String(params.page));
if (params.pageSize) searchParams.set("pageSize", String(params.pageSize));
if (params.keyword) searchParams.set("keyword", params.keyword);
if (params.sortBy) searchParams.set("sortBy", params.sortBy);
if (params.sortOrder) searchParams.set("sortOrder", params.sortOrder);
if (params.type) searchParams.set("type", params.type);
const qs = searchParams.toString();
const url = `/api/providers${qs ? `?${qs}` : ""}`;
const response = await fetch(url);
@@ -119,7 +125,14 @@ export function useProvider(id: string) {
});
}
export function useProviderList(params: { keyword?: string; page?: number; pageSize?: number }) {
export function useProviderList(params: {
keyword?: string;
page?: number;
pageSize?: number;
sortBy?: string;
sortOrder?: string;
type?: string;
}) {
return useQuery({
queryFn: () => fetchProviderList(params),
queryKey: [...PROVIDERS_KEY, "list", params],

View File

@@ -0,0 +1,24 @@
import { App } from "antd";
import { useCallback } from "react";
export interface UseConfirmActionResult {
confirmAction: (action: () => Promise<unknown>, successMessage: string) => Promise<void>;
}
export function useConfirmAction(): UseConfirmActionResult {
const { message } = App.useApp();
const confirmAction = useCallback(
async (action: () => Promise<unknown>, successMessage: string) => {
try {
await action();
message.success(successMessage);
} catch (err: unknown) {
message.error((err as Error).message);
}
},
[message],
);
return { confirmAction };
}

View File

@@ -0,0 +1,74 @@
import { useCallback, useMemo } from "react";
import { useSearchParams } from "react-router";
export interface UsePageSearchParamsOptions {
defaults?: Record<string, string>;
}
export interface UsePageSearchParamsResult {
params: Record<string, string>;
resetAll: () => void;
setParam: (key: string, value: string | undefined) => void;
setParams: (patch: Record<string, string | undefined>) => void;
}
export function usePageSearchParams(options?: UsePageSearchParamsOptions): UsePageSearchParamsResult {
const [searchParams, setSearchParams] = useSearchParams();
const defaults = useMemo(() => options?.defaults ?? {}, [options?.defaults]);
const params = useMemo(() => {
const result: Record<string, string> = {};
for (const [key, value] of searchParams.entries()) {
result[key] = value;
}
for (const [key, value] of Object.entries(defaults)) {
if (!(key in result)) result[key] = value;
}
return result;
}, [searchParams, defaults]);
const setParam = useCallback(
(key: string, value: string | undefined) => {
setSearchParams(
(prev) => {
const next = new URLSearchParams(prev);
if (value === undefined || value === "") {
next.delete(key);
} else {
next.set(key, value);
}
return next;
},
{ replace: true },
);
},
[setSearchParams],
);
const setParams = useCallback(
(patch: Record<string, string | undefined>) => {
setSearchParams(
(prev) => {
const next = new URLSearchParams(prev);
for (const [key, value] of Object.entries(patch)) {
if (value === undefined || value === "") {
next.delete(key);
} else {
next.set(key, value);
}
}
return next;
},
{ replace: true },
);
},
[setSearchParams],
);
const resetAll = useCallback(() => {
setSearchParams(new URLSearchParams(), { replace: true });
}, [setSearchParams]);
return { params, resetAll, setParam, setParams };
}

View File

@@ -0,0 +1,5 @@
export function formatDatetime(dateStr: string): string {
const d = new Date(dateStr);
const pad = (n: number) => String(n).padStart(2, "0");
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
}