From 5e73f0390f40d96501063b790a383ff1db456cf5 Mon Sep 17 00:00:00 2001 From: whyour Date: Mon, 9 Oct 2023 23:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E6=9F=A5=E7=9C=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=97=A5=E5=BF=97=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/crontab/detail.tsx | 9 +++++---- src/pages/crontab/logModal.tsx | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/crontab/detail.tsx b/src/pages/crontab/detail.tsx index 6bb18423..fc8f5600 100644 --- a/src/pages/crontab/detail.tsx +++ b/src/pages/crontab/detail.tsx @@ -120,10 +120,11 @@ const CronDetailModal = ({ }; const onClickItem = (item: LogItem) => { - localStorage.setItem('logCron', currentCron.id); - setLogUrl( - `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`, - ); + const url = `${config.apiPrefix}logs/${item.filename}?path=${ + item.directory || '' + }`; + localStorage.setItem('logCron', url); + setLogUrl(url); request .get( `${config.apiPrefix}logs/${item.filename}?path=${item.directory || ''}`, diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx index 58927c11..1c5e6e03 100644 --- a/src/pages/crontab/logModal.tsx +++ b/src/pages/crontab/logModal.tsx @@ -40,6 +40,7 @@ const CronLogModal = ({ const [executing, setExecuting] = useState(true); const [isPhone, setIsPhone] = useState(false); const scrollInfoRef = useRef({ value: 0, down: true }); + const uniqPath = logUrl ? logUrl : String(cron?.id); const getCronLog = (isFirst?: boolean) => { if (isFirst) { @@ -50,7 +51,7 @@ const CronLogModal = ({ .then(({ code, data }) => { if ( code === 200 && - localStorage.getItem('logCron') === String(cron.id) && + localStorage.getItem('logCron') === uniqPath && data !== value ) { const log = data as string;