修复错误信息展示

This commit is contained in:
whyour
2023-08-06 20:56:59 +08:00
parent f947866c32
commit a9b9c4d7ad
6 changed files with 34 additions and 31 deletions
+7 -3
View File
@@ -3,13 +3,17 @@ import intl from 'react-intl-universal';
export function rootContainer(container: any) {
const locales = {
'en-US': require('./locales/en-US.json'),
'zh-CN': require('./locales/zh-CN.json'),
'en': require('./locales/en-US.json'),
'zh': require('./locales/zh-CN.json'),
};
let currentLocale = intl.determineLocale({
urlLocaleKey: 'lang',
cookieLocaleKey: 'lang',
});
}).slice(0, 2);
if (!currentLocale || !Object.keys(locales).includes(currentLocale)) {
currentLocale = 'zh';
}
intl.init({ currentLocale, locales });
return container;
+1 -1
View File
@@ -47,7 +47,7 @@ const CronLogModal = ({
const log = data as string;
setValue(log || intl.get('暂无日志'));
const hasNext = Boolean(
log && !logEnded(log) && !log.includes(intl.get('任务未运行')),
log && !logEnded(log) && !log.includes('任务未运行'),
);
setExecuting(hasNext);
autoScroll();
+9 -4
View File
@@ -9,17 +9,22 @@ import { SharedContext } from '@/layouts';
import { Alert, Typography } from 'antd';
const Error = () => {
const { user, theme, reloadUser } = useOutletContext<SharedContext>();
const { user } = useOutletContext<SharedContext>();
const [loading, setLoading] = useState(false);
const [data, setData] = useState(intl.get('暂无日志'));
const retryTimes = useRef(1);
const getLog = (needLoading: boolean = true) => {
const getHealthStatus = (needLoading: boolean = true) => {
needLoading && setLoading(true);
request
.get(`${config.apiPrefix}public/health`)
.then(({ error, data }) => {
if (data?.status === 1) {
if (retryTimes.current > 1) {
setTimeout(() => {
window.location.reload();
});
}
return;
}
if (retryTimes.current > 3) {
@@ -28,7 +33,7 @@ const Error = () => {
}
retryTimes.current += 1;
setTimeout(() => {
getLog(false);
getHealthStatus(false);
}, 3000);
})
.finally(() => needLoading && setLoading(false));
@@ -41,7 +46,7 @@ const Error = () => {
}, [user]);
useEffect(() => {
getLog();
getHealthStatus();
}, []);
return (