- {statusText(item)}
+
+ {statusText(item)}
+
{timezoneLabel(item)}
最近：{formatTime(item.last_transition_at)}
diff --git a/web/src/lib/api.ts b/web/src/lib/api.ts
index 4d2aad4..9a673f6 100644
--- a/web/src/lib/api.ts
+++ b/web/src/lib/api.ts
@@ -328,7 +328,8 @@ export const api = {
deleteSchedule: (id: number) => del<{ ok: boolean }>(`/schedules/${id}`),
pauseSchedule: (id: number) => post<{ ok: boolean }>(`/schedules/${id}/pause`, {}),
resumeSchedule: (id: number) => post<{ ok: boolean }>(`/schedules/${id}/resume`, {}),
- runScheduleNow: (id: number) => post<{ ok: boolean }>(`/schedules/${id}/run-now`, {}),
+ runScheduleNow: (id: number) =>
+ post<{ ok: boolean; started: number; errors?: string[] }>(`/schedules/${id}/run-now`, {}),
taskCategories: () => get<{ categories: TaskCategory[] }>("/task-categories").then((r) => arr(r.categories)),
updateTask: (id: string, input: { name?: string; pinned?: boolean }) => patch(`/tasks/${id}`, input),
renameTask: (id: string, name: string) => patch(`/tasks/${id}`, { name }),
From 8a1c9debbb44e7763ad4ec124486067c0544bb6b Mon Sep 17 00:00:00 2001
From: ji ruo <79234113+RuoJi6@users.noreply.github.com>
Date: Sat, 10 Oct 2026 08:50:15 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=AE=A9=E7=AB=8B=E5=8D=B3=E8=BF=90?=
=?UTF-8?q?=E8=A1=8C=E7=9B=B4=E6=8E=A5=E6=81=A2=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/schedules.go | 18 +++++++++++++++---
web/src/app/(main)/function/schedules/page.tsx | 4 +++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/server/schedules.go b/server/schedules.go
index 67b83fa..34ac5d2 100644
--- a/server/schedules.go
+++ b/server/schedules.go
@@ -204,11 +204,19 @@ func (s *Server) runScheduleNow(w http.ResponseWriter, r *http.Request) {
return
}
_ = s.m.pg.RecordScheduleHistory(id, 0, "running", true, "手动立即运行")
- started, errors := s.runScheduleTasks(item)
+ started, errors := s.runScheduleTasksNow(item)
writeJSON(w, 200, map[string]any{"ok": true, "started": started, "errors": errors})
}
func (s *Server) runScheduleTasks(item *db.TaskSchedule) (int, []string) {
+ return s.startScheduleTasks(item, false)
+}
+
+func (s *Server) runScheduleTasksNow(item *db.TaskSchedule) (int, []string) {
+ return s.startScheduleTasks(item, true)
+}
+
+func (s *Server) startScheduleTasks(item *db.TaskSchedule, forceManualPause bool) (int, []string) {
started := 0
errors := []string{}
for _, taskID := range item.TaskIDs {
@@ -232,7 +240,7 @@ func (s *Server) runScheduleTasks(item *db.TaskSchedule) (int, []string) {
_ = s.m.pg.RecordScheduleHistory(item.ID, taskID, "resume", false, "状态读取失败")
continue
}
- if !managed {
+ if !managed && !forceManualPause {
errors = append(errors, fmt.Sprintf("任务 #%d 由人工暂停，计划不能强制恢复", taskID))
_ = s.m.pg.RecordScheduleHistory(item.ID, taskID, "resume", false, "人工暂停优先")
continue
@@ -245,7 +253,11 @@ func (s *Server) runScheduleTasks(item *db.TaskSchedule) (int, []string) {
}
started++
_ = s.m.pg.SetSchedulePaused(item.ID, taskID, false)
- _ = s.m.pg.RecordScheduleHistory(item.ID, taskID, "resume", true, "立即运行")
+ message := "立即运行"
+ if !managed && forceManualPause {
+ message = "立即运行（显式恢复人工暂停）"
+ }
+ _ = s.m.pg.RecordScheduleHistory(item.ID, taskID, "resume", true, message)
}
return started, errors
}
diff --git a/web/src/app/(main)/function/schedules/page.tsx b/web/src/app/(main)/function/schedules/page.tsx
index ddabb26..2d8c12e 100644
--- a/web/src/app/(main)/function/schedules/page.tsx
+++ b/web/src/app/(main)/function/schedules/page.tsx
@@ -528,7 +528,9 @@ export default function SchedulesPage() {
else {
const result = await api.runScheduleNow(id);
if (result.errors?.length) {
- toast.warning(`已启动 ${result.started} 个任务，但有 ${result.errors.length} 个任务未启动`);
+ toast.warning(
+ `已启动 ${result.started} 个任务，但有 ${result.errors.length} 个任务未启动：${result.errors.join("；")}`,
+ );
} else {
toast.success(`已立即运行 ${result.started} 个任务`);
}
From 96a10878ad9c1d161ab5ac608d94acb564d62fc0 Mon Sep 17 00:00:00 2001
From: ji ruo <79234113+RuoJi6@users.noreply.github.com>
Date: Sat, 10 Oct 2026 08:56:13 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=BE=E8=AE=A1?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1=E8=BF=90=E8=A1=8C=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/(main)/function/schedules/page.tsx | 79 +++++++++++--------
1 file changed, 46 insertions(+), 33 deletions(-)
diff --git a/web/src/app/(main)/function/schedules/page.tsx b/web/src/app/(main)/function/schedules/page.tsx
index 2d8c12e..6b9a3ce 100644
--- a/web/src/app/(main)/function/schedules/page.tsx
+++ b/web/src/app/(main)/function/schedules/page.tsx
@@ -162,14 +162,23 @@ function historyActionText(action: string) {
);
}
-function timelinePosition(event: ScheduleHistoryEntry, index: number, events: ScheduleHistoryEntry[]) {
- if (events.length <= 1) return 50;
- const timestamps = events.map((item) => Date.parse(item.created_at)).filter(Number.isFinite);
- const time = Date.parse(event.created_at);
- const min = Math.min(...timestamps);
- const max = Math.max(...timestamps);
- if (!Number.isFinite(time) || !Number.isFinite(min) || max <= min) return (index / (events.length - 1)) * 100;
- return ((time - min) / (max - min)) * 100;
+function historyEventClass(event: ScheduleHistoryEntry) {
+ if (!event.success)
+ return "border-red-200 bg-red-50 text-red-700 dark:border-red-900 dark:bg-red-950/40 dark:text-red-300";
+ if (event.action === "running" || event.action === "resume") {
+ return "border-emerald-200 bg-emerald-50 text-emerald-700 dark:border-emerald-900 dark:bg-emerald-950/40 dark:text-emerald-300";
+ }
+ if (event.action === "outside" || event.action === "pause" || event.action === "paused") {
+ return "border-amber-200 bg-amber-50 text-amber-700 dark:border-amber-900 dark:bg-amber-950/40 dark:text-amber-300";
+ }
+ return "border-slate-200 bg-slate-50 text-slate-700 dark:border-slate-800 dark:bg-slate-900/60 dark:text-slate-300";
+}
+
+function historyDotClass(event: ScheduleHistoryEntry) {
+ if (!event.success) return "bg-red-500";
+ if (event.action === "running" || event.action === "resume") return "bg-emerald-500";
+ if (event.action === "outside" || event.action === "pause" || event.action === "paused") return "bg-amber-500";
+ return "bg-slate-400";
}
function ScheduleTimeline({ schedule, loading }: { schedule?: TaskSchedule; loading: boolean }) {
@@ -181,38 +190,42 @@ function ScheduleTimeline({ schedule, loading }: { schedule?: TaskSchedule; load
);
}
- const events = [...(schedule?.history ?? [])].reverse();
+ // The API returns newest first. Keep that order so the latest transition is
+ // visible immediately when a row is expanded.
+ const events = schedule?.history ?? [];
if (!events.length) {
return 暂无运行记录，计划进入第一个窗口后会显示时间线。
;
}
return (
-
运行时间线
-
-
- {events.map((event, index) => (
-
-
-
- {historyActionText(event.action)}
-
-
- ))}
+
+
运行时间线
+
最近 {Math.min(events.length, 20)} 条记录
-
- {events.slice(-20).map((event) => (
-
-
{historyActionText(event.action)}
-
{formatTime(event.created_at)}
- {event.task_id ?
任务 #{event.task_id} : null}
- {event.message ? (
-
{event.message}
+
+ {events.slice(0, 20).map((event, index) => (
+
+ {index < Math.min(events.length, 20) - 1 ? (
+
) : null}
+
+
+
+
+ {historyActionText(event.action)}
+
+ {formatTime(event.created_at)}
+ {event.task_id ? `任务 #${event.task_id}` : "计划任务"}
+
+ {event.message ? (
+
+ {event.message}
+
+ ) : null}
+
))}
From 87e62fb904c4d2baee7f787772c3596befa4eea6 Mon Sep 17 00:00:00 2001
From: ji ruo <79234113+RuoJi6@users.noreply.github.com>
Date: Sat, 10 Oct 2026 09:01:21 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=B9=E9=87=8F=E9=80=89=E6=8B=A9=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/(main)/function/schedules/page.tsx | 86 ++++++++++++++++++-
1 file changed, 85 insertions(+), 1 deletion(-)
diff --git a/web/src/app/(main)/function/schedules/page.tsx b/web/src/app/(main)/function/schedules/page.tsx
index 6b9a3ce..49ff3c9 100644
--- a/web/src/app/(main)/function/schedules/page.tsx
+++ b/web/src/app/(main)/function/schedules/page.tsx
@@ -444,6 +444,7 @@ export default function SchedulesPage() {
const [query, setQuery] = React.useState("");
const [page, setPage] = React.useState(1);
const [pageSize, setPageSize] = React.useState("10");
+ const [selectedIds, setSelectedIds] = React.useState
([]);
const [expandedId, setExpandedId] = React.useState(null);
const [timelineById, setTimelineById] = React.useState>({});
const [timelineLoadingId, setTimelineLoadingId] = React.useState(null);
@@ -475,6 +476,13 @@ export default function SchedulesPage() {
const size = Number(pageSize);
const totalPages = Math.max(1, Math.ceil(filteredItems.length / size));
const visibleItems = filteredItems.slice((page - 1) * size, page * size);
+ const visibleIds = visibleItems.map((item) => item.id);
+ const selectedVisibleCount = visibleIds.filter((id) => selectedIds.includes(id)).length;
+ const allVisibleSelected = visibleItems.length > 0 && selectedVisibleCount === visibleItems.length;
+ const someVisibleSelected = selectedVisibleCount > 0 && !allVisibleSelected;
+ let headerSelectionState: boolean | "indeterminate" = false;
+ if (allVisibleSelected) headerSelectionState = true;
+ else if (someVisibleSelected) headerSelectionState = "indeterminate";
React.useEffect(() => {
setPage((current) => Math.min(current, totalPages));
}, [totalPages]);
@@ -486,6 +494,18 @@ export default function SchedulesPage() {
setPageSize(value);
setPage(1);
};
+ const toggleSelected = (id: number, checked: boolean) => {
+ setSelectedIds((current) => {
+ if (!checked) return current.filter((selected) => selected !== id);
+ return current.includes(id) ? current : [...current, id];
+ });
+ };
+ const toggleAllVisible = (checked: boolean) => {
+ setSelectedIds((current) => {
+ if (checked) return Array.from(new Set([...current, ...visibleIds]));
+ return current.filter((id) => !visibleIds.includes(id));
+ });
+ };
const toggleTimeline = async (id: number) => {
if (expandedId === id) {
setExpandedId(null);
@@ -553,6 +573,38 @@ export default function SchedulesPage() {
toast.error((e as Error).message);
}
};
+ const bulkRun = async () => {
+ const ids = [...selectedIds];
+ if (!ids.length) return;
+ let started = 0;
+ const errors: string[] = [];
+ const results = await Promise.allSettled(ids.map((id) => api.runScheduleNow(id)));
+ results.forEach((result, index) => {
+ if (result.status === "rejected") {
+ errors.push(`计划 #${ids[index]}：${(result.reason as Error).message}`);
+ return;
+ }
+ started += result.value.started;
+ if (result.value.errors?.length) errors.push(`计划 #${ids[index]}：${result.value.errors.join("；")}`);
+ });
+ if (errors.length) {
+ toast.warning(`已启动 ${started} 个任务，但有 ${errors.length} 项未完成：${errors.join("；")}`);
+ } else {
+ toast.success(`已立即运行 ${started} 个任务`);
+ }
+ setSelectedIds([]);
+ await load();
+ };
+ const bulkRemove = async () => {
+ const ids = [...selectedIds];
+ if (!ids.length || !window.confirm(`确定删除选中的 ${ids.length} 个计划吗？`)) return;
+ const results = await Promise.allSettled(ids.map((id) => api.deleteSchedule(id)));
+ const failed = results.filter((result) => result.status === "rejected").length;
+ if (failed) toast.warning(`已删除 ${ids.length - failed} 个计划，${failed} 个计划删除失败`);
+ else toast.success(`已删除 ${ids.length} 个计划`);
+ setSelectedIds([]);
+ await load();
+ };
let scheduleContent: React.ReactNode;
if (loading) {
scheduleContent = (
@@ -597,6 +649,24 @@ export default function SchedulesPage() {
共 {filteredItems.length} 条
+ {selectedIds.length ? (
+
+
已选 {selectedIds.length} 个计划
+
+
+
+
+
+
+ ) : null}
{filteredItems.length === 0 ? (
没有匹配的计划任务。
@@ -606,6 +676,13 @@ export default function SchedulesPage() {
+
+ toggleAllVisible(checked === true)}
+ />
+
计划名称
时间线
运行周期
@@ -621,6 +698,13 @@ export default function SchedulesPage() {
{visibleItems.map((item) => (
+
+ toggleSelected(item.id, checked === true)}
+ />
+
{item.name}
计划 #{item.id}
@@ -731,7 +815,7 @@ export default function SchedulesPage() {
{expandedId === item.id ? (
-
+
From 0af7132ab74103ea087aacbcf028965041a63f1f Mon Sep 17 00:00:00 2001
From: ji ruo <79234113+RuoJi6@users.noreply.github.com>
Date: Sat, 10 Oct 2026 09:16:28 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E6=9A=82=E5=81=9C=E6=9D=A5=E6=BA=90=E5=92=8C=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E7=BA=BF=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
db/schedules.go | 7 ++-
server/schedules.go | 2 +-
.../app/(main)/function/schedules/page.tsx | 47 +++++++++++++++----
3 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/db/schedules.go b/db/schedules.go
index 0183bcb..b5e908f 100644
--- a/db/schedules.go
+++ b/db/schedules.go
@@ -359,9 +359,12 @@ func (d *DB) SetSchedulePaused(scheduleID, taskID int64, paused bool) error {
return err
}
-func (d *DB) SchedulePausedTasks(taskID int64) (bool, error) {
+// TaskPausedBySchedule reads the authoritative task-level pause origin. The
+// scheduler writes this flag when it pauses a task, so callers must use it to
+// distinguish a scheduled pause from a manual pause.
+func (d *DB) TaskPausedBySchedule(taskID int64) (bool, error) {
var paused bool
- err := d.QueryRow(`SELECT EXISTS(SELECT 1 FROM task_schedule_tasks WHERE task_id=$1 AND paused_by_schedule)`, taskID).Scan(&paused)
+ err := d.QueryRow(`SELECT schedule_paused FROM tasks WHERE id=$1 AND deleted_at IS NULL`, taskID).Scan(&paused)
return paused, err
}
diff --git a/server/schedules.go b/server/schedules.go
index 34ac5d2..aa6c972 100644
--- a/server/schedules.go
+++ b/server/schedules.go
@@ -234,7 +234,7 @@ func (s *Server) startScheduleTasks(item *db.TaskSchedule, forceManualPause bool
started++
continue
}
- managed, err := s.m.pg.SchedulePausedTasks(taskID)
+ managed, err := s.m.pg.TaskPausedBySchedule(taskID)
if err != nil {
errors = append(errors, fmt.Sprintf("任务 #%d 状态读取失败", taskID))
_ = s.m.pg.RecordScheduleHistory(item.ID, taskID, "resume", false, "状态读取失败")
diff --git a/web/src/app/(main)/function/schedules/page.tsx b/web/src/app/(main)/function/schedules/page.tsx
index 49ff3c9..4e500e1 100644
--- a/web/src/app/(main)/function/schedules/page.tsx
+++ b/web/src/app/(main)/function/schedules/page.tsx
@@ -101,10 +101,11 @@ function startLabel(item: TaskSchedule) {
}
function endLabel(item: TaskSchedule) {
+ if (item.schedule_type === "once" && item.end_date) {
+ return `${formatDateValue(item.end_date)} ${item.end_time ? formatClock(item.end_time) : "24:00"}`;
+ }
if (!item.end_time) return "持续运行";
const end = formatClock(item.end_time);
- if (item.schedule_type === "once" && item.end_date)
- return `${formatDateValue(item.end_date)} ${end === "未设置" ? "24:00" : end}`;
const start = formatClock(item.start_time);
return `${end}${end <= start ? "（次日）" : ""}`;
}
@@ -506,13 +507,7 @@ export default function SchedulesPage() {
return current.filter((id) => !visibleIds.includes(id));
});
};
- const toggleTimeline = async (id: number) => {
- if (expandedId === id) {
- setExpandedId(null);
- return;
- }
- setExpandedId(id);
- if (timelineById[id]) return;
+ const refreshTimeline = async (id: number) => {
setTimelineLoadingId(id);
try {
const detail = await api.schedule(id);
@@ -523,6 +518,24 @@ export default function SchedulesPage() {
setTimelineLoadingId(null);
}
};
+ const invalidateTimeline = async (id: number) => {
+ setTimelineById((current) => {
+ if (!current[id]) return current;
+ const next = { ...current };
+ delete next[id];
+ return next;
+ });
+ if (expandedId === id) await refreshTimeline(id);
+ };
+ const toggleTimeline = async (id: number) => {
+ if (expandedId === id) {
+ setExpandedId(null);
+ return;
+ }
+ setExpandedId(id);
+ if (timelineById[id]) return;
+ await refreshTimeline(id);
+ };
const save = async (value: ScheduleInput) => {
if (
!value.name.trim() ||
@@ -549,6 +562,12 @@ export default function SchedulesPage() {
if (!window.confirm("确定删除这个计划吗？")) return;
try {
await api.deleteSchedule(id);
+ setTimelineById((current) => {
+ const next = { ...current };
+ delete next[id];
+ return next;
+ });
+ if (expandedId === id) setExpandedId(null);
await load();
} catch (e) {
toast.error((e as Error).message);
@@ -568,6 +587,7 @@ export default function SchedulesPage() {
toast.success(`已立即运行 ${result.started} 个任务`);
}
}
+ await invalidateTimeline(id);
await load();
} catch (e) {
toast.error((e as Error).message);
@@ -593,6 +613,7 @@ export default function SchedulesPage() {
toast.success(`已立即运行 ${started} 个任务`);
}
setSelectedIds([]);
+ await Promise.all(ids.map((id) => invalidateTimeline(id)));
await load();
};
const bulkRemove = async () => {
@@ -602,6 +623,14 @@ export default function SchedulesPage() {
const failed = results.filter((result) => result.status === "rejected").length;
if (failed) toast.warning(`已删除 ${ids.length - failed} 个计划，${failed} 个计划删除失败`);
else toast.success(`已删除 ${ids.length} 个计划`);
+ setTimelineById((current) => {
+ const next = { ...current };
+ ids.forEach((id) => {
+ delete next[id];
+ });
+ return next;
+ });
+ if (expandedId && ids.includes(expandedId)) setExpandedId(null);
setSelectedIds([]);
await load();
};