mirror of
https://github.com/Sagit-chu/flvx.git
synced 2026-11-17 01:44:23 +08:00
Merge custom order review fixes
This commit is contained in:
@@ -18,7 +18,8 @@ export function useServerOrder<T extends { id: number }>(
|
|||||||
const [items, setItems] = useState<T[]>([]);
|
const [items, setItems] = useState<T[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [error, setError] = useState("");
|
const [loadError, setLoadError] = useState("");
|
||||||
|
const [saveWarning, setSaveWarning] = useState("");
|
||||||
const mounted = useRef(false);
|
const mounted = useRef(false);
|
||||||
const request = useRef(0);
|
const request = useRef(0);
|
||||||
const savingRef = useRef(false);
|
const savingRef = useRef(false);
|
||||||
@@ -36,11 +37,12 @@ export function useServerOrder<T extends { id: number }>(
|
|||||||
|
|
||||||
if (!mounted.current || version !== request.current) return;
|
if (!mounted.current || version !== request.current) return;
|
||||||
setItems(rows);
|
setItems(rows);
|
||||||
|
setLoadError("");
|
||||||
} catch {
|
} catch {
|
||||||
if (!mounted.current || version !== request.current) return;
|
if (!mounted.current || version !== request.current) return;
|
||||||
// Never expose a partial or unverified set as reorderable after failure.
|
// Never expose a partial or unverified set as reorderable after failure.
|
||||||
setItems([]);
|
setItems([]);
|
||||||
setError("加载列表失败,请重试后再排序。");
|
setLoadError("加载列表失败,请重试后再排序。");
|
||||||
} finally {
|
} finally {
|
||||||
if (mounted.current && version === request.current) setLoading(false);
|
if (mounted.current && version === request.current) setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -78,7 +80,7 @@ export function useServerOrder<T extends { id: number }>(
|
|||||||
if (from < 0 || to < 0) return;
|
if (from < 0 || to < 0) return;
|
||||||
savingRef.current = true;
|
savingRef.current = true;
|
||||||
setSaving(true);
|
setSaving(true);
|
||||||
setError("");
|
setSaveWarning("");
|
||||||
try {
|
try {
|
||||||
const result = await saveOrder({
|
const result = await saveOrder({
|
||||||
ids: arrayMove(items, from, to).map((item) => item.id),
|
ids: arrayMove(items, from, to).map((item) => item.id),
|
||||||
@@ -87,7 +89,7 @@ export function useServerOrder<T extends { id: number }>(
|
|||||||
|
|
||||||
if (!mounted.current) return;
|
if (!mounted.current) return;
|
||||||
if (result.code !== 0) {
|
if (result.code !== 0) {
|
||||||
setError(
|
setSaveWarning(
|
||||||
result.transportError
|
result.transportError
|
||||||
? "排序保存未确认,请检查重新加载后的服务器顺序再重试。"
|
? "排序保存未确认,请检查重新加载后的服务器顺序再重试。"
|
||||||
: result.code === 409
|
: result.code === 409
|
||||||
@@ -97,7 +99,7 @@ export function useServerOrder<T extends { id: number }>(
|
|||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
if (mounted.current)
|
if (mounted.current)
|
||||||
setError("排序保存未确认,请检查重新加载后的服务器顺序再重试。");
|
setSaveWarning("排序保存未确认,请检查重新加载后的服务器顺序再重试。");
|
||||||
} finally {
|
} finally {
|
||||||
if (mounted.current) {
|
if (mounted.current) {
|
||||||
await reload();
|
await reload();
|
||||||
@@ -112,7 +114,7 @@ export function useServerOrder<T extends { id: number }>(
|
|||||||
setItems,
|
setItems,
|
||||||
loading,
|
loading,
|
||||||
saving,
|
saving,
|
||||||
error,
|
error: [saveWarning, loadError].filter(Boolean).join(" "),
|
||||||
reload,
|
reload,
|
||||||
onDragStart,
|
onDragStart,
|
||||||
reorder,
|
reorder,
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import {
|
|||||||
OrderStatus,
|
OrderStatus,
|
||||||
} from "@/components/server-order";
|
} from "@/components/server-order";
|
||||||
import { useServerOrder } from "@/hooks/use-server-order";
|
import { useServerOrder } from "@/hooks/use-server-order";
|
||||||
|
import { getOrderDisabledReason } from "@/utils/server-order";
|
||||||
import { isAdmin } from "@/utils/auth";
|
import { isAdmin } from "@/utils/auth";
|
||||||
import { AnimatedPage, StaggerList } from "@/components/animated-page";
|
import { AnimatedPage, StaggerList } from "@/components/animated-page";
|
||||||
import { SearchBar } from "@/components/search-bar";
|
import { SearchBar } from "@/components/search-bar";
|
||||||
@@ -216,15 +217,12 @@ export default function LimitPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const orderReason = !isAdmin()
|
const orderReason = getOrderDisabledReason({
|
||||||
? "仅管理员可调整全局顺序。"
|
isAdmin: isAdmin(),
|
||||||
: searchKeyword.length > 0
|
searchKeyword,
|
||||||
? "搜索期间无法排序,请清空搜索后重试。"
|
saving: order.saving,
|
||||||
: order.saving
|
busy: loading || submitLoading || deleteLoading,
|
||||||
? "正在保存顺序,请稍候。"
|
});
|
||||||
: loading || submitLoading || deleteLoading
|
|
||||||
? "正在加载或更新列表,请稍候。"
|
|
||||||
: "";
|
|
||||||
const orderDisabled = Boolean(orderReason);
|
const orderDisabled = Boolean(orderReason);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { LayoutGrid, List } from "lucide-react";
|
|||||||
|
|
||||||
import { isAdmin } from "@/utils/auth";
|
import { isAdmin } from "@/utils/auth";
|
||||||
import { useServerOrder } from "@/hooks/use-server-order";
|
import { useServerOrder } from "@/hooks/use-server-order";
|
||||||
|
import { getOrderDisabledReason } from "@/utils/server-order";
|
||||||
import {
|
import {
|
||||||
OrderHandle,
|
OrderHandle,
|
||||||
OrderItem,
|
OrderItem,
|
||||||
@@ -989,15 +990,12 @@ export default function UserPage() {
|
|||||||
return userTunnels.some((ut) => ut.tunnelId === tunnelId);
|
return userTunnels.some((ut) => ut.tunnelId === tunnelId);
|
||||||
};
|
};
|
||||||
|
|
||||||
const orderReason = !isAdmin()
|
const orderReason = getOrderDisabledReason({
|
||||||
? "仅管理员可调整全局顺序。"
|
isAdmin: isAdmin(),
|
||||||
: searchKeyword.length > 0
|
searchKeyword,
|
||||||
? "搜索期间无法排序,请清空搜索后重试。"
|
saving: order.saving,
|
||||||
: order.saving
|
busy: loading || userFormLoading || deleteLoading,
|
||||||
? "正在保存顺序,请稍候。"
|
});
|
||||||
: loading || userFormLoading || deleteLoading
|
|
||||||
? "正在加载或更新列表,请稍候。"
|
|
||||||
: "";
|
|
||||||
const orderDisabled = Boolean(orderReason);
|
const orderDisabled = Boolean(orderReason);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
interface OrderAvailability {
|
||||||
|
isAdmin: boolean;
|
||||||
|
searchKeyword: string;
|
||||||
|
saving: boolean;
|
||||||
|
busy: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getOrderDisabledReason({
|
||||||
|
isAdmin,
|
||||||
|
searchKeyword,
|
||||||
|
saving,
|
||||||
|
busy,
|
||||||
|
}: OrderAvailability): string {
|
||||||
|
if (!isAdmin) return "仅管理员可调整全局顺序。";
|
||||||
|
if (searchKeyword.length > 0) return "搜索期间无法排序,请清空搜索后重试。";
|
||||||
|
if (saving) return "正在保存顺序,请稍候。";
|
||||||
|
if (busy) return "正在加载或更新列表,请稍候。";
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user