mirror of
https://github.com/YspCoder/clawgo.git
synced 2026-04-15 00:27:29 +08:00
feat(webui): add safety confirms and local-time rendering; support install.sh -ui
This commit is contained in:
@@ -221,6 +221,24 @@ const resources = {
|
||||
inputPreview: 'Input Preview',
|
||||
blockReason: 'Block Reason',
|
||||
actionFailed: 'Action failed',
|
||||
cronDeleteConfirmTitle: 'Delete Cron Job',
|
||||
cronDeleteConfirmMessage: 'This will permanently delete the cron job. Continue?',
|
||||
cronDisableConfirmTitle: 'Pause Cron Job',
|
||||
cronDisableConfirmMessage: 'Pause this cron job now?',
|
||||
memoryDeleteConfirmTitle: 'Delete Memory File',
|
||||
memoryDeleteConfirmMessage: 'Delete memory file "{{path}}" permanently?',
|
||||
taskDeleteConfirmTitle: 'Delete Task',
|
||||
taskDeleteConfirmMessage: 'Delete task "{{id}}" permanently?',
|
||||
logsClearConfirmTitle: 'Clear Logs',
|
||||
logsClearConfirmMessage: 'Clear current log list from this page?',
|
||||
configDeleteProviderConfirmTitle: 'Delete Provider',
|
||||
configDeleteProviderConfirmMessage: 'Delete provider "{{name}}" from current config?',
|
||||
taskPauseConfirmTitle: 'Pause Task',
|
||||
taskPauseConfirmMessage: 'Pause task "{{id}}" now?',
|
||||
taskCompleteConfirmTitle: 'Complete Task',
|
||||
taskCompleteConfirmMessage: 'Mark task "{{id}}" as completed?',
|
||||
taskIgnoreConfirmTitle: 'Ignore Task',
|
||||
taskIgnoreConfirmMessage: 'Ignore task "{{id}}"? This may hide follow-up processing.',
|
||||
cronExpressionPlaceholder: '*/5 * * * *',
|
||||
recipientId: 'recipient id',
|
||||
languageZh: '中文',
|
||||
@@ -643,6 +661,24 @@ const resources = {
|
||||
inputPreview: '输入预览',
|
||||
blockReason: '阻断原因',
|
||||
actionFailed: '操作失败',
|
||||
cronDeleteConfirmTitle: '删除定时任务',
|
||||
cronDeleteConfirmMessage: '此操作会永久删除该定时任务,是否继续?',
|
||||
cronDisableConfirmTitle: '暂停定时任务',
|
||||
cronDisableConfirmMessage: '确认暂停该定时任务吗?',
|
||||
memoryDeleteConfirmTitle: '删除记忆文件',
|
||||
memoryDeleteConfirmMessage: '确认永久删除记忆文件“{{path}}”吗?',
|
||||
taskDeleteConfirmTitle: '删除任务',
|
||||
taskDeleteConfirmMessage: '确认永久删除任务“{{id}}”吗?',
|
||||
logsClearConfirmTitle: '清空日志',
|
||||
logsClearConfirmMessage: '确认清空当前页面中的日志列表吗?',
|
||||
configDeleteProviderConfirmTitle: '删除 Provider',
|
||||
configDeleteProviderConfirmMessage: '确认从当前配置中删除 provider “{{name}}”吗?',
|
||||
taskPauseConfirmTitle: '暂停任务',
|
||||
taskPauseConfirmMessage: '确认暂停任务“{{id}}”吗?',
|
||||
taskCompleteConfirmTitle: '完成任务',
|
||||
taskCompleteConfirmMessage: '确认将任务“{{id}}”标记为完成吗?',
|
||||
taskIgnoreConfirmTitle: '忽略任务',
|
||||
taskIgnoreConfirmMessage: '确认忽略任务“{{id}}”吗?这可能会跳过后续处理。',
|
||||
cronExpressionPlaceholder: '*/5 * * * *',
|
||||
recipientId: '接收者 ID',
|
||||
languageZh: '中文',
|
||||
|
||||
@@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
|
||||
import { RefreshCw, Save } from 'lucide-react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppContext } from '../context/AppContext';
|
||||
import { useUI } from '../context/UIContext';
|
||||
import RecursiveConfig from '../components/RecursiveConfig';
|
||||
|
||||
function setPath(obj: any, path: string, value: any) {
|
||||
@@ -19,6 +20,7 @@ function setPath(obj: any, path: string, value: any) {
|
||||
|
||||
const Config: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
const ui = useUI();
|
||||
const { cfg, setCfg, cfgRaw, setCfgRaw, loadConfig, hotReloadFieldDetails, q } = useAppContext();
|
||||
const [showRaw, setShowRaw] = useState(false);
|
||||
const [basicMode, setBasicMode] = useState(true);
|
||||
@@ -94,7 +96,14 @@ const Config: React.FC = () => {
|
||||
setCfg((v) => setPath(v, `providers.proxies.${name}.${field}`, value));
|
||||
}
|
||||
|
||||
function removeProxy(name: string) {
|
||||
async function removeProxy(name: string) {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('configDeleteProviderConfirmTitle'),
|
||||
message: t('configDeleteProviderConfirmMessage', { name }),
|
||||
danger: true,
|
||||
confirmText: t('delete'),
|
||||
});
|
||||
if (!ok) return;
|
||||
setCfg((v) => {
|
||||
const next = JSON.parse(JSON.stringify(v || {}));
|
||||
if (next?.providers?.proxies && typeof next.providers.proxies === 'object') {
|
||||
|
||||
@@ -3,7 +3,9 @@ import { Plus, RefreshCw, CheckCircle2, Pause, Edit2, Trash2, X, Play, Clock } f
|
||||
import { motion, AnimatePresence } from 'motion/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppContext } from '../context/AppContext';
|
||||
import { useUI } from '../context/UIContext';
|
||||
import { CronJob } from '../types';
|
||||
import { formatLocalDateTime } from '../utils/time';
|
||||
|
||||
const initialCronForm = {
|
||||
name: '',
|
||||
@@ -37,7 +39,7 @@ const formatSchedule = (job: CronJob, t: (key: string) => string) => {
|
||||
if (kind === 'at' && job.schedule?.atMs) {
|
||||
return {
|
||||
label: t('runAt'),
|
||||
value: new Date(job.schedule.atMs).toLocaleString(),
|
||||
value: formatLocalDateTime(job.schedule.atMs),
|
||||
};
|
||||
}
|
||||
return {
|
||||
@@ -48,6 +50,7 @@ const formatSchedule = (job: CronJob, t: (key: string) => string) => {
|
||||
|
||||
const Cron: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
const ui = useUI();
|
||||
const { cron, refreshCron, q, cfg } = useAppContext();
|
||||
const [isCronModalOpen, setIsCronModalOpen] = useState(false);
|
||||
const [editingCron, setEditingCron] = useState<CronJob | null>(null);
|
||||
@@ -72,6 +75,23 @@ const Cron: React.FC = () => {
|
||||
}, [cfg, enabledChannels]);
|
||||
|
||||
async function cronAction(action: 'delete' | 'enable' | 'disable', id: string) {
|
||||
if (action === 'delete') {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('cronDeleteConfirmTitle'),
|
||||
message: t('cronDeleteConfirmMessage'),
|
||||
danger: true,
|
||||
confirmText: t('delete'),
|
||||
});
|
||||
if (!ok) return;
|
||||
}
|
||||
if (action === 'disable') {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('cronDisableConfirmTitle'),
|
||||
message: t('cronDisableConfirmMessage'),
|
||||
confirmText: t('pause'),
|
||||
});
|
||||
if (!ok) return;
|
||||
}
|
||||
try {
|
||||
await fetch(`/webui/api/cron${q}`, {
|
||||
method: 'POST',
|
||||
|
||||
@@ -2,10 +2,13 @@ import React, { useEffect, useState, useRef } from 'react';
|
||||
import { Terminal, Trash2, Play, Square } from 'lucide-react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppContext } from '../context/AppContext';
|
||||
import { useUI } from '../context/UIContext';
|
||||
import { LogEntry } from '../types';
|
||||
import { formatLocalTime } from '../utils/time';
|
||||
|
||||
const Logs: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
const ui = useUI();
|
||||
const { q } = useAppContext();
|
||||
const [logs, setLogs] = useState<LogEntry[]>([]);
|
||||
const [codeMap, setCodeMap] = useState<Record<number, string>>({});
|
||||
@@ -109,7 +112,16 @@ const Logs: React.FC = () => {
|
||||
logEndRef.current?.scrollIntoView({ behavior: 'smooth' });
|
||||
}, [logs]);
|
||||
|
||||
const clearLogs = () => setLogs([]);
|
||||
const clearLogs = async () => {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('logsClearConfirmTitle'),
|
||||
message: t('logsClearConfirmMessage'),
|
||||
danger: true,
|
||||
confirmText: t('clear'),
|
||||
});
|
||||
if (!ok) return;
|
||||
setLogs([]);
|
||||
};
|
||||
|
||||
const normalizeLog = (v: any): LogEntry => ({
|
||||
time: typeof v?.time === 'string' && v.time ? v.time : (typeof v?.timestamp === 'string' && v.timestamp ? v.timestamp : new Date().toISOString()),
|
||||
@@ -135,19 +147,6 @@ const Logs: React.FC = () => {
|
||||
return codeMap[c] || v;
|
||||
};
|
||||
|
||||
const formatTime = (raw: string) => {
|
||||
try {
|
||||
if (!raw) return '--:--:--';
|
||||
if (raw.includes('T')) {
|
||||
const right = raw.split('T')[1] || '';
|
||||
return (right.split('.')[0] || right).trim() || '--:--:--';
|
||||
}
|
||||
return raw;
|
||||
} catch {
|
||||
return '--:--:--';
|
||||
}
|
||||
};
|
||||
|
||||
const renderReadable = (log: LogEntry) => {
|
||||
const keys = Object.keys(log).filter(k => !['time', 'level', 'msg', '__raw'].includes(k));
|
||||
const core = `${log.msg}`;
|
||||
@@ -241,7 +240,7 @@ const Logs: React.FC = () => {
|
||||
const code = toCode(rawCode);
|
||||
return (
|
||||
<tr key={i} className="border-b border-zinc-900 hover:bg-zinc-900/40 align-top">
|
||||
<td className="p-2 text-zinc-500 whitespace-nowrap">{formatTime(log.time)}</td>
|
||||
<td className="p-2 text-zinc-500 whitespace-nowrap">{formatLocalTime(log.time)}</td>
|
||||
<td className={`p-2 font-semibold whitespace-nowrap ${getLevelColor(lvl)}`}>{lvl}</td>
|
||||
<td className="p-2 text-zinc-200 break-all">{message}</td>
|
||||
<td className="p-2 text-red-300 break-all">{errText}</td>
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppContext } from '../context/AppContext';
|
||||
import { useUI } from '../context/UIContext';
|
||||
|
||||
const Memory: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
const ui = useUI();
|
||||
const { q } = useAppContext();
|
||||
const [files, setFiles] = useState<string[]>([]);
|
||||
const [active, setActive] = useState('');
|
||||
@@ -35,6 +37,13 @@ const Memory: React.FC = () => {
|
||||
}
|
||||
|
||||
async function removeFile(path: string) {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('memoryDeleteConfirmTitle'),
|
||||
message: t('memoryDeleteConfirmMessage', { path }),
|
||||
danger: true,
|
||||
confirmText: t('delete'),
|
||||
});
|
||||
if (!ok) return;
|
||||
await fetch(`/webui/api/memory${qp('path', path)}`, { method: 'DELETE' });
|
||||
if (active === path) {
|
||||
setActive('');
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import React, { useEffect, useMemo, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppContext } from '../context/AppContext';
|
||||
import { useUI } from '../context/UIContext';
|
||||
import { formatLocalDateTime, localDateInputValue } from '../utils/time';
|
||||
|
||||
type TaskAuditItem = {
|
||||
task_id?: string;
|
||||
@@ -29,6 +31,7 @@ type TaskAuditItem = {
|
||||
|
||||
const TaskAudit: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
const ui = useUI();
|
||||
const { q } = useAppContext();
|
||||
const [items, setItems] = useState<TaskAuditItem[]>([]);
|
||||
const [selected, setSelected] = useState<TaskAuditItem | null>(null);
|
||||
@@ -36,7 +39,7 @@ const TaskAudit: React.FC = () => {
|
||||
const [sourceFilter, setSourceFilter] = useState('all');
|
||||
const [statusFilter, setStatusFilter] = useState('all');
|
||||
const [dailyReport, setDailyReport] = useState<string>('');
|
||||
const [reportDate, setReportDate] = useState<string>(new Date().toISOString().slice(0,10));
|
||||
const [reportDate, setReportDate] = useState<string>(localDateInputValue());
|
||||
const [showDailyReport, setShowDailyReport] = useState(false);
|
||||
|
||||
const fetchData = async () => {
|
||||
@@ -90,6 +93,31 @@ const TaskAudit: React.FC = () => {
|
||||
|
||||
const taskAction = async (action: 'pause'|'retry'|'complete'|'ignore') => {
|
||||
if (!selected?.task_id) return;
|
||||
if (action === 'pause') {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('taskPauseConfirmTitle'),
|
||||
message: t('taskPauseConfirmMessage', { id: selected.task_id }),
|
||||
confirmText: t('pauseTask'),
|
||||
});
|
||||
if (!ok) return;
|
||||
}
|
||||
if (action === 'complete') {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('taskCompleteConfirmTitle'),
|
||||
message: t('taskCompleteConfirmMessage', { id: selected.task_id }),
|
||||
confirmText: t('completeTask'),
|
||||
});
|
||||
if (!ok) return;
|
||||
}
|
||||
if (action === 'ignore') {
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('taskIgnoreConfirmTitle'),
|
||||
message: t('taskIgnoreConfirmMessage', { id: selected.task_id }),
|
||||
danger: true,
|
||||
confirmText: t('ignoreTask'),
|
||||
});
|
||||
if (!ok) return;
|
||||
}
|
||||
try {
|
||||
const url = `/webui/api/task_queue${q}`;
|
||||
const r = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ action, task_id: selected.task_id }) });
|
||||
@@ -157,7 +185,7 @@ const TaskAudit: React.FC = () => {
|
||||
>
|
||||
<div className="text-sm font-medium text-zinc-100 truncate">{it.task_id || `task-${idx + 1}`}</div>
|
||||
<div className="text-xs text-zinc-400 truncate">{it.channel || '-'} · {it.status} · attempts:{it.attempts || 1} · {it.duration_ms || 0}ms · retry:{it.retry_count || 0} · {it.source || '-'} · {it.provider || '-'} / {it.model || '-'}</div>
|
||||
<div className="text-[11px] text-zinc-500 truncate">{it.time}</div>
|
||||
<div className="text-[11px] text-zinc-500 truncate">{formatLocalDateTime(it.time)}</div>
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
@@ -188,7 +216,7 @@ const TaskAudit: React.FC = () => {
|
||||
<div><div className="text-zinc-500 text-xs">{t('session')}</div><div className="font-mono break-all">{selected.session}</div></div>
|
||||
<div><div className="text-zinc-500 text-xs">{t('provider')}</div><div>{selected.provider || '-'}</div></div>
|
||||
<div><div className="text-zinc-500 text-xs">{t('model')}</div><div>{selected.model || '-'}</div></div>
|
||||
<div><div className="text-zinc-500 text-xs">{t('time')}</div><div>{selected.time}</div></div>
|
||||
<div><div className="text-zinc-500 text-xs">{t('time')}</div><div>{formatLocalDateTime(selected.time)}</div></div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@@ -213,7 +241,7 @@ const TaskAudit: React.FC = () => {
|
||||
</div>
|
||||
<div>
|
||||
<div className="text-zinc-500 text-xs mb-1">{t('lastPauseAt')}</div>
|
||||
<div className="p-2 rounded bg-zinc-950/60 border border-zinc-800 whitespace-pre-wrap text-zinc-200">{selected.last_pause_at || '-'}</div>
|
||||
<div className="p-2 rounded bg-zinc-950/60 border border-zinc-800 whitespace-pre-wrap text-zinc-200">{formatLocalDateTime(selected.last_pause_at)}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppContext } from '../context/AppContext';
|
||||
import { useUI } from '../context/UIContext';
|
||||
|
||||
type TaskItem = {
|
||||
id?: string;
|
||||
@@ -14,6 +15,7 @@ type TaskItem = {
|
||||
|
||||
const Tasks: React.FC = () => {
|
||||
const { t } = useTranslation();
|
||||
const ui = useUI();
|
||||
const { q } = useAppContext();
|
||||
const [items, setItems] = useState<TaskItem[]>([]);
|
||||
const [selected, setSelected] = useState<TaskItem | null>(null);
|
||||
@@ -34,6 +36,17 @@ const Tasks: React.FC = () => {
|
||||
useEffect(() => { load(); }, [q]);
|
||||
|
||||
const save = async (action: 'create' | 'update' | 'delete') => {
|
||||
if (action === 'delete') {
|
||||
const targetId = String(draft.id || '').trim();
|
||||
if (!targetId) return;
|
||||
const ok = await ui.confirmDialog({
|
||||
title: t('taskDeleteConfirmTitle'),
|
||||
message: t('taskDeleteConfirmMessage', { id: targetId }),
|
||||
danger: true,
|
||||
confirmText: t('delete'),
|
||||
});
|
||||
if (!ok) return;
|
||||
}
|
||||
const payload: any = { action };
|
||||
if (action === 'create') payload.item = draft;
|
||||
if (action === 'update') { payload.id = draft.id; payload.item = { id: draft.id, content: draft.content }; }
|
||||
|
||||
49
webui/src/utils/time.ts
Normal file
49
webui/src/utils/time.ts
Normal file
@@ -0,0 +1,49 @@
|
||||
type DateLike = string | number | Date | null | undefined;
|
||||
|
||||
function parseDateLike(value: DateLike): Date | null {
|
||||
if (value == null) return null;
|
||||
if (value instanceof Date) {
|
||||
return Number.isNaN(value.getTime()) ? null : value;
|
||||
}
|
||||
if (typeof value === 'number') {
|
||||
const d = new Date(value);
|
||||
return Number.isNaN(d.getTime()) ? null : d;
|
||||
}
|
||||
const s = String(value).trim();
|
||||
if (!s) return null;
|
||||
|
||||
if (/^\d+$/.test(s)) {
|
||||
const n = Number(s);
|
||||
const ms = n > 1e12 ? n : n * 1000;
|
||||
const d = new Date(ms);
|
||||
return Number.isNaN(d.getTime()) ? null : d;
|
||||
}
|
||||
|
||||
const d = new Date(s);
|
||||
return Number.isNaN(d.getTime()) ? null : d;
|
||||
}
|
||||
|
||||
export function formatLocalDateTime(value: DateLike, fallback = '-'): string {
|
||||
const d = parseDateLike(value);
|
||||
if (!d) {
|
||||
const raw = value == null ? '' : String(value).trim();
|
||||
return raw || fallback;
|
||||
}
|
||||
return d.toLocaleString();
|
||||
}
|
||||
|
||||
export function formatLocalTime(value: DateLike, fallback = '--:--:--'): string {
|
||||
const d = parseDateLike(value);
|
||||
if (!d) {
|
||||
const raw = value == null ? '' : String(value).trim();
|
||||
return raw || fallback;
|
||||
}
|
||||
return d.toLocaleTimeString();
|
||||
}
|
||||
|
||||
export function localDateInputValue(base = new Date()): string {
|
||||
const d = new Date(base.getTime());
|
||||
d.setMinutes(d.getMinutes() - d.getTimezoneOffset());
|
||||
return d.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user