Merge custom order frontend for issue #575

This commit is contained in:
sagitchu
2026-11-10 08:20:55 +08:00
5 changed files with 991 additions and 682 deletions
+10
View File
@@ -619,3 +619,13 @@ export const assignMonitorPermission = (userId: number) =>
export const removeMonitorPermission = (userId: number) => export const removeMonitorPermission = (userId: number) =>
Network.post("/monitor/permission/remove", { userId }); Network.post("/monitor/permission/remove", { userId });
// Complete ordered IDs plus the last observed server order for conflict detection.
export interface OrderUpdatePayload {
ids: number[];
expectedIds: number[];
}
export const updateUserOrder = (data: OrderUpdatePayload) =>
Network.post("/user/update-order", data);
export const updateSpeedLimitOrder = (data: OrderUpdatePayload) =>
Network.post("/speed-limit/update-order", data);
@@ -0,0 +1,151 @@
import { createContext, useContext, type ReactNode } from "react";
import {
DndContext,
closestCenter,
KeyboardSensor,
MouseSensor,
TouchSensor,
useSensor,
useSensors,
type DragEndEvent,
} from "@dnd-kit/core";
import {
SortableContext,
rectSortingStrategy,
sortableKeyboardCoordinates,
useSortable,
} from "@dnd-kit/sortable";
import { CSS } from "@dnd-kit/utilities";
import { GripVertical } from "lucide-react";
import { TableRow } from "@/shadcn-bridge/heroui/table";
const HandleContext = createContext<ReactNode>(null);
export function OrderHandle() {
return <>{useContext(HandleContext)}</>;
}
export function OrderItem({
id,
label,
disabled,
row = false,
children,
}: {
id: number;
label: string;
disabled: boolean;
row?: boolean;
children: ReactNode;
}) {
const {
attributes,
listeners,
setNodeRef,
setActivatorNodeRef,
transform,
transition,
isDragging,
} = useSortable({ id, disabled });
const Component = row ? TableRow : "div";
return (
<HandleContext.Provider
value={
<button
ref={setActivatorNodeRef}
{...attributes}
{...listeners}
aria-label={`拖动排序:${label}`}
className="shrink-0 rounded p-1 text-default-500 hover:bg-default-100 focus-visible:outline focus-visible:outline-2 focus-visible:outline-primary disabled:opacity-40 disabled:cursor-not-allowed cursor-grab active:cursor-grabbing"
disabled={disabled}
style={{ touchAction: "none" }}
type="button"
>
<GripVertical aria-hidden="true" className="h-4 w-4" />
</button>
}
>
<Component
ref={setNodeRef}
className={row ? undefined : "h-full min-w-0"}
style={{
transform: CSS.Transform.toString(transform),
transition,
opacity: isDragging ? 0.5 : 1,
position: "relative",
zIndex: isDragging ? 1 : undefined,
}}
>
{children}
</Component>
</HandleContext.Provider>
);
}
export function OrderList({
ids,
children,
onDragStart,
onDragEnd,
}: {
ids: number[];
children: ReactNode;
onDragStart: () => void;
onDragEnd: (event: DragEndEvent) => void;
}) {
const sensors = useSensors(
useSensor(MouseSensor, { activationConstraint: { distance: 8 } }),
useSensor(TouchSensor, {
activationConstraint: { delay: 250, tolerance: 8 },
}),
useSensor(KeyboardSensor, {
coordinateGetter: sortableKeyboardCoordinates,
}),
);
return (
<DndContext
accessibility={{
screenReaderInstructions: {
draggable: "按空格开始排序,方向键移动,再按空格保存,Escape 取消。",
},
}}
collisionDetection={closestCenter}
sensors={sensors}
onDragEnd={onDragEnd}
onDragStart={onDragStart}
>
<SortableContext items={ids} strategy={rectSortingStrategy}>
{children}
</SortableContext>
</DndContext>
);
}
export function OrderStatus({
reason,
error,
retry,
}: {
reason: string;
error: string;
retry: () => void;
}) {
return (
<div className="mb-3 text-sm text-default-500">
<p role="status">
{reason || "拖动手柄调整全局顺序;键盘可按空格、方向键、空格完成排序。"}
</p>
{error && (
<p className="text-danger mt-2" role="alert">
{error}{" "}
<button className="underline" type="button" onClick={retry}>
重新加载
</button>
</p>
)}
</div>
);
}
+120
View File
@@ -0,0 +1,120 @@
import type { DragEndEvent } from "@dnd-kit/core";
import type { OrderUpdatePayload } from "@/api";
import { useCallback, useEffect, useRef, useState } from "react";
import { arrayMove } from "@dnd-kit/sortable";
interface Result {
code: number;
msg?: string;
transportError?: boolean;
}
// Keep one complete, authoritative snapshot. Filtering is presentation-only.
export function useServerOrder<T extends { id: number }>(
fetchItems: () => Promise<T[]>,
saveOrder: (payload: OrderUpdatePayload) => Promise<Result>,
) {
const [items, setItems] = useState<T[]>([]);
const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false);
const [error, setError] = useState("");
const mounted = useRef(false);
const request = useRef(0);
const savingRef = useRef(false);
const snapshot = useRef(items);
snapshot.current = items;
const dragSnapshot = useRef<T[] | null>(null);
const reload = useCallback(async () => {
const version = ++request.current;
setLoading(true);
try {
const rows = await fetchItems();
if (!mounted.current || version !== request.current) return;
setItems(rows);
} catch {
if (!mounted.current || version !== request.current) return;
// Never expose a partial or unverified set as reorderable after failure.
setItems([]);
setError("加载列表失败,请重试后再排序。");
} finally {
if (mounted.current && version === request.current) setLoading(false);
}
}, [fetchItems]);
useEffect(() => {
mounted.current = true;
void reload();
return () => {
mounted.current = false;
++request.current;
};
}, [reload]);
const onDragStart = () => {
dragSnapshot.current = snapshot.current;
};
const reorder = async ({ active, over }: DragEndEvent, disabled: boolean) => {
const before = dragSnapshot.current;
dragSnapshot.current = null;
if (
disabled ||
loading ||
savingRef.current ||
!over ||
active.id === over.id ||
before !== snapshot.current
)
return;
const from = items.findIndex((item) => item.id === active.id);
const to = items.findIndex((item) => item.id === over.id);
if (from < 0 || to < 0) return;
savingRef.current = true;
setSaving(true);
setError("");
try {
const result = await saveOrder({
ids: arrayMove(items, from, to).map((item) => item.id),
expectedIds: items.map((item) => item.id),
});
if (!mounted.current) return;
if (result.code !== 0) {
setError(
result.transportError
? "排序保存未确认,请检查重新加载后的服务器顺序再重试。"
: result.code === 409
? "列表已被其他操作更改,排序未保存,请按重新加载后的顺序重试。"
: `排序保存失败:${result.msg || "请重试"}。请检查重新加载后的服务器顺序。`,
);
}
} catch {
if (mounted.current)
setError("排序保存未确认,请检查重新加载后的服务器顺序再重试。");
} finally {
if (mounted.current) {
await reload();
if (mounted.current) setSaving(false);
}
savingRef.current = false;
}
};
return {
items,
setItems,
loading,
saving,
error,
reload,
onDragStart,
reorder,
};
}
+72 -42
View File
@@ -1,12 +1,16 @@
import { useState, useEffect, useMemo } from "react"; import { useState, useMemo } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { LayoutGrid, List } from "lucide-react"; import { LayoutGrid, List } from "lucide-react";
import { import {
AnimatedPage, OrderHandle,
StaggerList, OrderItem,
StaggerItem, OrderList,
} from "@/components/animated-page"; OrderStatus,
} from "@/components/server-order";
import { useServerOrder } from "@/hooks/use-server-order";
import { isAdmin } from "@/utils/auth";
import { AnimatedPage, StaggerList } from "@/components/animated-page";
import { SearchBar } from "@/components/search-bar"; import { SearchBar } from "@/components/search-bar";
import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card"; import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card";
import { Button } from "@/shadcn-bridge/heroui/button"; import { Button } from "@/shadcn-bridge/heroui/button";
@@ -24,11 +28,11 @@ import {
TableHeader, TableHeader,
TableColumn, TableColumn,
TableBody, TableBody,
TableRow,
TableCell, TableCell,
} from "@/shadcn-bridge/heroui/table"; } from "@/shadcn-bridge/heroui/table";
import { import {
createSpeedLimit, createSpeedLimit,
updateSpeedLimitOrder,
getSpeedLimitList, getSpeedLimitList,
updateSpeedLimit, updateSpeedLimit,
deleteSpeedLimit, deleteSpeedLimit,
@@ -52,9 +56,17 @@ interface SpeedLimitForm {
status: number; status: number;
} }
const fetchOrderedRules = async (): Promise<SpeedLimitRule[]> => {
const response = await getSpeedLimitList();
if (response.code !== 0) throw new Error(response.msg);
return (response.data || []) as SpeedLimitRule[];
};
export default function LimitPage() { export default function LimitPage() {
const [loading, setLoading] = useState(true); const order = useServerOrder(fetchOrderedRules, updateSpeedLimitOrder);
const [rules, setRules] = useState<SpeedLimitRule[]>([]); const { items: rules, loading, reload: loadData } = order;
const [searchKeyword, setSearchKeyword] = useLocalStorageState( const [searchKeyword, setSearchKeyword] = useLocalStorageState(
"limit-search-keyword", "limit-search-keyword",
"", "",
@@ -92,28 +104,6 @@ export default function LimitPage() {
// 表单验证错误 // 表单验证错误
const [errors, setErrors] = useState<{ [key: string]: string }>({}); const [errors, setErrors] = useState<{ [key: string]: string }>({});
useEffect(() => {
loadData();
}, []);
// 加载所有数据
const loadData = async () => {
setLoading(true);
try {
const rulesRes = await getSpeedLimitList();
if (rulesRes.code === 0) {
setRules(rulesRes.data || []);
} else {
toast.error(rulesRes.msg || "获取限速规则失败");
}
} catch {
toast.error("加载数据失败");
} finally {
setLoading(false);
}
};
// 表单验证 // 表单验证
const validateForm = (): boolean => { const validateForm = (): boolean => {
const newErrors: { [key: string]: string } = {}; const newErrors: { [key: string]: string } = {};
@@ -166,7 +156,7 @@ export default function LimitPage() {
// 确认删除规则 // 确认删除规则
const confirmDelete = async () => { const confirmDelete = async () => {
if (!ruleToDelete) return; if (!ruleToDelete || order.saving || deleteLoading) return;
setDeleteLoading(true); setDeleteLoading(true);
try { try {
@@ -175,7 +165,7 @@ export default function LimitPage() {
if (res.code === 0) { if (res.code === 0) {
toast.success("删除成功"); toast.success("删除成功");
setDeleteModalOpen(false); setDeleteModalOpen(false);
loadData(); await loadData();
} else { } else {
toast.error(res.msg || "删除失败"); toast.error(res.msg || "删除失败");
} }
@@ -188,7 +178,7 @@ export default function LimitPage() {
// 提交表单 // 提交表单
const handleSubmit = async () => { const handleSubmit = async () => {
if (!validateForm()) return; if (order.saving || !validateForm()) return;
setSubmitLoading(true); setSubmitLoading(true);
try { try {
@@ -215,7 +205,7 @@ export default function LimitPage() {
if (res.code === 0) { if (res.code === 0) {
toast.success(isEdit ? "修改成功" : "创建成功"); toast.success(isEdit ? "修改成功" : "创建成功");
setModalOpen(false); setModalOpen(false);
loadData(); await loadData();
} else { } else {
toast.error(res.msg || "操作失败"); toast.error(res.msg || "操作失败");
} }
@@ -226,9 +216,16 @@ export default function LimitPage() {
} }
}; };
if (loading) { const orderReason = !isAdmin()
return <PageLoadingState message="正在加载..." />; ? "仅管理员可调整全局顺序。"
} : searchKeyword.length > 0
? "搜索期间无法排序,请清空搜索后重试。"
: order.saving
? "正在保存顺序,请稍候。"
: loading || submitLoading || deleteLoading
? "正在加载或更新列表,请稍候。"
: "";
const orderDisabled = Boolean(orderReason);
return ( return (
<AnimatedPage className="px-3 lg:px-6 py-8"> <AnimatedPage className="px-3 lg:px-6 py-8">
@@ -263,8 +260,25 @@ export default function LimitPage() {
</div> </div>
</div> </div>
<OrderStatus
error={order.error}
reason={orderReason}
retry={() => {
if (!order.saving) void loadData();
}}
/>
<OrderList
key={`${viewMode}:${searchKeyword}:${orderDisabled}`}
ids={filteredRules.map((rule) => rule.id)}
onDragEnd={(event) => {
void order.reorder(event, orderDisabled);
}}
onDragStart={order.onDragStart}
>
{/* 统一卡片网格 */} {/* 统一卡片网格 */}
{filteredRules.length > 0 ? ( {loading ? (
<PageLoadingState message="正在加载..." />
) : filteredRules.length > 0 ? (
viewMode === "list" ? ( viewMode === "list" ? (
<Card> <Card>
<Table <Table
@@ -285,9 +299,16 @@ export default function LimitPage() {
</TableHeader> </TableHeader>
<TableBody items={filteredRules}> <TableBody items={filteredRules}>
{(rule) => ( {(rule) => (
<TableRow key={rule.id}> <OrderItem
key={rule.id}
row
disabled={orderDisabled}
id={rule.id}
label={rule.name}
>
<TableCell> <TableCell>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<OrderHandle />
<div <div
className={`shrink-0 w-2 h-2 rounded-full ${ className={`shrink-0 w-2 h-2 rounded-full ${
rule.status === 1 ? "bg-success" : "bg-danger" rule.status === 1 ? "bg-success" : "bg-danger"
@@ -323,7 +344,7 @@ export default function LimitPage() {
</Button> </Button>
</div> </div>
</TableCell> </TableCell>
</TableRow> </OrderItem>
)} )}
</TableBody> </TableBody>
</Table> </Table>
@@ -331,9 +352,15 @@ export default function LimitPage() {
) : ( ) : (
<StaggerList className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4"> <StaggerList className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4">
{filteredRules.map((rule) => ( {filteredRules.map((rule) => (
<StaggerItem key={rule.id}> <OrderItem
key={rule.id}
disabled={orderDisabled}
id={rule.id}
label={rule.name}
>
<Card className="shadow-sm overflow-hidden h-full"> <Card className="shadow-sm overflow-hidden h-full">
<CardHeader className="pb-2 md:pb-2"> <CardHeader className="pb-2 md:pb-2">
<OrderHandle />
<div className="flex justify-between items-start w-full"> <div className="flex justify-between items-start w-full">
<div> <div>
<h3 className="font-semibold text-foreground"> <h3 className="font-semibold text-foreground">
@@ -412,7 +439,7 @@ export default function LimitPage() {
</div> </div>
</CardBody> </CardBody>
</Card> </Card>
</StaggerItem> </OrderItem>
))} ))}
</StaggerList> </StaggerList>
) )
@@ -429,6 +456,7 @@ export default function LimitPage() {
</CardBody> </CardBody>
</Card> </Card>
)} )}
</OrderList>
{/* 新增/编辑模态框 */} {/* 新增/编辑模态框 */}
<Modal <Modal
@@ -497,6 +525,7 @@ export default function LimitPage() {
</Button> </Button>
<Button <Button
color="primary" color="primary"
isDisabled={order.saving}
isLoading={submitLoading} isLoading={submitLoading}
onPress={handleSubmit} onPress={handleSubmit}
> >
@@ -544,6 +573,7 @@ export default function LimitPage() {
</Button> </Button>
<Button <Button
color="danger" color="danger"
isDisabled={order.saving}
isLoading={deleteLoading} isLoading={deleteLoading}
onPress={confirmDelete} onPress={confirmDelete}
> >
+117 -119
View File
@@ -1,13 +1,17 @@
import { useState, useEffect, useMemo, useCallback, useRef } from "react"; import { useState, useEffect, useMemo, useCallback } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { parseDate } from "@internationalized/date"; import { parseDate } from "@internationalized/date";
import { LayoutGrid, List } from "lucide-react"; import { LayoutGrid, List } from "lucide-react";
import { isAdmin } from "@/utils/auth";
import { useServerOrder } from "@/hooks/use-server-order";
import { import {
AnimatedPage, OrderHandle,
StaggerList, OrderItem,
StaggerItem, OrderList,
} from "@/components/animated-page"; OrderStatus,
} from "@/components/server-order";
import { AnimatedPage, StaggerList } from "@/components/animated-page";
import { Button } from "@/shadcn-bridge/heroui/button"; import { Button } from "@/shadcn-bridge/heroui/button";
import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card"; import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card";
import { Input } from "@/shadcn-bridge/heroui/input"; import { Input } from "@/shadcn-bridge/heroui/input";
@@ -43,10 +47,10 @@ import {
TunnelAssignItem, TunnelAssignItem,
Tunnel, Tunnel,
SpeedLimit, SpeedLimit,
Pagination as PaginationType,
} from "@/types"; } from "@/types";
import { import {
getAllUsers, getAllUsers,
updateUserOrder,
createUser, createUser,
updateUser, updateUser,
deleteUser, deleteUser,
@@ -145,8 +149,6 @@ const calculateTunnelUsedFlow = (tunnel: UserTunnel): number => {
return inFlow + outFlow; return inFlow + outFlow;
}; };
const USER_SEARCH_DEBOUNCE_MS = 250;
const normalizeUserItem = (item: Partial<User>): User => { const normalizeUserItem = (item: Partial<User>): User => {
return { return {
id: Number(item.id ?? 0), id: Number(item.id ?? 0),
@@ -191,10 +193,23 @@ const normalizeUserTunnelItem = (item: Partial<UserTunnel>): UserTunnel => {
}; };
}; };
const fetchOrderedUsers = async (): Promise<User[]> => {
const response = await getAllUsers();
if (response.code !== 0) throw new Error(response.msg);
return (response.data || []).map((item) => normalizeUserItem(item));
};
export default function UserPage() { export default function UserPage() {
// 状态管理 // 状态管理
const [users, setUsers] = useState<User[]>([]); const order = useServerOrder(fetchOrderedUsers, updateUserOrder);
const [loading, setLoading] = useState(true); const {
items: allUsers,
setItems: setUsers,
loading,
reload: loadUsers,
} = order;
const [searchKeyword, setSearchKeyword] = useLocalStorageState( const [searchKeyword, setSearchKeyword] = useLocalStorageState(
"user-search-keyword", "user-search-keyword",
"", "",
@@ -204,12 +219,18 @@ export default function UserPage() {
"user-view-mode", "user-view-mode",
"grid", "grid",
); );
const [pagination, setPagination] = useState<PaginationType>({ const users = useMemo(() => {
current: 1, const keyword = searchKeyword.trim().toLowerCase();
size: 10,
total: 0, return keyword
}); ? allUsers.filter(
const searchDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null); (user) =>
user.user.trim().toLowerCase().includes(keyword) ||
(user.name || "").trim().toLowerCase().includes(keyword),
)
: allUsers;
}, [allUsers, searchKeyword]);
const [deleteLoading, setDeleteLoading] = useState(false);
// 用户表单相关状态 // 用户表单相关状态
const { const {
@@ -359,37 +380,6 @@ export default function UserPage() {
return !speedLimitIds.has(speedId); return !speedLimitIds.has(speedId);
}; };
// 数据加载函数
const loadUsers = useCallback(
async (keywordOverride?: string) => {
setLoading(true);
try {
const keyword = keywordOverride ?? searchKeyword;
const response = await getAllUsers({
current: pagination.current,
size: pagination.size,
keyword,
});
if (response.code === 0) {
const nextUsers = Array.isArray(response.data)
? response.data.map((item) => normalizeUserItem(item))
: [];
setUsers(nextUsers);
setPagination((prev) => ({ ...prev, total: nextUsers.length }));
} else {
toast.error(response.msg || "获取用户列表失败");
}
} catch {
toast.error("获取用户列表失败");
} finally {
setLoading(false);
}
},
[pagination.current, pagination.size],
);
const loadTunnels = useCallback(async () => { const loadTunnels = useCallback(async () => {
try { try {
const response = await getTunnelList(); const response = await getTunnelList();
@@ -483,40 +473,10 @@ export default function UserPage() {
void loadMonitorPermissions(); void loadMonitorPermissions();
}, [loadMonitorPermissions, loadSpeedLimits, loadTunnels, loadUserGroups]); }, [loadMonitorPermissions, loadSpeedLimits, loadTunnels, loadUserGroups]);
useEffect(() => { // Search is local to the complete server snapshot, so no partial response
if (searchDebounceRef.current) { // can replace the reorder set when a search is cleared.
clearTimeout(searchDebounceRef.current);
}
searchDebounceRef.current = setTimeout(() => {
setPagination((prev) => {
if (prev.current === 1) {
void loadUsers(searchKeyword);
return prev;
}
return { ...prev, current: 1 };
});
}, USER_SEARCH_DEBOUNCE_MS);
return () => {
if (searchDebounceRef.current) {
clearTimeout(searchDebounceRef.current);
searchDebounceRef.current = null;
}
};
}, [loadUsers, searchKeyword]);
// 用户管理操作
const handleSearch = () => { const handleSearch = () => {
if (searchDebounceRef.current) { void loadUsers();
clearTimeout(searchDebounceRef.current);
searchDebounceRef.current = null;
}
setPagination((prev) => ({ ...prev, current: 1 }));
void loadUsers(searchKeyword);
}; };
const handleAdd = () => { const handleAdd = () => {
@@ -581,7 +541,8 @@ export default function UserPage() {
}; };
const handleConfirmDelete = async () => { const handleConfirmDelete = async () => {
if (!userToDelete) return; if (!userToDelete || order.saving || deleteLoading) return;
setDeleteLoading(true);
try { try {
const response = await deleteUser(userToDelete.id); const response = await deleteUser(userToDelete.id);
@@ -589,11 +550,7 @@ export default function UserPage() {
if (response.code === 0) { if (response.code === 0) {
toast.success("删除成功"); toast.success("删除成功");
onDeleteModalClose(); onDeleteModalClose();
setUsers((prev) => removeItemsById(prev, [userToDelete.id])); await loadUsers();
setPagination((prev) => ({
...prev,
total: Math.max(prev.total - 1, 0),
}));
setUserToDelete(null); setUserToDelete(null);
if (currentUser?.id === userToDelete.id) { if (currentUser?.id === userToDelete.id) {
setCurrentUser(null); setCurrentUser(null);
@@ -604,10 +561,13 @@ export default function UserPage() {
} }
} catch { } catch {
toast.error("删除失败"); toast.error("删除失败");
} finally {
setDeleteLoading(false);
} }
}; };
const handleSubmitUser = async () => { const handleSubmitUser = async () => {
if (order.saving) return;
if (!userForm.user || (!userForm.pwd && !isEdit) || !userForm.expTime) { if (!userForm.user || (!userForm.pwd && !isEdit) || !userForm.expTime) {
toast.error("请填写完整信息"); toast.error("请填写完整信息");
@@ -645,26 +605,7 @@ export default function UserPage() {
if (response.code === 0) { if (response.code === 0) {
toast.success(isEdit ? "更新成功" : "创建成功"); toast.success(isEdit ? "更新成功" : "创建成功");
onUserModalClose(); onUserModalClose();
const responseUser = normalizeUserItem((response as any).data || {});
if (
isEdit &&
responseUser.id > 0 &&
pagination.current === 1 &&
!searchKeyword.trim()
) {
setUsers((prev) => replaceItemById(prev, responseUser));
} else if (
!isEdit &&
responseUser.id > 0 &&
pagination.current === 1 &&
!searchKeyword.trim()
) {
setUsers((prev) => [responseUser, ...prev].slice(0, pagination.size));
setPagination((prev) => ({ ...prev, total: prev.total + 1 }));
} else {
await loadUsers(); await loadUsers();
}
} else { } else {
const userDisabled = const userDisabled =
isEdit && isEdit &&
@@ -958,7 +899,7 @@ export default function UserPage() {
if (response.code === 0) { if (response.code === 0) {
toast.success("用户配额已重置"); toast.success("用户配额已重置");
await loadUsers(searchKeyword); await loadUsers();
} else { } else {
toast.error(response.msg || "重置用户配额失败"); toast.error(response.msg || "重置用户配额失败");
} }
@@ -1048,6 +989,17 @@ export default function UserPage() {
return userTunnels.some((ut) => ut.tunnelId === tunnelId); return userTunnels.some((ut) => ut.tunnelId === tunnelId);
}; };
const orderReason = !isAdmin()
? "仅管理员可调整全局顺序。"
: searchKeyword.length > 0
? "搜索期间无法排序,请清空搜索后重试。"
: order.saving
? "正在保存顺序,请稍候。"
: loading || userFormLoading || deleteLoading
? "正在加载或更新列表,请稍候。"
: "";
const orderDisabled = Boolean(orderReason);
return ( return (
<AnimatedPage className="px-3 lg:px-6 py-8"> <AnimatedPage className="px-3 lg:px-6 py-8">
{/* 页面头部 */} {/* 页面头部 */}
@@ -1130,6 +1082,21 @@ export default function UserPage() {
</div> </div>
{/* 用户列表 */} {/* 用户列表 */}
<OrderStatus
error={order.error}
reason={orderReason}
retry={() => {
if (!order.saving) void loadUsers();
}}
/>
<OrderList
key={`${viewMode}:${searchKeyword}:${orderDisabled}`}
ids={users.map((user) => user.id)}
onDragEnd={(event) => {
void order.reorder(event, orderDisabled);
}}
onDragStart={order.onDragStart}
>
{loading ? ( {loading ? (
<PageLoadingState message="正在加载..." /> <PageLoadingState message="正在加载..." />
) : users.length === 0 ? ( ) : users.length === 0 ? (
@@ -1173,9 +1140,16 @@ export default function UserPage() {
const usedFlow = calculateUserTotalUsedFlow(user); const usedFlow = calculateUserTotalUsedFlow(user);
return ( return (
<TableRow key={user.id}> <OrderItem
key={user.id}
row
disabled={orderDisabled}
id={user.id}
label={user.name || user.user}
>
<TableCell> <TableCell>
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<OrderHandle />
<div className="flex items-center justify-center shrink-0 w-10 h-10 rounded-full bg-primary text-white font-bold text-sm relative"> <div className="flex items-center justify-center shrink-0 w-10 h-10 rounded-full bg-primary text-white font-bold text-sm relative">
{(user.name || user.user).slice(0, 2).toUpperCase()} {(user.name || user.user).slice(0, 2).toUpperCase()}
<span <span
@@ -1224,14 +1198,18 @@ export default function UserPage() {
(user.monthlyQuotaGB ?? 0) > 0 ? ( (user.monthlyQuotaGB ?? 0) > 0 ? (
<> <>
<div className="flex gap-1 justify-between"> <div className="flex gap-1 justify-between">
<span className="text-default-500">日配额:</span> <span className="text-default-500">
日配额:
</span>
<span> <span>
{formatFlow(user.dailyUsedBytes ?? 0)} /{" "} {formatFlow(user.dailyUsedBytes ?? 0)} /{" "}
{formatQuotaLimit(user.dailyQuotaGB)} {formatQuotaLimit(user.dailyQuotaGB)}
</span> </span>
</div> </div>
<div className="flex gap-1 justify-between"> <div className="flex gap-1 justify-between">
<span className="text-default-500">月配额:</span> <span className="text-default-500">
月配额:
</span>
<span> <span>
{formatFlow(user.monthlyUsedBytes ?? 0)} /{" "} {formatFlow(user.monthlyUsedBytes ?? 0)} /{" "}
{formatQuotaLimit(user.monthlyQuotaGB)} {formatQuotaLimit(user.monthlyQuotaGB)}
@@ -1308,7 +1286,7 @@ export default function UserPage() {
</Button> </Button>
</div> </div>
</TableCell> </TableCell>
</TableRow> </OrderItem>
); );
}} }}
</TableBody> </TableBody>
@@ -1325,15 +1303,22 @@ export default function UserPage() {
const flowPercent = const flowPercent =
user.flow > 0 && !(user.flow === 99999 && !user.flowMiB) user.flow > 0 && !(user.flow === 99999 && !user.flowMiB)
? Math.min( ? Math.min(
(usedFlow / flowLimitBytes(user.flow, user.flowMiB)) * 100, (usedFlow / flowLimitBytes(user.flow, user.flowMiB)) *
100,
100, 100,
) )
: 0; : 0;
return ( return (
<StaggerItem key={user.id}> <OrderItem
key={user.id}
disabled={orderDisabled}
id={user.id}
label={user.name || user.user}
>
<Card className="overflow-hidden h-full"> <Card className="overflow-hidden h-full">
<CardHeader className="pb-2 md:pb-2"> <CardHeader className="pb-2 md:pb-2">
<OrderHandle />
<div className="flex justify-between items-start w-full"> <div className="flex justify-between items-start w-full">
<div className="flex items-center gap-3 flex-1 min-w-0"> <div className="flex items-center gap-3 flex-1 min-w-0">
<div className="flex items-center justify-center shrink-0 w-10 h-10 rounded-full bg-primary text-white font-bold text-sm relative"> <div className="flex items-center justify-center shrink-0 w-10 h-10 rounded-full bg-primary text-white font-bold text-sm relative">
@@ -1412,16 +1397,22 @@ export default function UserPage() {
(user.disabledByQuota ?? 0) > 0 ? ( (user.disabledByQuota ?? 0) > 0 ? (
<> <>
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span className="text-default-600">每日配额</span> <span className="text-default-600">
每日配额
</span>
<span className="font-medium text-xs"> <span className="font-medium text-xs">
{formatFlow(Number(user.dailyUsedBytes ?? 0))} /{" "} {formatFlow(Number(user.dailyUsedBytes ?? 0))}{" "}
{formatQuotaLimit(user.dailyQuotaGB)} / {formatQuotaLimit(user.dailyQuotaGB)}
</span> </span>
</div> </div>
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span className="text-default-600">每月配额</span> <span className="text-default-600">
每月配额
</span>
<span className="font-medium text-xs"> <span className="font-medium text-xs">
{formatFlow(Number(user.monthlyUsedBytes ?? 0))}{" "} {formatFlow(
Number(user.monthlyUsedBytes ?? 0),
)}{" "}
/ {formatQuotaLimit(user.monthlyQuotaGB)} / {formatQuotaLimit(user.monthlyQuotaGB)}
</span> </span>
</div> </div>
@@ -1529,11 +1520,12 @@ export default function UserPage() {
</div> </div>
</CardBody> </CardBody>
</Card> </Card>
</StaggerItem> </OrderItem>
); );
})} })}
</StaggerList> </StaggerList>
)} )}
</OrderList>
{/* 用户表单模态框 */} {/* 用户表单模态框 */}
<Modal <Modal
@@ -1784,6 +1776,7 @@ export default function UserPage() {
<Button onPress={onUserModalClose}>取消</Button> <Button onPress={onUserModalClose}>取消</Button>
<Button <Button
color="primary" color="primary"
isDisabled={order.saving}
isLoading={userFormLoading} isLoading={userFormLoading}
onPress={handleSubmitUser} onPress={handleSubmitUser}
> >
@@ -2347,7 +2340,12 @@ export default function UserPage() {
<Button variant="light" onPress={onDeleteModalClose}> <Button variant="light" onPress={onDeleteModalClose}>
取消 取消
</Button> </Button>
<Button color="danger" onPress={handleConfirmDelete}> <Button
color="danger"
isDisabled={order.saving}
isLoading={deleteLoading}
onPress={handleConfirmDelete}
>
确认删除 确认删除
</Button> </Button>
</ModalFooter> </ModalFooter>