wip: 合并 master 前暂存本地改动
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
AdministratorandClaude Opus 4.8 committed
1 parent
1ce15fbb15
commit
44c0f6189b
13 files changed
+712
-444
No files matched your search
@@ -21,6 +21,7 @@ import {
|
||||
RefreshCw,
|
||||
TagsIcon,
|
||||
Trash2,
|
||||
X,
|
||||
} from "lucide-react";
|
||||
import { useSearchParams } from "react-router-dom";
|
||||
import { useRouteNavigate as useNavigate } from "@/core/route-base";
|
||||
@@ -148,6 +149,11 @@ export default function ScheduledTasksPage() {
|
||||
const initialTaskId = searchParams.get("task");
|
||||
const [search, setSearch] = useState("");
|
||||
const [tagIds, setTagIds] = useState<string[]>([]);
|
||||
// Publisher (创建者) filter for the 我的任务 tab — click a task's 创建者 to keep
|
||||
// only that creator's tasks. {id} is creator_user_id; {label} the display name.
|
||||
const [publisher, setPublisher] = useState<{ id: string; label: string } | null>(
|
||||
null,
|
||||
);
|
||||
// Name + tag filtering is resolved server-side via the /api/scheduled-tasks query.
|
||||
const { data: tasks = [], isLoading } = useScheduledTasks({ search, tagIds });
|
||||
const { data: deliveryProfile } = useScheduledTaskDeliveryProfile();
|
||||
@@ -199,6 +205,16 @@ export default function ScheduledTasksPage() {
|
||||
}),
|
||||
[tasks],
|
||||
);
|
||||
// The rendered 我的任务 list, optionally narrowed to one creator. Selection
|
||||
// logic still runs against the full sortedTasks so the detail panel keeps
|
||||
// working even when the picked task is from a filtered-out creator.
|
||||
const visibleTasks = useMemo(
|
||||
() =>
|
||||
publisher
|
||||
? sortedTasks.filter((task) => task.creator_user_id === publisher.id)
|
||||
: sortedTasks,
|
||||
[sortedTasks, publisher],
|
||||
);
|
||||
const selectedTask = sortedTasks.find((task) => task.task_id === selectedTaskId) ?? null;
|
||||
const selectedTaskCanEditRuns = !!selectedTask && selectedTask.role !== "subscriber";
|
||||
const { data: runs = [], isLoading: runsLoading } = useScheduledTaskRuns(selectedTaskId);
|
||||
@@ -451,6 +467,20 @@ export default function ScheduledTasksPage() {
|
||||
onTagIdsChange={setTagIds}
|
||||
/>
|
||||
)}
|
||||
{activeTab === "mine" && publisher && (
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-muted-foreground text-xs">筛选创建者：</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setPublisher(null)}
|
||||
className="bg-primary/10 text-primary hover:bg-primary/20 inline-flex items-center gap-1 rounded-full px-3 py-1 text-xs font-medium transition-colors"
|
||||
title="点击清除创建者筛选"
|
||||
>
|
||||
{publisher.label}
|
||||
<X className="size-3.5" />
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
</CardHeader>
|
||||
<CardContent className="min-h-0 flex-1 p-0">
|
||||
<ScrollArea className="size-full">
|
||||
@@ -459,12 +489,14 @@ export default function ScheduledTasksPage() {
|
||||
{isLoading && (
|
||||
<div className="text-muted-foreground text-sm">正在加载任务...</div>
|
||||
)}
|
||||
{!isLoading && sortedTasks.length === 0 && (
|
||||
{!isLoading && visibleTasks.length === 0 && (
|
||||
<div className="text-muted-foreground rounded-md border p-4 text-sm">
|
||||
还没有定时任务。点击新建创建第一个任务，或去“广场”收藏他人发布的任务。
|
||||
{publisher
|
||||
? `没有「${publisher.label}」创建的任务。`
|
||||
: "还没有定时任务。点击新建创建第一个任务，或去“广场”收藏他人发布的任务。"}
|
||||
</div>
|
||||
)}
|
||||
{sortedTasks.map((task) => {
|
||||
{visibleTasks.map((task) => {
|
||||
const isOwner = task.role !== "subscriber";
|
||||
const isSubscriber = task.role === "subscriber";
|
||||
const notifyOn = !!task._subscription?.notify_element;
|
||||
@@ -539,11 +571,36 @@ export default function ScheduledTasksPage() {
|
||||
)}
|
||||
</div>
|
||||
{(task.creator_email || task.creator_user_id) && (
|
||||
<div className="truncate">
|
||||
// The card itself is a <button>, so this clickable
|
||||
// creator must be a <span> (no nested buttons).
|
||||
<span
|
||||
role={task.creator_user_id ? "button" : undefined}
|
||||
tabIndex={task.creator_user_id ? 0 : undefined}
|
||||
onClick={(event) => {
|
||||
if (!task.creator_user_id) return;
|
||||
event.stopPropagation();
|
||||
setPublisher({
|
||||
id: task.creator_user_id,
|
||||
label:
|
||||
displayUsername(task.creator_email) ||
|
||||
task.creator_user_id,
|
||||
});
|
||||
}}
|
||||
className={cn(
|
||||
"block max-w-full truncate text-sm font-medium",
|
||||
task.creator_user_id &&
|
||||
"hover:text-primary cursor-pointer transition-colors hover:underline",
|
||||
)}
|
||||
title={
|
||||
task.creator_user_id
|
||||
? `点击筛选创建者：${displayUsername(task.creator_email) || task.creator_user_id}`
|
||||
: undefined
|
||||
}
|
||||
>
|
||||
创建者：
|
||||
{displayUsername(task.creator_email) ||
|
||||
task.creator_user_id}
|
||||
</div>
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{(task.tags?.length ?? 0) > 0 && (
|
||||
@@ -781,7 +838,7 @@ export default function ScheduledTasksPage() {
|
||||
{selectedTask ? desensitize(selectedTask.name) : "请选择左侧任务"}
|
||||
</p>
|
||||
{selectedTask && (selectedTask.creator_email || selectedTask.creator_user_id) && (
|
||||
<p className="text-muted-foreground text-xs">
|
||||
<p className="text-muted-foreground text-sm font-medium">
|
||||
创建者：
|
||||
{displayUsername(selectedTask.creator_email) ||
|
||||
selectedTask.creator_user_id}
|
||||
|
||||
Reference in new issue
Block a user